From ef62d3d9995db8550378febb414692213dd97f0f Mon Sep 17 00:00:00 2001 From: mzh820631607 Date: Wed, 30 Sep 2020 17:56:18 +0800 Subject: [PATCH] =?UTF-8?q?2020.09.30=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msdw/tms/controller/UserController.java | 8 +- .../com/msdw/tms/dao/ProjectRecordDao.java | 3 +- .../java/com/msdw/tms/dao/UserInfoDao.java | 2 + .../request/ProjectRecordImportRequest.java | 16 ++- .../tms/entity/vo/ProjectRecordExportVo.java | 91 ++++++++++++++++++ .../com/msdw/tms/service/UserInfoService.java | 2 + .../impl/EvaluationRecordServiceImpl.java | 15 ++- .../impl/ProjectRecordServiceImpl.java | 6 +- .../tms/service/impl/UserInfoServiceImpl.java | 6 ++ .../实验报告导出模板.xlsx | Bin 10365 -> 10328 bytes .../resources/mapper/tms/ClassTeachingDao.xml | 33 ++++++- .../resources/mapper/tms/ProjectRecordDao.xml | 8 +- src/main/resources/mapper/tms/UserInfoDao.xml | 7 ++ 13 files changed, 182 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/msdw/tms/entity/vo/ProjectRecordExportVo.java diff --git a/src/main/java/com/msdw/tms/controller/UserController.java b/src/main/java/com/msdw/tms/controller/UserController.java index 8e5945b..3f79133 100644 --- a/src/main/java/com/msdw/tms/controller/UserController.java +++ b/src/main/java/com/msdw/tms/controller/UserController.java @@ -79,7 +79,12 @@ public class UserController implements UserControllerApi { public R update(@RequestBody UserProsonalEntityVo vo){ List entityList = vo.getPersonalFileEntities(); UserInfoEntity userInfo = vo.getUserInfoEntity(); - + Integer userId = userInfo.getUserId(); + String password = userInfo.getPassword(); + String userPassword = userInfoService.queryPasword(userId); + if (userPassword.equals(password)==true){ + return R.error(400,"false,the password is the same!!!"); + }else{ userInfoService.updateUserInfoById(userInfo); // userInfoService.updateById(userInfo); for (int i = 0;i { IPage getByUserExperimentRecord(Page page,@Param("pro") ProjectRecordEntity projectRecordEntity); - List getByUserRecordImport(ProjectRecordEntity projectRecordEntity); + List getByUserRecordImport(ProjectRecordEntity projectRecordEntity); ProjectRecordVo getByUserScore(@Param("userid") Integer userId,@Param("isdel") Integer isdel); diff --git a/src/main/java/com/msdw/tms/dao/UserInfoDao.java b/src/main/java/com/msdw/tms/dao/UserInfoDao.java index d7be78b..6ed791c 100644 --- a/src/main/java/com/msdw/tms/dao/UserInfoDao.java +++ b/src/main/java/com/msdw/tms/dao/UserInfoDao.java @@ -13,4 +13,6 @@ public interface UserInfoDao extends BaseMapper { Boolean add(UserInfoEntity userEntity); void userInfupdateUserInfoById(UserInfoEntity entity); + + String queryUserPassword(Integer userid); } diff --git a/src/main/java/com/msdw/tms/entity/request/ProjectRecordImportRequest.java b/src/main/java/com/msdw/tms/entity/request/ProjectRecordImportRequest.java index b250786..eef5c6f 100644 --- a/src/main/java/com/msdw/tms/entity/request/ProjectRecordImportRequest.java +++ b/src/main/java/com/msdw/tms/entity/request/ProjectRecordImportRequest.java @@ -14,10 +14,16 @@ public class ProjectRecordImportRequest { /** * 状态 */ +// @ExcelAttribute(sort = 1) +// private String userRecordstate; +// +// private Integer recordstate; + /** + * 实验班级名称 + */ @ExcelAttribute(sort = 1) - private String userRecordstate; + private String experimental_class_name; - private Integer recordstate; /** * 得分 */ @@ -38,4 +44,10 @@ public class ProjectRecordImportRequest { */ @ExcelAttribute(sort = 5) private String endTime; + + /** + * 结束时间 + */ + @ExcelAttribute(sort = 6) + private String abc; } diff --git a/src/main/java/com/msdw/tms/entity/vo/ProjectRecordExportVo.java b/src/main/java/com/msdw/tms/entity/vo/ProjectRecordExportVo.java new file mode 100644 index 0000000..080b776 --- /dev/null +++ b/src/main/java/com/msdw/tms/entity/vo/ProjectRecordExportVo.java @@ -0,0 +1,91 @@ +package com.msdw.tms.entity.vo; + +import com.msdw.tms.entity.ExperimentalTeachingEntity; +import com.msdw.tms.entity.ProjectRecordEntity; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +@Data +@Accessors(chain = true) +public class ProjectRecordExportVo extends ProjectRecordEntity implements Serializable { + + /** + * 实验项目名称 + */ + private String projectName; + /** + * 学校名称 + */ + private String SchoolName; + /** + * 用户名称 + */ + private String userName; + /** + * 实验次数 + */ + private Integer experimentNumber; + /** + * 总耗时 + */ + private Integer totalTime; + /** + * 平均分 + */ + private double avgScore; + /** + * 几个月 + */ + private Integer month; + /** + * 查询条件 + */ + private String condition; + /** + * 开始时间 + */ + private String startTime; + /** + * 结束时间 + */ + private String endTime; + /** + * 完成数量 + */ + private Integer complete; + /** + * 待评分 + */ + private Integer tobescored; + /** 记录状态（0 未修改，1 已修改）*/ + private Integer recordState; +// =====================================记录实验项目信息 + /** + * 实验状态(1待开始 2进行中 3已结束) + */ + private Integer status; + /** + * 是否启用邀请码 + */ + private Integer isCode; + /** + * 绑定用户id + */ + private Integer userId; + /** + * 实验班级名 + */ + private String experimentalClassName; + + /** + * 封装多个项目id + */ + private List projectIds; + /** + * 实验班级名称 + */ + private String experimental_class_name; +} diff --git a/src/main/java/com/msdw/tms/service/UserInfoService.java b/src/main/java/com/msdw/tms/service/UserInfoService.java index d8f4acd..2bacae2 100644 --- a/src/main/java/com/msdw/tms/service/UserInfoService.java +++ b/src/main/java/com/msdw/tms/service/UserInfoService.java @@ -14,4 +14,6 @@ public interface UserInfoService extends IService { R add(UserInfoEntity userInfoEntity); void updateUserInfoById(UserInfoEntity entity); + + String queryPasword(Integer userId); } diff --git a/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java index bb14d78..c0283c5 100644 --- a/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java @@ -187,8 +187,10 @@ public class EvaluationRecordServiceImpl extends ServiceImpl submitCurrentQuestionFuture = CompletableFuture.runAsync(() - -> submitCurrentQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer), executor); +// CompletableFuture submitCurrentQuestionFuture = CompletableFuture.runAsync(() +// -> submitCurrentQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer), executor); +// 2020.09.30 清除上面异步操作，需先提交并统计最后一题的结果 + submitCurrentQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer); //修改提交时间和测评记录状态 CompletableFuture updateEvaluationFuture = CompletableFuture.runAsync(() -> { @@ -207,7 +209,9 @@ public class EvaluationRecordServiceImpl extends ServiceImpl Constant.PASSING_SCORE ? Constant.EVALUATIONN_PASSED : Constant.EVALUATIONN_NOT_PASSED); +// submitVO.setIsPassed(sumScore > Constant.PASSING_SCORE ? Constant.EVALUATIONN_PASSED : Constant.EVALUATIONN_NOT_PASSED); + //成绩大于等于60分通过 + submitVO.setIsPassed(sumScore >= Constant.PASSING_SCORE ? Constant.EVALUATIONN_PASSED : Constant.EVALUATIONN_NOT_PASSED); }, executor); CompletableFuture getByIdFuture = CompletableFuture.supplyAsync(() -> { @@ -232,8 +236,9 @@ public class EvaluationRecordServiceImpl extends ServiceImpl projectRecordVos = this.baseMapper.getByUserRecordImport(projectRecord); + List projectRecordVos = this.baseMapper.getByUserRecordImport(projectRecord); List importRequests = projectRecordVos.stream().map(project -> { ProjectRecordImportRequest request = new ProjectRecordImportRequest(); BeanUtils.copyProperties(project, request); - request.setUserRecordstate(project.getRecordstate().equals(1) ? "已完成":"待评分"); +// request.setUserRecordstate(project.getRecordstate().equals(1) ? "已完成":"待评分"); return request; }).collect(Collectors.toList()); diff --git a/src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java index 5b39367..e0c60c3 100644 --- a/src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java @@ -52,4 +52,10 @@ public R add(UserInfoEntity userInfoEntity) { public void updateUserInfoById(UserInfoEntity entity){ userInfoDao.userInfupdateUserInfoById(entity); } + + @Override + public String queryPasword(Integer userId){ + String s = userInfoDao.queryUserPassword(userId); + return s; + } } diff --git a/src/main/resources/excel-template/实验报告导出模板.xlsx b/src/main/resources/excel-template/实验报告导出模板.xlsx index 03a2749edfaaab05b88f22783a4fd994bbe59580..6ef241068a12aa58ea62206452087d9391fccb67 100644 GIT binary patch delta 4826 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 L(&ATg{n7g$AH3&} delta 4832 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 diff --git a/src/main/resources/mapper/tms/ClassTeachingDao.xml b/src/main/resources/mapper/tms/ClassTeachingDao.xml index b88ddf8..783223b 100644 --- a/src/main/resources/mapper/tms/ClassTeachingDao.xml +++ b/src/main/resources/mapper/tms/ClassTeachingDao.xml @@ -25,13 +25,42 @@ WHERE is_del=0 AND - start_time >='2020-01-01 00:00:00' - and `status` = #{cla.status} + type!=1 + AND + `status`!= 1 + + and `status` = #{cla.status} and ( project_name like concat('%',#{cla.condition},'%') or experimental_class_name like concat('%',#{cla.condition},'%') ) and stop_time between #{cla.endTime} and #{cla.startTime} and DATE_SUB(CURDATE(), INTERVAL #{cla.month} month ) <= date(creation_time) ORDER BY creation_time DESC + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE tms_experimental_teaching diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml index 685f02c..03d7d16 100644 --- a/src/main/resources/mapper/tms/ProjectRecordDao.xml +++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml @@ -56,7 +56,7 @@ tpr.isdel = #{pro.isdel} - SELECT tpr.projectId, projectName, @@ -64,14 +64,18 @@ timeSum, startingTime as startTime, endTime, - recordState + recordState, + tet.experimental_class_name FROM tms_project_record tpr LEFT JOIN tms_project tp ON tpr.projectId = tp.projectId + LEFT JOIN tms_experimental_teaching tet ON tpr.projectId = tet.project_id WHERE tpr.userId = #{userid} AND tpr.isdel = #{isdel} + AND + tpr.projectId = tet.project_id diff --git a/src/main/resources/mapper/tms/UserInfoDao.xml b/src/main/resources/mapper/tms/UserInfoDao.xml index 2361f75..2f8a991 100644 --- a/src/main/resources/mapper/tms/UserInfoDao.xml +++ b/src/main/resources/mapper/tms/UserInfoDao.xml @@ -48,8 +48,15 @@ schoolId = #{schoolId}, + + phone #{phone} + > WHERE userId = #{userId}; + + \ No newline at end of file