增加新增时间，修改流程，修改删除逻辑

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DepartmentalPerformanceIndicatorPlanController.java

@@ -1,5 +1,6 @@
 package com.ims.eval.controller;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.*;
@@ -206,6 +207,11 @@ public class DepartmentalPerformanceIndicatorPlanController {
 					evaluationDeptBusinessContent.setBaseScore(str[8]);
 					evaluationDeptBusinessContent.setEvaluationCriteria(str[9]);
 					evaluationDeptBusinessContent.setAuditStatus("-1");
+					if (null == str[0] || "".equals(str[0])) {
+						evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
+					} else {
+						evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());
+					}
 					evaluationDeptBusinessContentList.add(evaluationDeptBusinessContent);
 				}
 				boolean b = evaluationDeptBusinessContentService.saveOrUpdateBatch(evaluationDeptBusinessContentList);
@@ -225,7 +231,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	/**
 	 * 修改状态
 	 *
-	 * @param id 主键
+	 * @param id    主键
 	 * @param stage 状态
 	 * @return 结果
 	 */

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationDeptBusinessAssessment.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * @author hlf
  * @date 2023/5/6 17:09
@@ -108,7 +110,7 @@ public class EvaluationDeptBusinessAssessment extends Model {
 	/**
 	 * 创建时间
 	 */
-	private String createTime;
+	private Date createTime;
 
 	/**
 	 * 创建者
@@ -123,7 +125,7 @@ public class EvaluationDeptBusinessAssessment extends Model {
 	/**
 	 * 更新时间
 	 */
-	private String updateTime;
+	private Date updateTime;
 
 	/**
 	 * 更新者

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationDeptBusinessContent.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * @author hlf
  * @date 2023/5/6 10:36
@@ -84,7 +86,7 @@ public class EvaluationDeptBusinessContent extends Model {
 	/**
 	 * 创建时间
 	 */
-	private String createTime;
+	private Date createTime;
 
 	/**
 	 * 创建者
@@ -99,7 +101,7 @@ public class EvaluationDeptBusinessContent extends Model {
 	/**
 	 * 更新时间
 	 */
-	private String updateTime;
+	private Date updateTime;
 
 	/**
 	 * 更新者

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationDeptBusinessPlan.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * @author hlf
  * @date 2023/4/26 17:32
@@ -109,7 +111,7 @@ public class EvaluationDeptBusinessPlan extends Model {
 	/**
 	 * 创建时间
 	 */
-	private String createTime;
+	private Date createTime;
 
 	/**
 	 * 创建者
@@ -124,7 +126,7 @@ public class EvaluationDeptBusinessPlan extends Model {
 	/**
 	 * 更新时间
 	 */
-	private String updateTime;
+	private Date updateTime;
 
 	/**
 	 * 更新者

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationDeptRating.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.poi.ss.formula.functions.Count;
 
+import java.util.Date;
+
 /**
  * @author hlf
  * @date 2023/4/28 14:13
@@ -65,13 +67,13 @@ public class EvaluationDeptRating extends Model {
 	//A级总数
 	private String acount;
 	//创建时间
-	private String createTime;
+	private Date createTime;
 	//创建者
 	private String createBy;
 	//创建者名称
 	private String createName;
 	//更新时间
-	private String updateTime;
+	private Date updateTime;
 	//更新者
 	private String updateBy;
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationDeptBusinessAssessmentServiceImpl.java

@@ -31,6 +31,9 @@ public class EvaluationDeptBusinessAssessmentServiceImpl extends ServiceImpl<Eva
 	public boolean editState(String id, String state, String instId) {
 		EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = baseMapper.selectById(id);
 		if (StringUtils.isNotEmpty(state)) {
+			if ("组织人事部领导审核".equals(state)){
+				state = "流程已结束";
+			}
 			evaluationDeptBusinessAssessment.setStage(state);
 		}
 		if (StringUtils.isNotEmpty(instId)) {

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationDeptBusinessContentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ims.eval.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
@@ -46,6 +47,7 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 				DataDictionary dataDictionary = dataDictionaryService.getById(evaluationDeptBusinessContent.getDeptId());
 				evaluationDeptBusinessContent.setDeptName(dataDictionary.getKeyName());
 				evaluationDeptBusinessContent.setDeptCode(dataDictionary.getDataKey());
+				evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
 				b = super.save(evaluationDeptBusinessContent);
 			} else {
 				b = super.updateById(evaluationDeptBusinessContent);

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationDeptBusinessPlanServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ims.eval.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -52,7 +53,7 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 			qw.lambda().eq(EvaluationDeptBusinessPlan::getAppraisalYear, evaluationDeptBusinessPlan.getAppraisalYear());
 		}
 		EvaluationDeptBusinessPlan businessPlan = baseMapper.selectOne(qw);
-		if (ObjectUtil.isNotNull(businessPlan)){
+		if (ObjectUtil.isNotNull(businessPlan)) {
 			return false;
 		}
 		String id = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
@@ -60,6 +61,7 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 		evaluationDeptBusinessPlan.setResponsibilityCode("BMKP_" + evaluationDeptBusinessPlan.getBusinessClass() + "_" + evaluationDeptBusinessPlan.getAppraisalYear());
 		evaluationDeptBusinessPlan.setDocumentStatus("有效");
 		evaluationDeptBusinessPlan.setStage("流程未启动");
+		evaluationDeptBusinessPlan.setCreateTime(DateUtil.date());
 		List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = new ArrayList<>();
 		JSONArray array = JSONUtil.parseArray(evaluationDeptBusinessPlan.getDeptData());
 		List<Dict> deptList = JSONUtil.toList(array, Dict.class);
@@ -77,6 +79,7 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 			evaluationDeptBusinessContent.setDeptCode(deptCode);
 			evaluationDeptBusinessContent.setSerialNumber("1");
 			evaluationDeptBusinessContent.setAuditStatus("-1");
+			evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
 			evaluationDeptBusinessContentList.add(evaluationDeptBusinessContent);
 			deptIds.append(deptId).append(",");
 			deptNames.append(deptName).append(",");
@@ -87,31 +90,6 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 		evaluationDeptBusinessPlan.setDeptName(deptNames.toString().substring(0, deptNames.toString().length() - 1));
 		evaluationDeptBusinessPlan.setDeptCode(deptCodes.toString().substring(0, deptCodes.toString().length() - 1));
 		b = super.save(evaluationDeptBusinessPlan);
-		EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = new EvaluationDeptBusinessAssessment();
-		evaluationDeptBusinessAssessment.setId(evaluationDeptBusinessPlan.getId());
-		evaluationDeptBusinessAssessment.setResponsibilityCode(evaluationDeptBusinessPlan.getResponsibilityCode());
-		evaluationDeptBusinessAssessment.setDeptId(evaluationDeptBusinessPlan.getDeptId());
-		evaluationDeptBusinessAssessment.setDeptName(evaluationDeptBusinessPlan.getDeptName());
-		evaluationDeptBusinessAssessment.setDeptCode(evaluationDeptBusinessPlan.getDeptCode());
-		evaluationDeptBusinessAssessment.setAppraisalYear(evaluationDeptBusinessPlan.getAppraisalYear());
-		evaluationDeptBusinessAssessment.setEvaluationCategory(evaluationDeptBusinessPlan.getEvaluationCategory());
-		evaluationDeptBusinessAssessment.setBusinessClass(evaluationDeptBusinessPlan.getBusinessClass());
-		evaluationDeptBusinessAssessment.setDocumentStatus(evaluationDeptBusinessPlan.getDocumentStatus());
-		evaluationDeptBusinessAssessment.setStage(evaluationDeptBusinessPlan.getStage());
-		evaluationDeptBusinessAssessment.setDes(evaluationDeptBusinessPlan.getDes());
-		evaluationDeptBusinessAssessment.setReviewPeople(evaluationDeptBusinessPlan.getReviewPeople());
-		evaluationDeptBusinessAssessment.setReviewPeopleTime(evaluationDeptBusinessPlan.getReviewPeopleTime());
-		evaluationDeptBusinessAssessment.setReviewOpinion(evaluationDeptBusinessPlan.getReviewOpinion());
-		evaluationDeptBusinessAssessment.setFinalReviewPeople(evaluationDeptBusinessPlan.getFinalReviewPeople());
-		evaluationDeptBusinessAssessment.setFinalReviewPeopleTime(evaluationDeptBusinessPlan.getFinalReviewPeopleTime());
-		evaluationDeptBusinessAssessment.setFinalReviewOpinion(evaluationDeptBusinessPlan.getFinalReviewOpinion());
-		evaluationDeptBusinessAssessment.setInstId(evaluationDeptBusinessPlan.getInstId());
-		evaluationDeptBusinessAssessment.setCreateTime(evaluationDeptBusinessPlan.getCreateTime());
-		evaluationDeptBusinessAssessment.setCreateBy(evaluationDeptBusinessPlan.getCreateBy());
-		evaluationDeptBusinessAssessment.setUpdateTime(evaluationDeptBusinessPlan.getUpdateTime());
-		evaluationDeptBusinessAssessment.setUpdateBy(evaluationDeptBusinessPlan.getUpdateBy());
-		evaluationDeptBusinessAssessment.setRemark(evaluationDeptBusinessPlan.getRemark());
-		b = evaluationDeptBusinessAssessmentService.save(evaluationDeptBusinessAssessment);
 		return b;
 	}
 
@@ -119,6 +97,34 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 	public boolean editState(String id, String state, String instId) {
 		EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = baseMapper.selectById(id);
 		if (StringUtils.isNotEmpty(state)) {
+			if ("组织人事部领导审核".equals(state)) {
+				state = "流程已结束";
+				EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = new EvaluationDeptBusinessAssessment();
+				evaluationDeptBusinessAssessment.setId(evaluationDeptBusinessPlan.getId());
+				evaluationDeptBusinessAssessment.setResponsibilityCode(evaluationDeptBusinessPlan.getResponsibilityCode());
+				evaluationDeptBusinessAssessment.setDeptId(evaluationDeptBusinessPlan.getDeptId());
+				evaluationDeptBusinessAssessment.setDeptName(evaluationDeptBusinessPlan.getDeptName());
+				evaluationDeptBusinessAssessment.setDeptCode(evaluationDeptBusinessPlan.getDeptCode());
+				evaluationDeptBusinessAssessment.setAppraisalYear(evaluationDeptBusinessPlan.getAppraisalYear());
+				evaluationDeptBusinessAssessment.setEvaluationCategory(evaluationDeptBusinessPlan.getEvaluationCategory());
+				evaluationDeptBusinessAssessment.setBusinessClass(evaluationDeptBusinessPlan.getBusinessClass());
+				evaluationDeptBusinessAssessment.setDocumentStatus(evaluationDeptBusinessPlan.getDocumentStatus());
+				evaluationDeptBusinessAssessment.setStage("流程未启动");
+				evaluationDeptBusinessAssessment.setDes(evaluationDeptBusinessPlan.getDes());
+				evaluationDeptBusinessAssessment.setReviewPeople(evaluationDeptBusinessPlan.getReviewPeople());
+				evaluationDeptBusinessAssessment.setReviewPeopleTime(evaluationDeptBusinessPlan.getReviewPeopleTime());
+				evaluationDeptBusinessAssessment.setReviewOpinion(evaluationDeptBusinessPlan.getReviewOpinion());
+				evaluationDeptBusinessAssessment.setFinalReviewPeople(evaluationDeptBusinessPlan.getFinalReviewPeople());
+				evaluationDeptBusinessAssessment.setFinalReviewPeopleTime(evaluationDeptBusinessPlan.getFinalReviewPeopleTime());
+				evaluationDeptBusinessAssessment.setFinalReviewOpinion(evaluationDeptBusinessPlan.getFinalReviewOpinion());
+				evaluationDeptBusinessAssessment.setInstId(evaluationDeptBusinessPlan.getInstId());
+				evaluationDeptBusinessAssessment.setCreateTime(DateUtil.date());
+				evaluationDeptBusinessAssessment.setCreateBy(evaluationDeptBusinessPlan.getCreateBy());
+				evaluationDeptBusinessAssessment.setUpdateTime(evaluationDeptBusinessPlan.getUpdateTime());
+				evaluationDeptBusinessAssessment.setUpdateBy(evaluationDeptBusinessPlan.getUpdateBy());
+				evaluationDeptBusinessAssessment.setRemark(evaluationDeptBusinessPlan.getRemark());
+				evaluationDeptBusinessAssessmentService.save(evaluationDeptBusinessAssessment);
+			}
 			evaluationDeptBusinessPlan.setStage(state);
 		}
 		if (StringUtils.isNotEmpty(instId)) {
@@ -129,14 +135,23 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 
 	@Override
 	public boolean removeByIds(List<String> ids) {
+		boolean b = false;
 		for (String id : ids) {
-			evaluationDeptBusinessContentService.removeByBusinessPlanId(id);
+			EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = super.getById(id);
+			if ("流程未启动".equals(evaluationDeptBusinessPlan.getStage()) || "流程已结束".equals(evaluationDeptBusinessPlan.getStage())) {
+				b = super.removeById(id);
+				b = evaluationDeptBusinessAssessmentService.removeById(id);
+				b = evaluationDeptBusinessContentService.removeByBusinessPlanId(id);
+			} else {
+				return b;
+			}
 		}
-		return super.removeByIds(ids);
+		return b;
 	}
 
 	@Override
 	public boolean updateById(EvaluationDeptBusinessPlan evaluationDeptBusinessPlan) {
+		evaluationDeptBusinessPlan.setUpdateTime(DateUtil.date());
 		EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = new EvaluationDeptBusinessAssessment();
 		evaluationDeptBusinessAssessment.setId(evaluationDeptBusinessPlan.getId());
 		evaluationDeptBusinessAssessment.setDes(evaluationDeptBusinessPlan.getDes());