权限公共指标处理

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/response/OrganizationEvaluationInfoResDTO.java

@@ -85,6 +85,12 @@ public class OrganizationEvaluationInfoResDTO {
 
 
 	/**
+	 * 责任部门id
+	 */
+	private String deptId;
+
+
+	/**
 	 * 指标类别
 	 */
 	private String typeName;

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

@@ -581,6 +581,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					indicatormap.put("organizationShortName", resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getOrganizationShortName());//公司名
 					indicatormap.put("organizationId", resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getOrganizationId());//公司id
 					indicatormap.put("state",resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getState());
+					indicatormap.put("operation","PUBLIC".equals(resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getDeptId()));
 					indicatormap.put("IS_LH_state","3");
 
 					mark = false;

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

@@ -276,19 +276,19 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				}
 
 
-//				//判断多块牌子  是否在该序列加权平均
+				//判断多块牌子  是否在该序列加权平均
-//				List<MultipleBrand> dkpz = multipleBrandService.getMultipleBranList2(evaluationRule.getOrganizationId(), "", "", evaluationRule.getEvaluationCycle(), evaluationRule.getYear(), "");
+				List<MultipleBrand> dkpz = multipleBrandService.getMultipleBranList2(evaluationRule.getOrganizationId(), "", "", evaluationRule.getEvaluationCycle(), evaluationRule.getYear(), "");
-//				List<MultipleBrand> filteredList = dkpz.stream()
+				List<MultipleBrand> filteredList = dkpz.stream()
-//					.filter(multipleBrand -> !"0".equals(multipleBrand.getParentId()))
+					.filter(multipleBrand -> !"0".equals(multipleBrand.getParentId()))
-//					.collect(Collectors.toList());
+					.collect(Collectors.toList());
-//				if (null == filteredList ||  filteredList.size() <= 0) {
+				if (null == filteredList ||  filteredList.size() <= 0) {
-//					//重点专项管理事项
+					//重点专项管理事项
-//					List<EvaluateRule> zkevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("GLSX").getId() + "," + CacheContext.bsnCodeObject.get("ZDZX").getId(), CacheContext.bseCodeObject.get("ZDZX").getId() + "," + CacheContext.bseCodeObject.get("GLSX").getId(), "NDKP", evaluationRule.getYear());
+					List<EvaluateRule> zkevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("GLSX").getId() + "," + CacheContext.bsnCodeObject.get("ZDZX").getId(), CacheContext.bseCodeObject.get("ZDZX").getId() + "," + CacheContext.bseCodeObject.get("GLSX").getId(), "NDKP", evaluationRule.getYear());
-//
+
-//					if (null != zkevaluateRuleList && zkevaluateRuleList.size() > 0) {
+					if (null != zkevaluateRuleList && zkevaluateRuleList.size() > 0) {
-//						evaluateRuleList.addAll(zkevaluateRuleList);
+						evaluateRuleList.addAll(zkevaluateRuleList);
-//					}
+					}
-//				}
+				}
 
 
 				//前期

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

@@ -296,6 +296,7 @@
 
         select
         ei.id,
+        ei.dept_id,
         oe.id organizationEvaluationId,
         ei.indicator_id,
         ei.is_quantified,