bug修改

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

@@ -1219,13 +1219,6 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 
 	@Override
 	public boolean importExcel2(MultipartFile file, HttpServletRequest request, String organizationEvaluationId, String indicatorId, String binSection, String binStage) throws IOException {
-
-//	public boolean importExcel(MultipartFile file, HttpServletRequest request) throws IOException {
-//		String organizationEvaluationId = "b6100f16f52bb1f295fef30c8c615a6a";
-////		String indicatorId = "72e7f322011f14da236b385dc5b87c4e";
-//		String indicatorId = "e574a80a46dd0b43fbc891e19d3af6bc";
-//		String binSection2 = "1635165043711266817";
-//		String binStage = "1635160119237140482";
 		List<LinkedHashMap<String, Object>> dataList = new ArrayList<>();
 
 		List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(organizationEvaluationId, "", indicatorId, binSection, binStage, "");

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

@@ -380,10 +380,10 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				}
 
 				//科技创新
-//				List<EvaluateRule> kjevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("KJCX").getId(), CacheContext.bseCodeObject.get("KJCX").getId(), "NDKP", evaluationRule.getYear());
-//				if (null != kjevaluateRuleList && kjevaluateRuleList.size() > 0) {
-//					evaluateRuleList.addAll(kjevaluateRuleList);
-//				}
+				List<EvaluateRule> kjevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("KJCX").getId(), CacheContext.bseCodeObject.get("KJCX").getId(), "NDKP", evaluationRule.getYear());
+				if (null != kjevaluateRuleList && kjevaluateRuleList.size() > 0) {
+					evaluateRuleList.addAll(kjevaluateRuleList);
+				}
 
 				//前期
 				double qqWeight = evaluationRule.getQqWeight();