权限公共指标处理

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

@@ -174,7 +174,6 @@ public class OrganizationEvaluationCommonInfoServiceImpl extends ServiceImpl<Org
 		for (OrganizationEvaluationInfo oei : evaluationInfoList){
 			List<OrganizationEvaluationCommonInfo> oeci = null != groupOptionData.get(oei.getIndicatorDictionaryId()) ? groupOptionData.get(oei.getIndicatorDictionaryId()) :null;
 			if(null !=oeci ){
-//				String ss  = oei.getIsQuantified() ? oeci."" : "";
 				if(oei.getIsQuantified()){
 					double ageSum = oeci.stream().mapToDouble(OrganizationEvaluationCommonInfo::getQuantifiedValue).sum();
 					oei.setQuantifiedValue(DoubleUtils.getRoundingNum(ageSum,2));

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

@@ -498,7 +498,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 		boolean titlemark = true;//标记生成标题
 		List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(organizationEvaluationId,organizationShortName, indicatorId,binSection,binStage,"");
 		List<IndicatorDictionary> dictionaryList = indicatorDictionaryService.list("", indicatorId, "", "");
-
+		Indicator indicator = indicatorService.getById(indicatorId);
 		//根据组织（公司）id分组
 		Map<String, List<OrganizationEvaluationInfoResDTO>> groupedData = infoResDTOList.stream()
 			.collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getOrganizationId));
@@ -540,11 +540,23 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 			deptstateMap.put("code","state");//名称
 			deptstateMap.put("flag", "3");//下拉
 			titlestateArray.add(deptstateMap);
-			title.put("状态", titlestateArray);
+			title.put("", titlestateArray);
+
+			if ("PUBLIC".equals(indicator.getDeptId())) {
+
+				Map operationMap = new LinkedHashMap();
+				List<Map> operationArray = new ArrayList<>();
+				operationMap.put("key", "操作");//名称
+				operationMap.put("code", "operation");//名称
+				operationMap.put("flag", "4");//下拉
+				operationArray.add(operationMap);
+				title.put("", operationArray);
+			}
 			titlemark = false;
 			data.put("title", title);
 		}
 
+
 		//获取行数据
 		//遍历按照公司分组后的数据
 		for (Map.Entry<String, List<OrganizationEvaluationInfoResDTO>> entry : groupedData.entrySet()) {

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

@@ -93,6 +93,9 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 	@Autowired
 	private IEvaluateReportService evaluateReportService;
 
+	@Autowired
+	private IMultipleBrandService multipleBrandService;
+
 
 	@Override
 	public IPage<OrganizationEvaluation> list(Integer pageNum, Integer pageSize, String id, String organizationEvaluationCode, List<String> checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month, String des) {
@@ -142,7 +145,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 			qw.lambda().like(OrganizationEvaluation::getDes, des);
 		}
 
-		qw.lambda().orderByDesc(OrganizationEvaluation::getCreateTime);
+		qw.lambda().orderByDesc(OrganizationEvaluation::getYear,OrganizationEvaluation::getMonth);
 
 		IPage<OrganizationEvaluation> list = baseMapper.selectPage(page, qw);
 
@@ -271,6 +274,23 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 						evaluateRuleList.addAll(scjyevaluateRuleList);
 					}
 				}
+
+
+//				//判断多块牌子  是否在该序列加权平均
+//				List<MultipleBrand> dkpz = multipleBrandService.getMultipleBranList2(evaluationRule.getOrganizationId(), "", "", evaluationRule.getEvaluationCycle(), evaluationRule.getYear(), "");
+//				List<MultipleBrand> filteredList = dkpz.stream()
+//					.filter(multipleBrand -> !"0".equals(multipleBrand.getParentId()))
+//					.collect(Collectors.toList());
+//				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());
+//
+//					if (null != zkevaluateRuleList && zkevaluateRuleList.size() > 0) {
+//						evaluateRuleList.addAll(zkevaluateRuleList);
+//					}
+//				}
+
+
 				//前期
 				double qqWeight = evaluationRule.getQqWeight();
 				if(qqWeight>0){
@@ -406,6 +426,23 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 						evaluateRuleList.addAll(scjyevaluateRuleList);
 					}
 				}
+
+
+				//判断多块牌子  是否在该序列加权平均
+				List<MultipleBrand> dkpz = multipleBrandService.getMultipleBranList2(evaluationRule.getOrganizationId(), "", "", evaluationRule.getEvaluationCycle(), evaluationRule.getYear(), "");
+				List<MultipleBrand> filteredList = dkpz.stream()
+					.filter(multipleBrand -> !"0".equals(multipleBrand.getParentId()))
+					.collect(Collectors.toList());
+				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(), "JDKP", evaluationRule.getYear());
+
+					if (null != zkevaluateRuleList && zkevaluateRuleList.size() > 0) {
+						evaluateRuleList.addAll(zkevaluateRuleList);
+					}
+				}
+
+
 				//前期
 				double qqWeight = evaluationRule.getQqWeight();
 				if(qqWeight>0){