修改问题

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

@@ -297,4 +297,27 @@ public class DepartmentalPerformanceIndicatorPlanController {
 		WordUtil.generateWord(dataMap, "template_dbkp_zbjh.ftl", Path.getStatementPath(), fileName);
 		return R.ok().data(fileName);
 	}
+
+	/**
+	 * 校验审核状态
+	 *
+	 * @param id 主键
+	 * @return 结果
+	 */
+	@GetMapping(value = "/checkAuditStatus/{id}/{deptId}")
+	public R checkAuditStatus(@PathVariable String id, @PathVariable String deptId) {
+		boolean b = true;
+		List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.selectEvaluationDeptBusinessContentListByBusinessPlanId(id, deptId);
+		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
+			if (!"0".equals(evaluationDeptBusinessContent.getAuditStatus())) {
+				b = false;
+				break;
+			}
+		}
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.customError("行数据审核状态未通过！");
+		}
+	}
 }

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

@@ -1,6 +1,10 @@
 package com.ims.eval.controller;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.common.utils.StringUtils;
@@ -8,9 +12,11 @@ import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.DeptAssessmentDeclaration;
 import com.ims.eval.entity.DeptAssessmentDeclarationContent;
 import com.ims.eval.entity.dto.request.EmployeeDTO;
+import com.ims.eval.entity.dto.request.UserDTO;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IDeptAssessmentDeclarationContentService;
 import com.ims.eval.service.IDeptAssessmentDeclarationService;
+import com.ims.eval.service.IUserService;
 import com.ims.eval.util.ExcelUtil;
 import com.ims.eval.util.ExcelUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -44,6 +50,12 @@ public class DeptAssessmentDeclarationController {
 	@Autowired
 	private IDeptAssessmentDeclarationContentService deptAssessmentDeclarationContentService;
 
+	@Autowired
+	private IUserService userService;
+
+	@Autowired
+	private HttpServletRequest request;
+
 	/**
 	 * 绩效结果考核申报列表信息（分页）
 	 *
@@ -172,7 +184,7 @@ public class DeptAssessmentDeclarationController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.error().data("修改失败！");
+				return R.ok().data("员工已重复添加！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -205,7 +217,18 @@ public class DeptAssessmentDeclarationController {
 					DeptAssessmentDeclarationContent deptAssessmentDeclarationContent = new DeptAssessmentDeclarationContent();
 					deptAssessmentDeclarationContent.setId(str[0]);
 					deptAssessmentDeclarationContent.setAssessmentDeclarationId(str[1]);
-					deptAssessmentDeclarationContent.setEmployeeId(str[2]);
+					deptAssessmentDeclarationContent.setEmployeeNo(str[2]);
+					DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(str[1]);
+					if (ObjectUtil.isNotNull(deptAssessmentDeclaration)){
+						JSONObject jsonArr = userService.pageList(1, 500, deptAssessmentDeclaration.getDeptId(), "", "", "", "", "", request);
+						JSONObject jsonArr1 = (JSONObject) jsonArr.get("data");
+						JSONArray array = JSONUtil.parseArray(jsonArr1.get("records"));
+						List<UserDTO> userList = JSONUtil.toList(array, UserDTO.class);
+						UserDTO user = userList.stream().filter(item -> item.getNo().equals(str[2])).findFirst().orElse(null);
+						if (ObjectUtil.isNotNull(user)){
+							deptAssessmentDeclarationContent.setEmployeeId(user.getId());
+						}
+					}
 					deptAssessmentDeclarationContent.setEmployeeName(str[3]);
 					deptAssessmentDeclarationContent.setSerialNumber(Convert.toInt(str[4]));
 					deptAssessmentDeclarationContent.setSuggestedValue(str[5]);

ims-service/ims-eval/src/main/java/com/ims/eval/service/IDeptAssessmentDeclarationContentService.java

@@ -16,4 +16,6 @@ public interface IDeptAssessmentDeclarationContentService extends IService<DeptA
 
 	boolean removeByAssessmentDeclarationId(String assessmentDeclarationId);
 
+	boolean saveOrUpdateBatch(List<DeptAssessmentDeclarationContent> deptAssessmentDeclarationContentList);
+
 }

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

@@ -1,11 +1,15 @@
 package com.ims.eval.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.DeptAssessmentDeclarationContentMapper;
 import com.ims.eval.entity.DeptAssessmentDeclarationContent;
 import com.ims.eval.service.IDeptAssessmentDeclarationContentService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -26,4 +30,64 @@ public class DeptAssessmentDeclarationContentServiceImpl extends ServiceImpl<Dep
 		return baseMapper.removeByAssessmentDeclarationId(assessmentDeclarationId);
 	}
 
+	@Override
+	public boolean saveOrUpdateBatch(List<DeptAssessmentDeclarationContent> deptAssessmentDeclarationContentList) {
+		boolean b = true;
+		List<DeptAssessmentDeclarationContent> list1 = new ArrayList<>();
+		List<DeptAssessmentDeclarationContent> list2 = new ArrayList<>();
+		for (DeptAssessmentDeclarationContent deptAssessmentDeclarationContent : deptAssessmentDeclarationContentList) {
+			if (deptAssessmentDeclarationContent.getId() == null || "".equals(deptAssessmentDeclarationContent.getId())) {//新增
+				QueryWrapper<DeptAssessmentDeclarationContent> qw = new QueryWrapper<>();
+				if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getAssessmentDeclarationId())) {
+					qw.lambda().like(DeptAssessmentDeclarationContent::getAssessmentDeclarationId, deptAssessmentDeclarationContent.getAssessmentDeclarationId());
+				}
+				if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getEmployeeId())) {
+					qw.lambda().like(DeptAssessmentDeclarationContent::getEmployeeId, deptAssessmentDeclarationContent.getEmployeeId());
+				}
+				if (ObjectUtil.isNull(super.getOne(qw))) {
+					list1.add(deptAssessmentDeclarationContent);
+				} else {
+					b = false;
+				}
+			} else {//修改
+				QueryWrapper<DeptAssessmentDeclarationContent> qw = new QueryWrapper<>();
+				if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getId())) {
+					qw.lambda().like(DeptAssessmentDeclarationContent::getId, deptAssessmentDeclarationContent.getId());
+				}
+				if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getAssessmentDeclarationId())) {
+					qw.lambda().like(DeptAssessmentDeclarationContent::getAssessmentDeclarationId, deptAssessmentDeclarationContent.getAssessmentDeclarationId());
+				}
+				if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getEmployeeId())) {
+					qw.lambda().like(DeptAssessmentDeclarationContent::getEmployeeId, deptAssessmentDeclarationContent.getEmployeeId());
+				}
+				if (ObjectUtil.isNotNull(super.getOne(qw))) {
+					list2.add(deptAssessmentDeclarationContent);
+				} else {
+					QueryWrapper<DeptAssessmentDeclarationContent> qw1 = new QueryWrapper<>();
+					if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getAssessmentDeclarationId())) {
+						qw1.lambda().like(DeptAssessmentDeclarationContent::getAssessmentDeclarationId, deptAssessmentDeclarationContent.getAssessmentDeclarationId());
+					}
+					if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getEmployeeId())) {
+						qw.lambda().like(DeptAssessmentDeclarationContent::getEmployeeId, deptAssessmentDeclarationContent.getEmployeeId());
+					}
+					DeptAssessmentDeclarationContent obj1 = super.getOne(qw1);
+					if (ObjectUtil.isNull(obj1)) {
+						list2.add(deptAssessmentDeclarationContent);
+					} else {
+						b = false;
+					}
+				}
+			}
+		}
+		if (b) {
+			if (list1.size() > 0) {
+				super.saveBatch(list1);
+			}
+			if (list2.size() > 0) {
+				super.updateBatchById(list2);
+			}
+		}
+		return b;
+	}
+
 }

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

@@ -68,7 +68,6 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 		JSONObject jsonArr = userService.pageList(1, 500, deptAssessmentDeclaration.getDeptId(), "", "", "", "", "", request);
 		JSONObject jsonArr1 = (JSONObject) jsonArr.get("data");
 		JSONArray array = JSONUtil.parseArray(jsonArr1.get("records"));
-		System.out.println(array);
 		List<UserDTO> userList = JSONUtil.toList(array, UserDTO.class);
 		for (int i = 0; i < userList.size(); i++) {
 			DeptAssessmentDeclarationContent deptAssessmentDeclarationContent = new DeptAssessmentDeclarationContent();

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

@@ -1,13 +1,14 @@
 package com.ims.eval.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.EvaluationDeptBusinessContentMapper;
-import com.ims.eval.entity.DataDictionary;
 import com.ims.eval.entity.EvaluationDeptBusinessContent;
-import com.ims.eval.service.IDataDictionaryService;
+import com.ims.eval.entity.OrganizationStructure;
 import com.ims.eval.service.IEvaluationDeptBusinessContentService;
+import com.ims.eval.service.IOrganizationStructureService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,11 +23,11 @@ import java.util.List;
 public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<EvaluationDeptBusinessContentMapper, EvaluationDeptBusinessContent> implements IEvaluationDeptBusinessContentService {
 
 	@Autowired
-	private IDataDictionaryService dataDictionaryService;
+	private IOrganizationStructureService organizationStructureService;
 
 	@Override
 	public List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, String deptId) {
-		if ("23031009".equals(deptId)){
+		if ("23031009".equals(deptId)) {
 			deptId = "";
 		}
 		return baseMapper.detailsList(businessPlanId, deptId);
@@ -42,11 +43,13 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 		boolean b = false;
 		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
 			if (StringUtils.isEmpty(evaluationDeptBusinessContent.getId())) {
-				DataDictionary dataDictionary = dataDictionaryService.getById(evaluationDeptBusinessContent.getDeptId());
-				evaluationDeptBusinessContent.setDeptName(dataDictionary.getKeyName());
-				evaluationDeptBusinessContent.setDeptCode(dataDictionary.getDataKey());
-				evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
-				b = super.save(evaluationDeptBusinessContent);
+				List<OrganizationStructure> organizationStructureList = organizationStructureService.getTree("23031001", 1, "140");
+				OrganizationStructure organizationStructure = organizationStructureList.stream().filter(item -> item.getId().equals(evaluationDeptBusinessContent.getDeptId())).findFirst().orElse(null);
+				if (ObjectUtil.isNotNull(organizationStructure)){
+					evaluationDeptBusinessContent.setDeptName(organizationStructure.getName());
+					evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
+					b = super.save(evaluationDeptBusinessContent);
+				}
 			} else {
 				b = super.updateById(evaluationDeptBusinessContent);
 			}