考核报告调整

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

@@ -1,5 +1,7 @@
 package com.ims.eval.service.impl;
 
+import com.ims.eval.cache.CacheContext;
+import com.ims.eval.entity.BinSection;
 import com.ims.eval.entity.EvaluateReport;
 import com.ims.eval.entity.EvaluateReportInfo;
 import com.ims.eval.dao.EvaluateReportInfoMapper;
@@ -54,6 +56,10 @@ public class EvaluateReportInfoServiceImpl extends ServiceImpl<EvaluateReportInf
 
 		EvaluateReport evaluateReport = 	evaluateReportService.getById(evaluateReportId);
 
+		BinSection sections = CacheContext.bsnIdObject.get(evaluateReport.getBinSection());
+		if("JJ".equals(sections.getSectionCode()) || "QQ".equals(sections.getSectionCode())){
+			title.remove("p-scjyScore");
+		}
 
 		List<Map> titles = new ArrayList<>();
 		for (String key:title.keySet()){

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

@@ -145,6 +145,7 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 			reportName.append("综合考核评分汇总表");
 
 			evaluateReport.setEvaluateReportName(reportName.toString());
+			evaluateReport.setDes(reportName.toString());
 			evaluateReport.setOrganizationEvaluationId(evaluation.getId());
 			evaluateReport.setBinSection(bi.getId());
 			evaluateReport.setBinSectionName(bi.getSectionName());
@@ -206,16 +207,15 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 
 			for (OrganizationEvaluationRule rule : ruleList) {
 
-//				if(!("JJ".equals(bi.getSectionCode()) && "QQ".equals(bi.getSectionCode())) && rule.getScjyWeight()<= 0){
-//					continue;
-//				}
-//				if("JJ".equals(bi.getSectionCode()) && rule.getJjWeight()<= 0){
-//					continue;
-//				}
-//
-//				if("QQ".equals(bi.getSectionCode()) && rule.getQqWeight()<= 0){
-//					continue;
-//				}
+
+				if ("JJ".equals(bi.getSectionCode()) || "QQ".equals(bi.getSectionCode())) {
+					if (("JJ".equals(bi.getSectionCode()) && rule.getJjWeight() < 0.75) || rule.getScjyWeight() > 0) {
+						continue;
+					}
+					if (("QQ".equals(bi.getSectionCode()) && rule.getQqWeight() < 0.25) || rule.getScjyWeight() > 0) {
+						continue;
+					}
+				}
 
 				StringBuilder remark = new StringBuilder();
 				//生产95%基建5%前期0%

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

@@ -82,6 +82,9 @@ public class OrganizationStructureServiceImpl extends ServiceImpl<OrganizationSt
 	public List<OrganizationStructure> getList2(String id, Integer num, String type) {
 		QueryWrapper<OrganizationStructure> qw = new QueryWrapper<>();
 		List<OrganizationStructure> list2 = baseMapper.selectList(qw);
+
+
+
 		JSONArray arr = remoteServiceBuilder.getGatewayUrl().allDataNoControl();
 		if (null == arr) {
 			return null;