修改bug

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

@@ -708,7 +708,11 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 						mark = false;
 					}
 					//指标属性
-					indicatormap.put(d.getChildCode() + "_" + d.getOptionCode(), null == resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getNonQuantifiedValue() ? "" : resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getNonQuantifiedValue());
+					Object ob = null;
+					if (resultMap.get(d.getChildCode() + "_" + d.getOptionCode()) != null && resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getNonQuantifiedValue() != null) {
+						ob = resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getNonQuantifiedValue();
+					}
+					indicatormap.put(d.getChildCode() + "_" + d.getOptionCode(), null == ob ? "" : ob);
 				}
 			}
 			indicatormap.put("state", state);//状态

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

@@ -210,7 +210,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 	@Override
 	public boolean saveOrUpdate(OrganizationEvaluation entity) {
 		//获取指定部门的规则
-		List<OrganizationEvaluationRule> list = organizationEvaluationRuleService.listByIsCheck(entity.getOrganizationType(), entity.getCheckCycle(), "", true, false);
+		List<OrganizationEvaluationRule> list = organizationEvaluationRuleService.listByIsCheck(entity.getOrganizationType(), entity.getCheckCycle(), entity.getYear(), true, false);
 		if (!"JDKP".equals(entity.getCheckCycle()) && (null == list || list.size() <= 0)) {
 			throw new CustomException("不存在单位权重配置");
 		}
@@ -301,7 +301,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 		for (OrganizationEvaluationRule oer : oers) {
 			if (!oer.getBinSection().contains(",")) {
 				OrganizationRating or = new OrganizationRating();
-				or.setYear(orgEva.getYear());
+				or.setYear(entity.getYear());
 				or.setOrganizationShortName(oer.getOrganizationShortName());
 				or.setOrganizationId(oer.getOrganizationId());
 				or.setOrganizationYearRatingId(uuid);
@@ -413,6 +413,11 @@ 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);
+				}
 
 				//前期
 				double qqWeight = evaluationRule.getQqWeight();