update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExaminationBasicController.java

@@ -71,7 +71,8 @@ public class ExaminationBasicController extends BaseController {
     @ApiOperation("更新考级项目")
     @PostMapping(value = "/update")
     public HttpResponseResult update(@RequestBody ExaminationBasic examinationBasic){
-        examinationBasicService.update(examinationBasic);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        examinationBasicService.updateExam(examinationBasic,sysUser.getId());
         return succeed();
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExaminationBasicService.java

@@ -18,6 +18,8 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
      */
     ExaminationBasic addExaminationBasic(ExaminationBasic examinationBasic);
 
+    void updateExam(ExaminationBasic examinationBasic, Integer operatorId);
+
     /**
      * @describe 更新考级项目状态
      * @author Joburgess

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -223,7 +223,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int update(ExaminationBasic examinationBasic) {
+    public void updateExam(ExaminationBasic examinationBasic,Integer operatorId) {
         if(Objects.isNull(examinationBasic.getId())){
             throw new BizException("请指定考级项目");
         }
@@ -240,7 +240,15 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         if(ExamStatusEnum.CLOSE.equals(existsExam.getStatus())){
             throw new BizException("考级项目已关闭");
         }
-        return examinationBasicDao.update(examinationBasic);
+        if(Objects.nonNull(examinationBasic.getEnrollStartTime())
+                &&examinationBasic.getEnrollStartTime().compareTo(existsExam.getEnrollStartTime())!=0){
+            examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "修改报名时间", operatorId));
+        }
+        if(Objects.nonNull(examinationBasic.getEnrollEndTime())
+                &&examinationBasic.getEnrollEndTime().compareTo(existsExam.getEnrollEndTime())!=0){
+            examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "修改报名时间", operatorId));
+        }
+        examinationBasicDao.update(examinationBasic);
     }
 
     @Override

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamLifecycleLogMapper.xml

@@ -33,7 +33,7 @@
 		</selectKey>
 		-->
 		INSERT INTO exam_lifecycle_log (id_,examination_basic_id_,event_name_,operator_user_id_,memo_,create_time_)
-		VALUES(#{id},#{examinationBasicId},#{eventName},#{operatorUserId},#{memo},NOW)
+		VALUES(#{id},#{examinationBasicId},#{eventName},#{operatorUserId},#{memo},NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->