目标启动调整

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

@@ -173,7 +173,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 			//生产经营
 			double scjyWeight = evaluationRule.getScjyWeight();
 			if (scjyWeight > 0) {
-				List<EvaluateRule> scjyevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(evaluationRule.getBinSection(), CacheContext.bseCodeObject.get("SCJY").getId(), "JDKP", evaluationRule.getYear());
+				List<EvaluateRule> scjyevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(evaluationRule.getBinSection(), CacheContext.bseCodeObject.get("SCJY").getId()+","+CacheContext.bseCodeObject.get("ZDZX").getId()+","+CacheContext.bseCodeObject.get("KJCX").getId(), "NDKP", evaluationRule.getYear());
 				if (null != scjyevaluateRuleList && scjyevaluateRuleList.size() > 0) {
 					evaluateRuleList.addAll(scjyevaluateRuleList);
 				}
@@ -181,7 +181,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 			//前期
 			double qqWeight = evaluationRule.getQqWeight();
 			if (qqWeight > 0) {
-				List<EvaluateRule> qqevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("QQ").getId(), CacheContext.bseCodeObject.get("QQXM").getId(), "JDKP", evaluationRule.getYear());
+				List<EvaluateRule> qqevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("QQ").getId(), CacheContext.bseCodeObject.get("QQXM").getId(), "NDKP", evaluationRule.getYear());
 				if (null != qqevaluateRuleList && qqevaluateRuleList.size() > 0) {
 					evaluateRuleList.addAll(qqevaluateRuleList);
 				}
@@ -189,7 +189,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 			//基建
 			double jjWeight = evaluationRule.getJjWeight();
 			if (jjWeight > 0) {
-				List<EvaluateRule> jjevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("JJ").getId(), CacheContext.bseCodeObject.get("JJXM").getId(), "JDKP", evaluationRule.getYear());
+				List<EvaluateRule> jjevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("JJ").getId(), CacheContext.bseCodeObject.get("JJXM").getId(), "NDKP", evaluationRule.getYear());
 				if (null != jjevaluateRuleList && jjevaluateRuleList.size() > 0) {
 					evaluateRuleList.addAll(jjevaluateRuleList);
 				}

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

@@ -152,7 +152,8 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 		}
 
 		if (StringUtils.isNotEmpty(binStage)) {
-			qw.lambda().eq(EvaluateRule::getBinStage, binStage);
+			List<String> binStages = Arrays.asList(binStage.split(","));
+			qw.lambda().in(EvaluateRule::getBinStage, binStages);
 		}
 
 		if (StringUtils.isNotEmpty(checkCycle)) {

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

@@ -253,7 +253,9 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 			.map(map -> String.valueOf(map.get("id"))) // 提取每个Map中key为"id"的值，并转换成String
 			.collect(Collectors.toList()); // 将提取的值收集到List中
 		if (null == idList || idList.size() <= 0) {
-			throw new CustomException("未查询到数据");
+//			throw new CustomException("未查询到数据");
+			data.put("title", null);
+			return data;
 		}
 		List<IndicatorResDTO> indicatorResDTOS = indicatorService.getGroupChildCodeByIds(idList);
 

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

@@ -17,16 +17,18 @@
     </sql>
     <select id="selectListByReportId" resultType="com.ims.eval.entity.EvaluateReportInfo">
 
-     select
+        select
         ri.*
-        from  evaluate_report_info ri
+        from evaluate_report_info ri
         LEFT JOIN evaluate_report er on er.id = ri.evaluate_report_id
 
-     <where>
-         <if test="evaluateReportId !=null and evaluateReportId !=''">
-             AND er.id = #{evaluateReportId}
-         </if>
-     </where>
+        <where>
+            <if test="evaluateReportId !=null and evaluateReportId !=''">
+                AND er.id = #{evaluateReportId}
+            </if>
+        </where>
+
+        order by ri.score desc
     </select>
 
 </mapper>

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

@@ -54,7 +54,7 @@
                     AND r.year = #{year}
                 </if>
 
-                order by  r.create_time desc
+                order by  r.year,r.create_time desc
             </where>
 
     </select>

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

@@ -53,7 +53,7 @@
         FROM
         evaluation_score_count es
         LEFT JOIN indicator i ON es.indicator_id = i.id
-        LEFT JOIN evaluate_rule_info ei ON ei.indicator_id = es.indicator_id
+        INNER JOIN evaluate_rule_info ei ON ei.indicator_id = es.indicator_id
         LEFT JOIN indicator_type t ON i.indicator_type_id = t.id
         LEFT JOIN bin_stage b ON i.bin_stage = b.id
         LEFT JOIN bin_section bs ON i.bin_section = bs.id

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

@@ -177,6 +177,7 @@
             </if>
 
         </where>
+        order by  i.order_num asc
 
     </select>
 
@@ -202,9 +203,9 @@
                 AND i.id in
                 <foreach item="item" collection="ids" separator="," open="(" close=")" index="">'${item}'</foreach>
             </if>
-            and d.option_code in ('JHZ','DBZ','MBZ')
+            and d.option_code in ('JHZ','DBZ','MBZ','YFTR','SLFMZLSL','SLSYXXZLSL','KYRW')
         </where>
-        order by  dd.key_name,d.child_code asc
+        order by   i.order_num asc
     </select>
 
 </mapper>