考评明细生成 策略调整

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

@@ -236,6 +236,12 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				throw new CustomException("不存在考评记录");
 			}
 
+			List<OrganizationEvaluationInfo> organizationEvaluationInfoOris = organizationEvaluationInfoService.getConvergeCommonInfo(id, organizationId, indicatorId);
+
+			if (null != organizationEvaluationInfoOris && organizationEvaluationInfoOris.size() > 0) {
+				throw new CustomException("考评明细记录已存在");
+			}
+
 			//查询对应年度的目标责任书
 			List<DeptResponsibility> responsibilities = deptResponsibilityService.list("", organizationEvaluation.getCheckCycle(), organizationEvaluation.getYear(), "");
 			if (null == responsibilities || responsibilities.size() <= 0) {
@@ -403,6 +409,13 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				throw new CustomException("不存在考评记录");
 			}
 
+
+			List<OrganizationEvaluationInfo> organizationEvaluationInfoOris = organizationEvaluationInfoService.getConvergeCommonInfo(id, organizationId, indicatorId);
+
+			if (null != organizationEvaluationInfoOris && organizationEvaluationInfoOris.size() > 0) {
+				throw new CustomException("考评明细记录已存在");
+			}
+
 			String organizationType = organizationEvaluation.getOrganizationType();//考评类型 DWKP
 			String checkCycle = organizationEvaluation.getCheckCycle();//考评周期-月度、季度
 			String year = organizationEvaluation.getYear();//年份
@@ -480,7 +493,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				List<EvaluateRuleInfoIndicatorDTO> resDTOS = evaluateRuleInfoService.listByIndicatorInfo(ruleInfoIds);
 
 				//判断指标id和组织id s是否为空
-				if(StringUtils.isNotEmpty(indicatorId)  ) {
+				if(StringUtils.isNotEmpty(indicatorId)) {
 
 					resDTOS = resDTOS.stream().filter(dto -> dto.getIndicatorId().equals(indicatorId)).collect(Collectors.toList());
 					if (resDTOS.size() <= 0) {