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

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

@@ -192,7 +192,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("新增/修改失败！");
+				return R.customError("新增/修改失败，指标名称重复！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");

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

@@ -41,15 +41,16 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 
 	@Override
 	public boolean saveOrUpdateBatch(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList) {
-		boolean b = true;
-		List<EvaluationDeptBusinessContent> list1 = new ArrayList<>();
-		List<EvaluationDeptBusinessContent> list2 = new ArrayList<>();
+		List<EvaluationDeptBusinessContent> list = new ArrayList<>();
 		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
 			if (evaluationDeptBusinessContent.getId() == null || "".equals(evaluationDeptBusinessContent.getId())) {//新增
 				QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
 				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
 					qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
 				}
+				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getDeptId())) {
+					qw.lambda().like(EvaluationDeptBusinessContent::getDeptId, evaluationDeptBusinessContent.getDeptId());
+				}
 				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
 					qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
 				}
@@ -60,63 +61,35 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 					if (null != organizationStructure) {
 						evaluationDeptBusinessContent.setDeptName(organizationStructure.getName());
 						evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
-						list1.add(evaluationDeptBusinessContent);
+						list.add(evaluationDeptBusinessContent);
 					}
-				} else {
-					b = false;
 				}
 			} else {//修改
 				evaluationDeptBusinessContent.setCreateDept(null);
-				QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
-				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getId())) {
-					qw.lambda().like(EvaluationDeptBusinessContent::getId, evaluationDeptBusinessContent.getId());
-				}
-				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
-					qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
-				}
-				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
-					qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
-				}
-				List<EvaluationDeptBusinessContent> objList2 = super.list(qw);
-				if (objList2.size() == 1) {
-					list2.add(evaluationDeptBusinessContent);
-				} else if (objList2.size() == 0) {
-					QueryWrapper<EvaluationDeptBusinessContent> qw1 = new QueryWrapper<>();
-					if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
-						qw1.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
-					}
-					if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
-						qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
-					}
-					List<EvaluationDeptBusinessContent> objList3 = super.list(qw1);
-					if (objList3.size() == 0) {
-						list2.add(evaluationDeptBusinessContent);
+				EvaluationDeptBusinessContent obj = super.getById(evaluationDeptBusinessContent.getId());
+				if (null != obj) {
+					if (obj.getTargetName().equals(evaluationDeptBusinessContent.getTargetName())) {
+						list.add(evaluationDeptBusinessContent);
 					} else {
-						b = false;
+						QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
+						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
+							qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
+						}
+						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getDeptId())) {
+							qw.lambda().like(EvaluationDeptBusinessContent::getDeptId, evaluationDeptBusinessContent.getDeptId());
+						}
+						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
+							qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
+						}
+						List<EvaluationDeptBusinessContent> objList3 = super.list(qw);
+						if (objList3.size() == 0) {
+							list.add(evaluationDeptBusinessContent);
+						}
 					}
 				}
 			}
-			/*if (StringUtils.isEmpty(evaluationDeptBusinessContent.getId())) {
-				List<OrganizationStructure> organizationStructureList = organizationStructureService.getTree("23031001", 1, "140");
-				OrganizationStructure organizationStructure = organizationStructureList.get(0).getChildren().stream().filter(item -> item.getId().equals(evaluationDeptBusinessContent.getDeptId())).findFirst().orElse(null);
-				if (null != organizationStructure) {
-					evaluationDeptBusinessContent.setDeptName(organizationStructure.getName());
-					evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
-					b = super.save(evaluationDeptBusinessContent);
-				}
-			} else {
-				b = super.updateById(evaluationDeptBusinessContent);
-			}*/
-		}
-		if (b) {
-			if (list1.size() > 0) {
-				super.saveBatch(list1);
-			}
-			if (list2.size() > 0) {
-				super.updateBatchById(list2);
-			}
 		}
-		return b;
+		return super.saveOrUpdateBatch(list);
 	}
 
 	@Override
@@ -126,7 +99,7 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 
 	@Override
 	public boolean importPlanDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList) {
-		boolean b = false;
+		List<EvaluationDeptBusinessContent> list = new ArrayList<>();
 		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
 			QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
 			if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
@@ -139,7 +112,7 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 			if (objList.size() == 1) {//修改
 				evaluationDeptBusinessContent.setId(objList.get(0).getId());
 				evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());
-				b = super.updateById(evaluationDeptBusinessContent);
+				list.add(evaluationDeptBusinessContent);
 			} else if (objList.size() == 0) {//新增
 				List<OrganizationStructure> organizationStructureList = organizationStructureService.getTree("23031001", 1, "140");
 				OrganizationStructure organizationStructure = organizationStructureList.get(0).getChildren().stream().filter(item -> item.getId().equals(evaluationDeptBusinessContent.getDeptId())).findFirst().orElse(null);
@@ -148,16 +121,16 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 					evaluationDeptBusinessContent.setAuditStatusKp("-1");
 					evaluationDeptBusinessContent.setDeptName(organizationStructure.getName());
 					evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
-					b = super.save(evaluationDeptBusinessContent);
+					list.add(evaluationDeptBusinessContent);
 				}
 			}
 		}
-		return b;
+		return super.saveOrUpdateBatch(list);
 	}
 
 	@Override
 	public boolean importAssessmentDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList) {
-		boolean b = false;
+		List<EvaluationDeptBusinessContent> list = new ArrayList<>();
 		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
 			QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
 			if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
@@ -170,9 +143,9 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 			if (objList.size() == 1) {//修改
 				evaluationDeptBusinessContent.setId(objList.get(0).getId());
 				evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());
-				b = super.updateById(evaluationDeptBusinessContent);
+				list.add(evaluationDeptBusinessContent);
 			}
 		}
-		return b;
+		return super.updateBatchById(list);
 	}
 }