From a0bcfb01bb62e3738f1b33c290f39672c1ae6997 Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Fri, 5 Mar 2021 11:04:08 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/tms/AchievementManagementDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index e20f17d..719e3cf 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -397,7 +397,7 @@ FROM hr_project_management hpm WHERE systemId = #{systemId} AND hpm.isdel = 0 - AND hpm.projectPer missions = + AND hpm.projectPermissions = #{projectPermissions} and hpm.projectName like concat('%',#{searchContant},'%') @@ -538,7 +538,7 @@ report.reportId, r.submitTime, stu.studentId, - t.id as projectId + t.id as projectId FROM tms_experimental_teaching t INNER JOIN tms_experimental_report report ON report.projectId = t.id INNER JOIN tms_project_record r ON r.recordId = report.eventId From 624b42785393140cb91c3c4edf605581c809315d Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Fri, 5 Mar 2021 14:07:50 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=88=90=E7=BB=A9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/request/AchievementImportRequest.java | 12 ++++++------ .../impl/AchievementManagementServiceImpl.java | 2 +- ...成绩管理实验记录导出模板 (1).xlsx | Bin 0 -> 8911 bytes 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/excel-template/川大成绩管理实验记录导出模板 (1).xlsx diff --git a/src/main/java/com/msdw/tms/entity/request/AchievementImportRequest.java b/src/main/java/com/msdw/tms/entity/request/AchievementImportRequest.java index eb3bf1f..8c4751f 100644 --- a/src/main/java/com/msdw/tms/entity/request/AchievementImportRequest.java +++ b/src/main/java/com/msdw/tms/entity/request/AchievementImportRequest.java @@ -15,24 +15,24 @@ public class AchievementImportRequest { @ExcelAttribute(sort = 0) private String schoolName; - //实验班级 + /* //实验班级 @ExcelAttribute(sort = 1) - private String experimentalClassName; + private String experimentalClassName;*/ //学生姓名 - @ExcelAttribute(sort = 2) + @ExcelAttribute(sort = 1) private String userName; //学号 - @ExcelAttribute(sort = 3) + @ExcelAttribute(sort = 2) private String workNumber; //分数 - @ExcelAttribute(sort = 4) + @ExcelAttribute(sort = 3) private String score; //提交时间 - @ExcelAttribute(sort = 5) + @ExcelAttribute(sort = 4) private String submitTime; } diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java index bfc6608..7eae17b 100644 --- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java @@ -199,7 +199,7 @@ public class AchievementManagementServiceImpl extends ServiceImpl achievement = achievementManagementDao.queryAchievement(list); //2.加载模板流数据 - ClassPathResource resource = new ClassPathResource("excel-template/川大成绩管理实验记录导出模板.xlsx"); + ClassPathResource resource = new ClassPathResource("excel-template/川大成绩管理实验记录导出模板 (1).xlsx"); InputStream inputStream = resource.getInputStream(); //3、通过工具类下载文件 diff --git a/src/main/resources/excel-template/川大成绩管理实验记录导出模板 (1).xlsx b/src/main/resources/excel-template/川大成绩管理实验记录导出模板 (1).xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d5a57eb63313a93438e18d54e88a29af4c78e192 GIT binary patch literal 8911 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 EKeYKeYybcN literal 0 HcmV?d00001 From 6098042a9cf5310eb8c69a0f0d463ca212ec6f63 Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Fri, 5 Mar 2021 14:30:11 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/tms/AchievementManagementDao.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 719e3cf..8151688 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -397,9 +397,8 @@ FROM hr_project_management hpm WHERE systemId = #{systemId} AND hpm.isdel = 0 - AND hpm.projectPermissions = - #{projectPermissions} - + AND hpm.projectPermissions = #{projectPermissions} + and hpm.projectName like concat('%',#{searchContant},'%') and hpm.creationTime between @@ -548,10 +547,6 @@ WHERE t.id = #{id} AND t.is_del = 0 AND report.isdel = 0 - AND r.isdel = 0 - AND u.isdel = 0 - AND s.isdel = 0 - AND stu.isdel = 0; From cdf31a09f875d362d22227f168b26f603d50a138 Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Fri, 5 Mar 2021 15:08:29 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=95=99=E5=AD=A6=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=81=87=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tms/api/AchievementManagementApi.java | 6 ++++-- .../AchievementManagementController.java | 5 +++-- .../ExperimentalTeachingController.java | 3 ++- .../com/msdw/tms/dao/ClassTeachingDao.java | 2 ++ .../com/msdw/tms/entity/ResultsEntity.java | 2 ++ .../com/msdw/tms/entity/vo/ResultsVo.java | 2 ++ .../service/AchievementManagementService.java | 2 +- .../service/ExperimentalTeachingService.java | 1 + .../AchievementManagementServiceImpl.java | 19 +++++++++++++++++-- .../impl/ExperimentalTeachingServiceImpl.java | 10 ++++++++++ .../mapper/tms/AchievementManagementDao.xml | 14 ++++++-------- .../resources/mapper/tms/ClassTeachingDao.xml | 7 +++++++ .../mapper/tms/ExperimentalTeachingDao.xml | 2 +- 13 files changed, 58 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java index b6a7e74..4d36616 100644 --- a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java +++ b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java @@ -79,8 +79,10 @@ public interface AchievementManagementApi { @ApiOperation(value = "发布成绩", notes = "发布成绩--修改教师签名") R updateSignatrue(@ApiParam(value = "实验报告主键reportId + 是否使用教师签名isSignature + 教师签名id signatureId + 教师评语comment") ExperimentalReportEntity entity); - @ApiOperation(value = "成绩管理删除项目", notes = "将项目管理表isdel置1") - R deleteReportByProjectId(@ApiParam(value = "项目id", required = true) Integer projectId); + @ApiOperation(value = "成绩管理删除项目", notes = "将项目管理下的成绩管理删除") + R deleteReportById(@ApiParam(value = "项目id", required = true) Integer projectId, + @ApiParam(value = "项目类型（0练习，1考核）", required = true) Integer projectPermissions, + @ApiParam(value = "教学实验id",required = false) Integer id); @ApiOperation(value = "成绩管理:虚拟仿真实验成绩管理", notes = "成绩管理:虚拟仿真实验成绩管理") diff --git a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java index 4b027b8..d34e9bc 100644 --- a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java +++ b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java @@ -282,8 +282,9 @@ public class AchievementManagementController implements AchievementManagementApi */ @Override @PostMapping("/deleteReportById") - public R deleteReportByProjectId(@RequestParam Integer projectId) { - return service.deleteReportByProjectId(projectId); + public R deleteReportById(@RequestParam Integer projectId,@RequestParam Integer projectPermissions, + @RequestParam(required = false) Integer id) { + return service.deleteReportById(projectId,projectPermissions,id); } /** diff --git a/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java b/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java index f070234..9b0d5ac 100644 --- a/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java +++ b/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java @@ -124,7 +124,8 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr @Override @PostMapping("/delete") public R delete(@RequestBody Integer[] ids){ - experimentalTeachingService.removeByIds(Arrays.asList(ids)); + //改为假删除tms_experimental_teaching + experimentalTeachingService.deleteTeachByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java b/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java index 5cbc435..3ad2f27 100644 --- a/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java +++ b/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java @@ -26,4 +26,6 @@ public interface ClassTeachingDao { int updateExperimentalNumber(Integer number, Integer id); + + void updateIsDel(Integer id); } diff --git a/src/main/java/com/msdw/tms/entity/ResultsEntity.java b/src/main/java/com/msdw/tms/entity/ResultsEntity.java index 715cd3a..4ec085d 100644 --- a/src/main/java/com/msdw/tms/entity/ResultsEntity.java +++ b/src/main/java/com/msdw/tms/entity/ResultsEntity.java @@ -48,6 +48,8 @@ public class ResultsEntity{ //实验名称 private String experimentalName; + private Integer isdel; + } diff --git a/src/main/java/com/msdw/tms/entity/vo/ResultsVo.java b/src/main/java/com/msdw/tms/entity/vo/ResultsVo.java index 791c06e..cb68385 100644 --- a/src/main/java/com/msdw/tms/entity/vo/ResultsVo.java +++ b/src/main/java/com/msdw/tms/entity/vo/ResultsVo.java @@ -40,4 +40,6 @@ public class ResultsVo { //用户id private Integer userId; + private Integer isdel; + } diff --git a/src/main/java/com/msdw/tms/service/AchievementManagementService.java b/src/main/java/com/msdw/tms/service/AchievementManagementService.java index 4b78743..b72c3d8 100644 --- a/src/main/java/com/msdw/tms/service/AchievementManagementService.java +++ b/src/main/java/com/msdw/tms/service/AchievementManagementService.java @@ -44,7 +44,7 @@ public interface AchievementManagementService extends IService getImitationAchievement(Integer projectId); diff --git a/src/main/java/com/msdw/tms/service/ExperimentalTeachingService.java b/src/main/java/com/msdw/tms/service/ExperimentalTeachingService.java index 3bea116..491c511 100644 --- a/src/main/java/com/msdw/tms/service/ExperimentalTeachingService.java +++ b/src/main/java/com/msdw/tms/service/ExperimentalTeachingService.java @@ -16,4 +16,5 @@ public interface ExperimentalTeachingService extends IService asList); } diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java index 7eae17b..545112a 100644 --- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java @@ -284,9 +284,24 @@ public class AchievementManagementServiceImpl extends ServiceImpl teachAchievements = achievementManagementDao.getTeachAchievement(id); + for (AchievementManagementVO teachAchievement :teachAchievements) { + Integer reportId = teachAchievement.getReportId(); + Integer recordId = teachAchievement.getRecordId(); + achievementManagementDao.deleteReport(reportId,recordId); + } + }else { + List imitationAchievements = achievementManagementDao.getImitationAchievement(projectId); + for (AchievementManagementVO imitationAchievement: imitationAchievements) { + Integer reportId = imitationAchievement.getReportId(); + Integer recordId = imitationAchievement.getRecordId(); + achievementManagementDao.deleteReport(reportId,recordId); + } + } + - achievementManagementDao.deleteReportById(projectId); return R.ok(); } diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java index 0e6843f..73df989 100644 --- a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java @@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Service("experimentalTeachingService") public class ExperimentalTeachingServiceImpl extends ServiceImpl implements ExperimentalTeachingService { @@ -50,4 +52,12 @@ public class ExperimentalTeachingServiceImpl extends ServiceImpl asList) { + int size = asList.size(); + for (int i = 0; i < size; i++) { + classTeachingDao.updateIsDel(asList.get(i)); + } + } + } diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 719e3cf..09d7a0f 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -393,13 +393,11 @@ + SELECT - id, - experimental_class_name, - experimental_name, - project_id, - project_name, - (select count(*) - from tms_project_record WHERE projectId = project_id AND tms_project_record.isdel = 0) as experimental_number, - experiment_duration, - type, - start_time, - stop_time, - status, - invitation_code, - is_code, - user_id, - creation_time, - surplus_time + id, + experimental_class_name, + experimental_name, + project_id, + project_name, + ( SELECT count( * ) FROM tms_project_record WHERE projectId = project_id AND tms_project_record.isdel = 0 ) AS experimental_number, + experiment_duration, + type, + start_time, + stop_time, + STATUS, + invitation_code, + is_code, + user_id, + creation_time, + surplus_time , + systemId FROM - tms_experimental_teaching + tms_experimental_teaching t + inner join hr_project_management m on m.projectId = t.project_id WHERE - is_del = 0 + t.is_del = 0 AND `type`=#{exp.type,jdbcType=INTEGER} From da395c66d796bc224e5eaedb706f6752e116d1cd Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Fri, 5 Mar 2021 16:19:29 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=8A=A5=E5=91=8A=E6=95=B0=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AchievementManagementServiceImpl.java | 4 ++ .../mapper/tms/AchievementManagementDao.xml | 57 ++++++++++++++++++- 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java index 3d2fa02..cae8f16 100644 --- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java @@ -110,6 +110,10 @@ public class AchievementManagementServiceImpl extends ServiceImpl newList(ResultsVo vo, Integer page, Integer size) { List newList = achievementManagementDao.newList(vo); + for (ResultsEntity entity : newList) { + Integer number = achievementManagementDao.getTeachAchievement(entity.getId()).size(); + entity.setNumber(number); + } return newList; } diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 5db3b8f..6be9400 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -432,6 +432,37 @@ ORDER BY hpm.creationTime DESC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - SELECT schoolName, experimental_class_name, @@ -568,7 +620,6 @@ INNER JOIN school s ON s.schoolId = u.schoolId INNER JOIN student stu ON stu.userId = u.userId WHERE t.id = #{id} - AND t.is_del = 0 AND report.isdel = 0 From c8e8056c217863e0cbc6338897f3f9fca1e59abf Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Fri, 5 Mar 2021 16:32:31 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E7=AB=AF=E5=AE=9E=E9=AA=8C=E6=80=BB=E6=97=B6=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/tms/ProjectRecordDao.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml index 7695449..faa324a 100644 --- a/src/main/resources/mapper/tms/ProjectRecordDao.xml +++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml @@ -113,6 +113,15 @@ tpr.submitTime DESC +