From 581ea3e967ea623882baa67fe60157eee294ad4f Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Tue, 9 Aug 2022 16:42:05 +0800 Subject: [PATCH] API:backend list of medium term examine Former-commit-id: 658970485bb13ae1d0191e378fe60cc30711f441 --- ...ccMediumTermExamineMaterialController.java | 14 ++- .../GlccMediumTermExamineMaterialMapper.java | 3 + .../MediumTermExamineMaterialServiceImpl.java | 9 ++ .../MediumTermExamineMaterialService.java | 3 + .../glcc/vo/MediumTermExamineBackendVo.java | 93 +++++++++++++++++++ .../GlccMediumTermExamineMaterialMapper.xml | 14 +++ 6 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 share-model/src/main/java/com/xjy/ai/model/service/glcc/vo/MediumTermExamineBackendVo.java diff --git a/share-api/src/main/java/com/xjy/ai/api/controller/glcc/GlccMediumTermExamineMaterialController.java b/share-api/src/main/java/com/xjy/ai/api/controller/glcc/GlccMediumTermExamineMaterialController.java index e34d7e9..f2b0aaa 100644 --- a/share-api/src/main/java/com/xjy/ai/api/controller/glcc/GlccMediumTermExamineMaterialController.java +++ b/share-api/src/main/java/com/xjy/ai/api/controller/glcc/GlccMediumTermExamineMaterialController.java @@ -2,16 +2,19 @@ package com.xjy.ai.api.controller.glcc; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.xjy.ai.api.annotion.GuestAccess; +import com.xjy.ai.common.constant.Constants; import com.xjy.ai.common.response.DataPacketUtil; import com.xjy.ai.common.response.ResponseData; import com.xjy.ai.common.utils.ValidatorUtils; import com.xjy.ai.model.service.glcc.MediumTermExamineMaterialService; +import com.xjy.ai.model.service.glcc.vo.MediumTermExamineBackendVo; import com.xjy.ai.model.service.glcc.vo.MediumTermExamineInfoVo; import com.xjy.ai.model.service.glcc.vo.MediumTermExamineMaterialVo; import com.xjy.ai.model.service.glcc.vo.MediumTermExamineResultVo; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresRoles; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; @@ -53,10 +56,17 @@ public class GlccMediumTermExamineMaterialController { @ApiOperation("中期考核列表") @GetMapping("/getMediumTermExamineInfoList") - @GuestAccess public ResponseEntity list(int curPage, int pageSize, String keyword, @ApiParam("是否通过 0不通过 1通过") @RequestParam(defaultValue = "-1")Integer pass) { Page page = mediumTermExamineMaterialService.pageResultList(curPage, pageSize, keyword, pass); return DataPacketUtil.ok(page.getTotal(), page.getRecords()); } + + @ApiOperation("后台中期考核列表") + @GetMapping("/getMediumTermExamineBackendInfoList") + @RequiresRoles(value = Constants.SUPER_USER_ROLE, logical = Logical.OR) + public ResponseEntity list(int curPage, int pageSize, String keyword) { + Page page = mediumTermExamineMaterialService.pageBackendInfoList(curPage, pageSize, keyword); + return DataPacketUtil.ok(page.getTotal(), page.getRecords()); + } } diff --git a/share-model/src/main/java/com/xjy/ai/model/dao/glcc/mapper/GlccMediumTermExamineMaterialMapper.java b/share-model/src/main/java/com/xjy/ai/model/dao/glcc/mapper/GlccMediumTermExamineMaterialMapper.java index 0ed8146..c3a80a6 100644 --- a/share-model/src/main/java/com/xjy/ai/model/dao/glcc/mapper/GlccMediumTermExamineMaterialMapper.java +++ b/share-model/src/main/java/com/xjy/ai/model/dao/glcc/mapper/GlccMediumTermExamineMaterialMapper.java @@ -3,6 +3,7 @@ package com.xjy.ai.model.dao.glcc.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.xjy.ai.model.dao.glcc.entity.GlccMediumTermExamineMaterial; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xjy.ai.model.service.glcc.vo.MediumTermExamineBackendVo; import com.xjy.ai.model.service.glcc.vo.MediumTermExamineResultVo; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,6 @@ import java.util.List; public interface GlccMediumTermExamineMaterialMapper extends BaseMapper { List getPageResultList(Page page, String keyword,@Param("evaluation") List evaluation); + + List getpageBackendInfoList(Page page, String keyword); } diff --git a/share-model/src/main/java/com/xjy/ai/model/service/glcc/Impl/MediumTermExamineMaterialServiceImpl.java b/share-model/src/main/java/com/xjy/ai/model/service/glcc/Impl/MediumTermExamineMaterialServiceImpl.java index 76dbe8a..b062279 100644 --- a/share-model/src/main/java/com/xjy/ai/model/service/glcc/Impl/MediumTermExamineMaterialServiceImpl.java +++ b/share-model/src/main/java/com/xjy/ai/model/service/glcc/Impl/MediumTermExamineMaterialServiceImpl.java @@ -9,6 +9,7 @@ import com.xjy.ai.model.dao.glcc.mapper.GlccMediumTermExamineMaterialMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xjy.ai.model.service.glcc.MediumTermExamineMaterialService; import com.xjy.ai.model.service.glcc.TutorEvaluationService; +import com.xjy.ai.model.service.glcc.vo.MediumTermExamineBackendVo; import com.xjy.ai.model.service.glcc.vo.MediumTermExamineInfoVo; import com.xjy.ai.model.service.glcc.vo.MediumTermExamineMaterialVo; import com.xjy.ai.model.service.glcc.vo.MediumTermExamineResultVo; @@ -65,4 +66,12 @@ public class MediumTermExamineMaterialServiceImpl extends ServiceImpl pageBackendInfoList(int curPage, int pageSize, String keyword) { + Page page = new Page(curPage, pageSize); + List mediumTermExamineBackendVos = baseMapper.getpageBackendInfoList(page, keyword); + page.setRecords(mediumTermExamineBackendVos); + return page; + } } diff --git a/share-model/src/main/java/com/xjy/ai/model/service/glcc/MediumTermExamineMaterialService.java b/share-model/src/main/java/com/xjy/ai/model/service/glcc/MediumTermExamineMaterialService.java index 613e283..ad72def 100644 --- a/share-model/src/main/java/com/xjy/ai/model/service/glcc/MediumTermExamineMaterialService.java +++ b/share-model/src/main/java/com/xjy/ai/model/service/glcc/MediumTermExamineMaterialService.java @@ -3,6 +3,7 @@ package com.xjy.ai.model.service.glcc; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.xjy.ai.model.dao.glcc.entity.GlccMediumTermExamineMaterial; import com.baomidou.mybatisplus.extension.service.IService; +import com.xjy.ai.model.service.glcc.vo.MediumTermExamineBackendVo; import com.xjy.ai.model.service.glcc.vo.MediumTermExamineInfoVo; import com.xjy.ai.model.service.glcc.vo.MediumTermExamineMaterialVo; import com.xjy.ai.model.service.glcc.vo.MediumTermExamineResultVo; @@ -22,4 +23,6 @@ public interface MediumTermExamineMaterialService extends IService pageResultList(int curPage, int pageSize, String keyword, Integer pass); + + Page pageBackendInfoList(int curPage, int pageSize, String keyword); } diff --git a/share-model/src/main/java/com/xjy/ai/model/service/glcc/vo/MediumTermExamineBackendVo.java b/share-model/src/main/java/com/xjy/ai/model/service/glcc/vo/MediumTermExamineBackendVo.java new file mode 100644 index 0000000..358fb15 --- /dev/null +++ b/share-model/src/main/java/com/xjy/ai/model/service/glcc/vo/MediumTermExamineBackendVo.java @@ -0,0 +1,93 @@ +package com.xjy.ai.model.service.glcc.vo; + +import java.util.Date; + +public class MediumTermExamineBackendVo { + //学生姓名 + private String studentName; + + //学生邮箱 + private String studentEmail; + + //导师姓名 + private String tutorName; + + //课题名称 + private String taskName; + + //答辩视频 + private String defenceVideoUrl; + + //代码/pr地址 + private String codeOrPrUrl; + + //ppt附件id + private Integer pptAttachmentId; + + //提交时间 + private Date createdOn; + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + + public String getTutorName() { + return tutorName; + } + + public void setTutorName(String tutorName) { + this.tutorName = tutorName; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getStudentEmail() { + return studentEmail; + } + + public void setStudentEmail(String studentEmail) { + this.studentEmail = studentEmail; + } + + public String getDefenceVideoUrl() { + return defenceVideoUrl; + } + + public void setDefenceVideoUrl(String defenceVideoUrl) { + this.defenceVideoUrl = defenceVideoUrl; + } + + public String getCodeOrPrUrl() { + return codeOrPrUrl; + } + + public void setCodeOrPrUrl(String codeOrPrUrl) { + this.codeOrPrUrl = codeOrPrUrl; + } + + public Integer getPptAttachmentId() { + return pptAttachmentId; + } + + public void setPptAttachmentId(Integer pptAttachmentId) { + this.pptAttachmentId = pptAttachmentId; + } + + public Date getCreatedOn() { + return createdOn; + } + + public void setCreatedOn(Date createdOn) { + this.createdOn = createdOn; + } +} diff --git a/share-model/src/main/resources/mapper/glcc/GlccMediumTermExamineMaterialMapper.xml b/share-model/src/main/resources/mapper/glcc/GlccMediumTermExamineMaterialMapper.xml index cca14a7..c92874f 100644 --- a/share-model/src/main/resources/mapper/glcc/GlccMediumTermExamineMaterialMapper.xml +++ b/share-model/src/main/resources/mapper/glcc/GlccMediumTermExamineMaterialMapper.xml @@ -40,5 +40,19 @@ +