修改部门考评评级导入问题

ims-service/ims-eval/src/main/java/com/ims/eval/api/HomeController.java

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Map;
 
 /**
+ * APP首页
+ *
  * @author hlf
  * @date 2023/7/12 10:58
  * 文件说明：

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

@@ -1,6 +1,5 @@
 package com.ims.eval.controller;
 
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.common.utils.StringUtils;
@@ -19,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -135,12 +135,6 @@ public class DepartmentPerformanceAppraisalRatingController {
 				//遍历Excel表每一行的数据
 				for (String[] str : strings) {
 					EvaluationDeptRating evaluationDeptRating = new EvaluationDeptRating();
-					evaluationDeptRating.setId(str[0]);
-					List<OrganizationStructure> organizationStructureList = organizationStructureService.getTree("23031001", 1, "140");
-					OrganizationStructure organizationStructure = organizationStructureList.get(0).getChildren().stream().filter(item -> item.getName().equals(str[1])).findFirst().orElse(null);
-					if (null != organizationStructure) {
-						evaluationDeptRating.setDeptId(organizationStructure.getId());
-					}
 					evaluationDeptRating.setDeptName(str[1]);
 					evaluationDeptRating.setAnnual(str[2]);
 					evaluationDeptRating.setJan(str[3]);
@@ -169,25 +163,26 @@ public class DepartmentPerformanceAppraisalRatingController {
 					evaluationDeptRating.setDeceContent(str[26]);
 					evaluationDeptRating.setAcount(str[27]);
 					evaluationDeptRating.setCcount(str[28]);
-					if (null == str[0] || "".equals(str[0])) {
-						evaluationDeptRating.setCreateTime(DateUtil.date());
-					} else {
-						evaluationDeptRating.setUpdateTime(DateUtil.date());
-					}
-					if (StringUtils.isEmpty(evaluationDeptRating.getId())) {
-						QueryWrapper<EvaluationDeptRating> qw1 = new QueryWrapper<>();
+					List<OrganizationStructure> organizationStructureList = organizationStructureService.getTree("23031001", 1, "140");
+					OrganizationStructure organizationStructure = organizationStructureList.get(0).getChildren().stream().filter(item -> item.getName().equals(str[1])).findFirst().orElse(null);
+					if (null != organizationStructure) {
+						evaluationDeptRating.setDeptId(organizationStructure.getId());
+						QueryWrapper<EvaluationDeptRating> qw = new QueryWrapper<>();
 						if (StringUtils.isNotEmpty(evaluationDeptRating.getDeptId())) {
-							qw1.lambda().eq(EvaluationDeptRating::getDeptId, evaluationDeptRating.getDeptId());
+							qw.lambda().eq(EvaluationDeptRating::getDeptId, evaluationDeptRating.getDeptId());
 						}
 						if (StringUtils.isNotEmpty(evaluationDeptRating.getAnnual())) {
-							qw1.lambda().eq(EvaluationDeptRating::getAnnual, evaluationDeptRating.getAnnual());
+							qw.lambda().eq(EvaluationDeptRating::getAnnual, evaluationDeptRating.getAnnual());
 						}
-						List<EvaluationDeptRating> objList = evaluationDeptRatingService.list(qw1);
-						if (objList.size() == 0) {
+						List<EvaluationDeptRating> objList = evaluationDeptRatingService.list(qw);
+						if (objList.size() == 1) {//修改
+							evaluationDeptRating.setId(objList.get(0).getId());
+							evaluationDeptRating.setUpdateTime(new Date());
+							evaluationDeptRatingList.add(evaluationDeptRating);
+						} else if (objList.size() == 0) {//新增
+							evaluationDeptRating.setCreateTime(new Date());
 							evaluationDeptRatingList.add(evaluationDeptRating);
 						}
-					} else {
-						evaluationDeptRatingList.add(evaluationDeptRating);
 					}
 				}
 				boolean b = evaluationDeptRatingService.saveOrUpdateBatch(evaluationDeptRatingList);

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

@@ -43,7 +43,7 @@ public class EvaluationDeptRatingServiceImpl extends ServiceImpl<EvaluationDeptR
 				qw.lambda().eq(EvaluationDeptRating::getAnnual, evaluationDeptRating.getAnnual());
 			}
 			EvaluationDeptRating deptRating = baseMapper.selectOne(qw);
-			if (ObjectUtil.isNotNull(deptRating)){
+			if (ObjectUtil.isNotNull(deptRating)){//不为空 表示重复
 				return false;
 			}
 		}