Browse Source

修改单位考评修订问题

hlf 1 year ago
parent
commit
758c06eb5f

+ 5 - 0
ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationRevision.java

@@ -165,4 +165,9 @@ public class EvaluationRevision extends Model {
 	 */
 	private String createOrgName;
 
+	/**
+	 * 备用ID
+	 */
+	private String standbyId;
+
 }

+ 8 - 1
ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationRevisionServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ims.eval.service.impl;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -119,6 +121,7 @@ public class EvaluationRevisionServiceImpl extends ServiceImpl<EvaluationRevisio
 			evaluationRevision.setRemark(deptResponsibility.getRemark());
 			evaluationRevision.setCreateOrgId(deptResponsibility.getCreateOrgId());
 			evaluationRevision.setCreateOrgName(deptResponsibility.getCreateOrgName());
+			evaluationRevision.setStandbyId(Convert.toStr(IdUtil.getSnowflake(1, 1).nextId()));
 			return super.save(evaluationRevision);
 		}
 		return false;
@@ -126,7 +129,11 @@ public class EvaluationRevisionServiceImpl extends ServiceImpl<EvaluationRevisio
 
 	@Override
 	public boolean editState(String id, String state, String instId) {
-		EvaluationRevision evaluationRevision = baseMapper.selectById(id);
+		QueryWrapper<EvaluationRevision> qw = new QueryWrapper<>();
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(EvaluationRevision::getStandbyId, id);
+		}
+		EvaluationRevision evaluationRevision = baseMapper.selectOne(qw);
 		if (StringUtils.isNotEmpty(state)) {
 			evaluationRevision.setStage(state);
 		}