业绩对标管理修改

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

@@ -210,7 +210,6 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 		if ("综合".equals(manageCategory)) {
 			manageCategory = "综合支持";
 		}
-		manageCategory = manageCategory + "生产经营";
 		return baseMapper.getEvaluateRuleListByYear(year, checkCycle, manageCategory);
 	}
 }

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

@@ -168,7 +168,11 @@ public class PerformanceBenchmarkInfoServiceImpl extends ServiceImpl<Performance
 	private void xb(String manageCategory, String checkCycle, Integer degreeYear, Integer quarterlyMonth) {
 		List<BenchmarkingRecord> benchmarkingRecordList = benchmarkingRecordService.selectList(manageCategory, checkCycle, degreeYear, quarterlyMonth, "寻标");
 		if (benchmarkingRecordList.size() == 0) {
+			String zq = checkCycle;
 			List<PerformanceBenchmarkInfo> performanceBenchmarkInfoList = new ArrayList<>();
+			if ("YDKP".equals(checkCycle)){
+				checkCycle = "JDKP";
+			}
 			EvaluateRule evaluateRule = evaluateRuleService.getEvaluateRuleListByYear(String.valueOf(degreeYear), checkCycle, manageCategory);
 			if (null != evaluateRule) {
 				List<EvaluateRuleInfo> evaluateRuleInfoList = evaluateRuleInfoService.getEvaluateRuleInfoByEvaluateRuleId(evaluateRule.getId());
@@ -216,7 +220,7 @@ public class PerformanceBenchmarkInfoServiceImpl extends ServiceImpl<Performance
 			}
 			super.saveBatch(performanceBenchmarkInfoList);
 			if (performanceBenchmarkInfoList.size() > 0) {
-				addRecord(manageCategory, checkCycle, degreeYear, quarterlyMonth, "寻标");
+				addRecord(manageCategory, zq, degreeYear, quarterlyMonth, "寻标");
 			}
 		}
 	}

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

@@ -132,7 +132,7 @@
                 AND check_cycle = #{checkCycle}
             </if>
             <if test="manageCategory != null and manageCategory != ''">
-                AND des like CONCAT('%',#{manageCategory},'%')
+                AND des like CONCAT('%',#{manageCategory},'生产经营%')
             </if>
         </where>
     </select>

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

@@ -416,13 +416,13 @@
         left join unit_install_capacity uic on uic.unit_id = oei.organization_id
         <where>
             oei.is_quantified = 't'
-            <if test="indicatorDictionaryId != null and indicatorDictionaryId !='' ">
+            <if test="indicatorDictionaryId != null and indicatorDictionaryId != '' ">
                 and oei.indicator_dictionary_id = #{indicatorDictionaryId}
             </if>
-            <if test="degreeYear !=null and degreeYear !=''">
+            <if test="degreeYear != null and degreeYear != '' ">
                 and oe.year = #{degreeYear}
             </if>
-            <if test="quarterlyMonth !=null and quarterlyMonth !=''">
+            <if test="quarterlyMonth != null and quarterlyMonth != '' and quarterlyMonth != 'null' ">
                 and oe.month = #{quarterlyMonth}
             </if>
         </where>