修改规则调整

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

@@ -12,6 +12,7 @@ import com.ims.eval.service.IEvaluateRuleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -87,11 +88,15 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 		}
 
 		if (StringUtils.isNotEmpty(binSection)) {
-			qw.lambda().like(EvaluateRule::getBinSection, binSection);
+			List<String> binSections = Arrays.asList(binSection.split(","));
+
+			qw.lambda().in(EvaluateRule::getBinSection, binSections);
 		}
 
 		if (StringUtils.isNotEmpty(binStage)) {
-			qw.lambda().eq(EvaluateRule::getBinStage, binStage);
+			List<String> binStages = Arrays.asList(binStage.split(","));
+
+			qw.lambda().in(EvaluateRule::getBinStage, binStages);
 		}
 
 		qw.lambda().orderByDesc(EvaluateRule::getCreateTime);

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

@@ -67,6 +67,7 @@ public class EvaluationScoringRuleServiceImpl extends ServiceImpl<EvaluationScor
 			for (EvaluationScoringRule evaluationScoringRule : records){
 				//设置指标名称
 				List<String> list = new ArrayList<>();
+
 				List<String> indicatorIds = evaluationScoringRule.getIndicatorIds();
 				for (String code : indicatorIds){
 					Indicator indicator = indicatorMapper.selectByCode(code);

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

@@ -232,8 +232,13 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 		List<EvaluateRule> evaluateRuleList = evaluateRuleService.listAll(evaluateRuleIds);
 		List<String> binSections = evaluateRuleList.stream().map(EvaluateRule::getBinSection).collect(Collectors.toList());
 		List<String> binStages = evaluateRuleList.stream().map(EvaluateRule::getBinStage).collect(Collectors.toList());
-		entity.setBinSection(String.join(",", binSections));
-		entity.setBinStage(String.join(",", binStages));
+
+		if (StringUtils.isEmpty(entity.getBinSection())) {
+			entity.setBinSection(String.join(",", binSections));
+		}
+		if (StringUtils.isEmpty(entity.getBinStage())) {
+			entity.setBinStage(String.join(",", binStages));
+		}
 
 		//型增时判断当前组织是否存在同期考评配置
 		QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();

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

@@ -414,7 +414,10 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					throw new CustomException("指标规则明细项为空");
 				}
 
-				resDTOS.stream().forEach(r -> {
+				for (IndicatorResDTO r: resDTOS){
+					if(null == r.getIndicatorDictionaryID()){
+						continue;
+					}
 					OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
 					info.setOrganizationEvaluationId(organizationEvaluation.getId());
 					info.setOrganizationEvaluationRuleId(ruleId);
@@ -428,7 +431,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					if (!b2) {
 						throw new CustomException("初始化目标责任书明细失败");
 					}
-				});
+				}
 			}
 		}
 

ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationRuleMapper.xml

@@ -44,7 +44,7 @@
                     AND r.id = #{id}
                 </if>
                 <if test="organizationName !=null and organizationName !=''">
-                    AND r.organization_name like   CONCAT('%',#{organizationName},'%')
+                    AND (r.organization_name like   CONCAT('%',#{organizationName},'%') or r.organization_short_name like   CONCAT('%',#{organizationName},'%'))
                 </if>
 
                 <if test="organizationId !=null and organizationId !=''">
@@ -67,7 +67,7 @@
                     AND r.evaluation_cycle = #{evaluationCycle}
                 </if>
 
-                order by order_num asc
+                order by r.organization_short_name asc
 
             </where>