修改业绩指标计划详情问题

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

@@ -226,7 +226,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	}
 
 	/**
-	 * 详情部门信息
+	 * 详情-部门数据
 	 *
 	 * @param id     业务主键
 	 * @param deptId 当前登录人部门主键

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

@@ -2,20 +2,19 @@ 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.json.JSONArray;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.EvaluationDeptBusinessPlanMapper;
+import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
 import com.ims.eval.entity.EvaluationDeptBusinessPlan;
 import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
 import com.ims.eval.service.IEvaluationDeptBusinessContentService;
 import com.ims.eval.service.IEvaluationDeptBusinessPlanService;
+import com.ims.eval.service.IEvaluationDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,9 +34,12 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 	@Autowired
 	private IEvaluationDeptBusinessAssessmentService evaluationDeptBusinessAssessmentService;
 
+	@Autowired
+	private IEvaluationDeptService evaluationDeptService;
+
 	@Override
 	public IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage) {
-		if ("23031009".equals(deptId)){//组织人事部
+		if ("23031009".equals(deptId)) {//组织人事部
 			deptId = "";
 		}
 		if (null == pageNum || null == pageSize) {
@@ -55,16 +57,19 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 		evaluationDeptBusinessPlan.setDocumentStatus("有效");
 		evaluationDeptBusinessPlan.setStage("流程未启动");
 		evaluationDeptBusinessPlan.setCreateTime(DateUtil.date());
-		JSONArray array = JSONUtil.parseArray(evaluationDeptBusinessPlan.getDeptData());
-		List<Dict> deptList = JSONUtil.toList(array, Dict.class);
-		StringBuilder deptIds = new StringBuilder();
-		StringBuilder deptNames = new StringBuilder();
-		for (Dict dict : deptList) {
-			deptIds.append(dict.get("id").toString()).append(",");
-			deptNames.append(dict.get("keyName").toString()).append(",");
+		List<EvaluationDept> evaluationDeptList = evaluationDeptService.list();
+		if (evaluationDeptList.size() > 0) {
+			StringBuilder deptIds = new StringBuilder();
+			StringBuilder deptNames = new StringBuilder();
+			for (EvaluationDept evaluationDept : evaluationDeptList) {
+				deptIds.append(evaluationDept.getId()).append(",");
+				deptNames.append(evaluationDept.getDeptName()).append(",");
+			}
+			evaluationDeptBusinessPlan.setDeptId(deptIds.substring(0, deptIds.toString().length() - 1));
+			evaluationDeptBusinessPlan.setDeptName(deptNames.substring(0, deptNames.toString().length() - 1));
+		} else {
+			return false;
 		}
-		evaluationDeptBusinessPlan.setDeptId(deptIds.toString().substring(0, deptIds.toString().length() - 1));
-		evaluationDeptBusinessPlan.setDeptName(deptNames.toString().substring(0, deptNames.toString().length() - 1));
 		return super.save(evaluationDeptBusinessPlan);
 	}
 
@@ -92,9 +97,9 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 				evaluationDeptBusinessAssessment.setFinalReviewPeopleTime(evaluationDeptBusinessPlan.getFinalReviewPeopleTime());
 				evaluationDeptBusinessAssessment.setFinalReviewOpinion(evaluationDeptBusinessPlan.getFinalReviewOpinion());
 				evaluationDeptBusinessAssessment.setCreateTime(DateUtil.date());
-				evaluationDeptBusinessAssessment.setCreateBy(evaluationDeptBusinessPlan.getCreateBy());
-				evaluationDeptBusinessAssessment.setUpdateTime(evaluationDeptBusinessPlan.getUpdateTime());
-				evaluationDeptBusinessAssessment.setUpdateBy(evaluationDeptBusinessPlan.getUpdateBy());
+				//evaluationDeptBusinessAssessment.setCreateBy(evaluationDeptBusinessPlan.getCreateBy());
+				//evaluationDeptBusinessAssessment.setUpdateTime(evaluationDeptBusinessPlan.getUpdateTime());
+				//evaluationDeptBusinessAssessment.setUpdateBy(evaluationDeptBusinessPlan.getUpdateBy());
 				evaluationDeptBusinessAssessment.setRemark(evaluationDeptBusinessPlan.getRemark());
 				evaluationDeptBusinessAssessmentService.save(evaluationDeptBusinessAssessment);
 			}