修改绩效结果考核申报详情页导入问题

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

@@ -135,7 +135,6 @@ public class DepartmentPerformanceAppraisalRatingController {
 				//遍历Excel表每一行的数据
 				for (String[] str : strings) {
 					EvaluationDeptRating evaluationDeptRating = new EvaluationDeptRating();
-					evaluationDeptRating.setDeptName(str[1]);
 					evaluationDeptRating.setAnnual(str[2]);
 					evaluationDeptRating.setJan(str[3]);
 					evaluationDeptRating.setJanContent(str[4]);
@@ -164,9 +163,10 @@ public class DepartmentPerformanceAppraisalRatingController {
 					evaluationDeptRating.setAcount(str[27]);
 					evaluationDeptRating.setCcount(str[28]);
 					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);
+					OrganizationStructure organizationStructure = organizationStructureList.get(0).getChildren().stream().filter(item -> item.getId().equals(str[0])).findFirst().orElse(null);
 					if (null != organizationStructure) {
 						evaluationDeptRating.setDeptId(organizationStructure.getId());
+						evaluationDeptRating.setDeptName(organizationStructure.getName());
 						QueryWrapper<EvaluationDeptRating> qw = new QueryWrapper<>();
 						if (StringUtils.isNotEmpty(evaluationDeptRating.getDeptId())) {
 							qw.lambda().eq(EvaluationDeptRating::getDeptId, evaluationDeptRating.getDeptId());

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

@@ -243,21 +243,34 @@ public class DeptAssessmentDeclarationController {
 					deptAssessmentDeclarationContent.setEmployeeNo(str[0]);
 					DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(id);
 					if (ObjectUtil.isNotNull(deptAssessmentDeclaration)) {
-						JSONObject jsonArr = userService.pageList(1, 500, deptAssessmentDeclaration.getDeptId(), "", "", "", "", "", request);
+						JSONObject jsonArr = userService.pageList(1, 1000, 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);
+						UserDTO user = userList.stream().filter(item -> item.getNo().equals(str[0])).findFirst().orElse(null);
 						if (ObjectUtil.isNotNull(user)) {
 							deptAssessmentDeclarationContent.setEmployeeId(user.getId());
+							deptAssessmentDeclarationContent.setEmployeeName(user.getName());
 						}
 					}
-					deptAssessmentDeclarationContent.setEmployeeName(str[1]);
-					deptAssessmentDeclarationContent.setSerialNumber(Convert.toInt(str[2]));
-					deptAssessmentDeclarationContent.setSuggestedValue(str[3]);
-					deptAssessmentDeclarationContentList.add(deptAssessmentDeclarationContent);
+					deptAssessmentDeclarationContent.setSuggestedValue(str[2]);
+					deptAssessmentDeclarationContent.setSerialNumber(Convert.toInt(str[3]));
+					QueryWrapper<DeptAssessmentDeclarationContent> qw = new QueryWrapper<>();
+					if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getAssessmentDeclarationId())) {
+						qw.lambda().like(DeptAssessmentDeclarationContent::getAssessmentDeclarationId, deptAssessmentDeclarationContent.getAssessmentDeclarationId());
+					}
+					if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getEmployeeNo())) {
+						qw.lambda().like(DeptAssessmentDeclarationContent::getEmployeeNo, deptAssessmentDeclarationContent.getEmployeeNo());
+					}
+					List<DeptAssessmentDeclarationContent> objList = deptAssessmentDeclarationContentService.list(qw);
+					if (objList.size() == 1) {//修改
+						deptAssessmentDeclarationContent.setId(objList.get(0).getId());
+						deptAssessmentDeclarationContentList.add(deptAssessmentDeclarationContent);
+					} else if (objList.size() == 0) {//新增
+						deptAssessmentDeclarationContentList.add(deptAssessmentDeclarationContent);
+					}
 				}
-				boolean b = deptAssessmentDeclarationContentService.importDataList(deptAssessmentDeclarationContentList);
+				boolean b = deptAssessmentDeclarationContentService.saveOrUpdateBatch(deptAssessmentDeclarationContentList);
 				if (b) {
 					return R.ok().data(b);
 				} else {

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

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

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

@@ -1,23 +1,13 @@
 package com.ims.eval.service.impl;
 
-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.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.DeptAssessmentDeclarationContentMapper;
-import com.ims.eval.entity.DeptAssessmentDeclaration;
 import com.ims.eval.entity.DeptAssessmentDeclarationContent;
-import com.ims.eval.entity.dto.request.UserDTO;
 import com.ims.eval.service.IDeptAssessmentDeclarationContentService;
-import com.ims.eval.service.IDeptAssessmentDeclarationService;
-import com.ims.eval.service.IUserService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,15 +19,6 @@ import java.util.List;
 @Service
 public class DeptAssessmentDeclarationContentServiceImpl extends ServiceImpl<DeptAssessmentDeclarationContentMapper, DeptAssessmentDeclarationContent> implements IDeptAssessmentDeclarationContentService {
 
-	@Autowired
-	private IDeptAssessmentDeclarationService deptAssessmentDeclarationService;
-
-	@Autowired
-	private IUserService userService;
-
-	@Autowired
-	private HttpServletRequest request;
-
 	@Override
 	public List<DeptAssessmentDeclarationContent> detailsList(String assessmentDeclarationId) {
 		return baseMapper.detailsList(assessmentDeclarationId);
@@ -109,38 +90,4 @@ public class DeptAssessmentDeclarationContentServiceImpl extends ServiceImpl<Dep
 		}
 		return b;
 	}
-
-	@Override
-	public boolean importDataList(List<DeptAssessmentDeclarationContent> deptAssessmentDeclarationContentList) {
-		boolean b = false;
-		for (DeptAssessmentDeclarationContent deptAssessmentDeclarationContent : deptAssessmentDeclarationContentList) {
-			DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(deptAssessmentDeclarationContent.getAssessmentDeclarationId());
-			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(deptAssessmentDeclarationContent.getEmployeeNo())).findFirst().orElse(null);
-				if (user != null) {
-					deptAssessmentDeclarationContent.setEmployeeId(user.getId());
-				}
-			}
-			QueryWrapper<DeptAssessmentDeclarationContent> qw = new QueryWrapper<>();
-			if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getAssessmentDeclarationId())) {
-				qw.lambda().like(DeptAssessmentDeclarationContent::getAssessmentDeclarationId, deptAssessmentDeclarationContent.getAssessmentDeclarationId());
-			}
-			if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getEmployeeNo())) {
-				qw.lambda().like(DeptAssessmentDeclarationContent::getEmployeeNo, deptAssessmentDeclarationContent.getEmployeeNo());
-			}
-			List<DeptAssessmentDeclarationContent> objList = super.list(qw);
-			if (objList.size() == 1) {//修改
-				deptAssessmentDeclarationContent.setId(objList.get(0).getId());
-				b = super.updateById(deptAssessmentDeclarationContent);
-			} else if (objList.size() == 0) {//新增
-				b = super.save(deptAssessmentDeclarationContent);
-			}
-		}
-		return b;
-	}
-
 }

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

@@ -130,7 +130,7 @@ public class EvaluationDeptRatingServiceImpl extends ServiceImpl<EvaluationDeptR
 	public List<EvaluationDeptRating> list(String deptName, String annual) {
 		QueryWrapper<EvaluationDeptRating> qw = new QueryWrapper<>();
 		if (StringUtils.isNotEmpty(deptName)) {
-			qw.lambda().eq(EvaluationDeptRating::getDeptName, deptName);
+			qw.lambda().like(EvaluationDeptRating::getDeptName, deptName);
 		}
 		if (StringUtils.isNotEmpty(annual)) {
 			qw.lambda().eq(EvaluationDeptRating::getAnnual, annual);