update

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

@@ -78,7 +78,8 @@ public class ExaminationBasicController extends BaseController {
     @ApiOperation("更新考级项目状态")
     @PostMapping(value = "/updateExamBasicStatus")
     public HttpResponseResult updateExamBasicStatus(Long examId, ExamStatusEnum statusEnum){
-        examinationBasicService.updateExamBasicStatus(examId, statusEnum);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        examinationBasicService.updateExamBasicStatus(examId, statusEnum, sysUser.getId());
         return succeed();
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamLifecycleLog.java

@@ -1,5 +1,6 @@
 package com.keao.edu.user.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -10,21 +11,37 @@ public class ExamLifecycleLog {
 	/**  */
 	private Long id;
 	
-	/** 考试项目编号 */
+	@ApiModelProperty(value = "考级项目编号")
 	private Integer examinationBasicId;
 	
-	/** 事件名称 */
+	@ApiModelProperty(value = "事件名称")
 	private String eventName;
 	
-	/** 操作人编号 */
+	@ApiModelProperty(value = "操作人编号")
 	private Integer operatorUserId;
 	
-	/** 备注 */
+	@ApiModelProperty(value = "备注")
 	private String memo;
 	
-	/**  */
+	@ApiModelProperty(value = "事件发生事件")
 	private java.util.Date createTime;
-	
+
+	public ExamLifecycleLog() {
+	}
+
+	public ExamLifecycleLog(Integer examinationBasicId, String eventName, Integer operatorUserId) {
+		this.examinationBasicId = examinationBasicId;
+		this.eventName = eventName;
+		this.operatorUserId = operatorUserId;
+	}
+
+	public ExamLifecycleLog(Integer examinationBasicId, String eventName, Integer operatorUserId, String memo) {
+		this.examinationBasicId = examinationBasicId;
+		this.eventName = eventName;
+		this.operatorUserId = operatorUserId;
+		this.memo = memo;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

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

@@ -34,7 +34,7 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
      * @param statusEnum:
      * @return
      */
-    void updateExamBasicStatus(Long examId, ExamStatusEnum statusEnum);
+    void updateExamBasicStatus(Long examId, ExamStatusEnum statusEnum, Integer operatorId);
 
     /**
      * @describe 获取考级项目

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

@@ -1,42 +1,19 @@
 package com.keao.edu.user.service.impl;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.keao.edu.common.service.SysMessageService;
-import com.keao.edu.thirdparty.message.provider.JiguangPushPlugin;
-import com.keao.edu.user.dao.*;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import com.keao.edu.auth.api.client.SysMessageFeignService;
 import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.SysMessageParams;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.entity.SysConfig;
 import com.keao.edu.common.enums.MessageTypeEnum;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.common.service.SysMessageService;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.common.tenant.TenantContextHolder;
+import com.keao.edu.thirdparty.message.provider.JiguangPushPlugin;
+import com.keao.edu.user.dao.*;
 import com.keao.edu.user.dto.ExamOrganizationRelationExtraDto;
-import com.keao.edu.user.entity.ExamOrganizationRelation;
-import com.keao.edu.user.entity.ExaminationBasic;
-import com.keao.edu.user.entity.Organization;
-import com.keao.edu.user.entity.TenantInfo;
+import com.keao.edu.user.entity.*;
 import com.keao.edu.user.enums.ExamStatusEnum;
 import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.page.ExamOrganizationRelationQueryInfo;
@@ -46,6 +23,16 @@ import com.keao.edu.user.service.ShortUrlService;
 import com.keao.edu.user.service.SysConfigService;
 import com.keao.edu.util.collection.MapUtil;
 import com.keao.edu.util.date.DateUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, ExamOrganizationRelation> implements ExamOrganizationRelationService {
@@ -70,6 +57,8 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 	private SysUserDao sysUserDao;
 	@Autowired
 	private SysMessageService sysMessageService;
+	@Autowired
+	private ExamLifecycleLogDao examLifecycleLogDao;
 
 	public static final Set<ExamStatusEnum> EDIT_ABLE_EXAM_STATUS=new HashSet<>(Arrays.asList(ExamStatusEnum.SETTING,ExamStatusEnum.NOT_START,ExamStatusEnum.APPLYING,ExamStatusEnum.APPLIED));
 
@@ -234,7 +223,6 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			String registrationUrl = baseUrl + "examId=" + examinationBasic.getId() + "&organId=" + og.getOrganId();
 			String registShortUrl = shortUrlService.createShortUrl(registrationUrl);
 			og.setUrl(registShortUrl);
-			organizationRelations.add(og);
 		}
 		examOrganizationRelationDao.batchInsert(organizationRelations);
 	}
@@ -295,6 +283,8 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 		if(!CollectionUtils.isEmpty(needUpdate)){
 			examOrganizationRelationDao.batchUpdate(needUpdate);
+
+			examLifecycleLogDao.insert(new ExamLifecycleLog(examinationBasic.getId().intValue(), "发送考级连接", examinationBasic.getCreatorId()));
 		}
 
 		if(examinationBasic.getStatus().equals(ExamStatusEnum.SETTING)){

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

@@ -47,6 +47,8 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     private SysUserDao sysUserDao;
     @Autowired
     private OrganizationService organizationService;
+    @Autowired
+    private ExamLifecycleLogDao examLifecycleLogDao;
 
     @Override
     public BaseDAO<Long, ExaminationBasic> getDAO() {
@@ -105,6 +107,9 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         }
 
         examMusicTheoryDao.batchInsert(examMusicTheories);
+
+        examLifecycleLogDao.insert(new ExamLifecycleLog(examinationBasic.getId().intValue(), "创建项目", examinationBasic.getCreatorId()));
+
         return examinationBasic;
     }
 
@@ -132,7 +137,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateExamBasicStatus(Long examId, ExamStatusEnum statusEnum) {
+    public void updateExamBasicStatus(Long examId, ExamStatusEnum statusEnum, Integer operatorId) {
         if(Objects.isNull(examId)){
             throw new BizException("请指定考级项目");
         }
@@ -143,6 +148,14 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         if(ExamStatusEnum.RESULT_CONFIRM.equals(existsExam.getStatus())){
             throw new BizException("考级项目结果已确认");
         }
+        if(ExamStatusEnum.NOT_START.equals(existsExam.getStatus())&&ExamStatusEnum.APPLYING.equals(statusEnum)){
+            existsExam.setEnrollStartTime(new Date());
+            examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "报名已开启", operatorId));
+        }
+        if(ExamStatusEnum.APPLYING.equals(existsExam.getStatus())&&ExamStatusEnum.APPLIED.equals(statusEnum)){
+            existsExam.setEnrollEndTime(new Date());
+            examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "报名已结束", operatorId));
+        }
         existsExam.setStatus(statusEnum);
         examinationBasicDao.update(existsExam);
     }

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

@@ -101,7 +101,7 @@
 				poster_profile_ = #{posterProfile},
 			</if>
 			<if test="posterBackgroundImg != null">
-				poster_profile_ = #{posterBackgroundImg},
+				poster_background_img_ = #{posterBackgroundImg},
 			</if>
 			<if test="tenantId != null">
 				tenant_id_ = #{tenantId},
@@ -160,7 +160,7 @@
 					poster_profile_ = #{exam.posterProfile},
 				</if>
 				<if test="exam.posterBackgroundImg != null">
-					poster_profile_ = #{exam.posterBackgroundImg},
+					poster_background_img_ = #{exam.posterBackgroundImg},
 				</if>
 				<if test="exam.tenantId != null">
 					tenant_id_ = #{exam.tenantId},