得分报告代码提交

ims-service/ims-eval/src/main/java/com/ims/eval/cache/CacheContext.java

@@ -48,15 +48,15 @@ public class CacheContext implements CommandLineRunner {
 	//经营阶段分类
 	public static List<BinStage> bseList = new ArrayList<>();
 	public static Map<String, String> bseIdMap = new HashMap<>();
+	public static Map<String, BinStage> bseIdObject = new HashMap<>();
+
 
 
 	//生产经营业务分类
 	public static List<BinSection> bsnList = new ArrayList<>();
-
 	public static Map<String, BinSection> bsnIdObject = new HashMap<>();
-
-
 	public static Map<String, BinSection> bsnCodeObject = new HashMap<>();
+	public static Map<String, String> bsnIdName = new HashMap<>();
 
 
 
@@ -116,6 +116,7 @@ public class CacheContext implements CommandLineRunner {
 		bseList.sort(Comparator.comparing(BinStage::getOrderNum));
 		bseList.stream().forEach(d -> {
 			bseIdMap.put(d.getId(), d.getStageName());
+			bseIdObject.put(d.getId(), d);
 		});
 
 
@@ -136,6 +137,7 @@ public class CacheContext implements CommandLineRunner {
 
 		bsnList.stream().forEach(d -> {
 			bsnCodeObject.put(d.getSectionCode(), d);
+			bsnIdName.put(d.getId(), d.getSectionName());
 		});
 	}
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.DateUtils;
 import com.ims.common.utils.StringUtils;
+import com.ims.eval.cache.CacheContext;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.dao.ResponsibilityIndicatorInfoMapper;
 import com.ims.eval.entity.*;
@@ -84,6 +85,9 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 	@Resource
 	private IEvaluationScoreCountService evaluationScoreCountService;
 
+	@Resource
+	private IBinSectionService binSectionService;
+
 
 	@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) {
@@ -594,7 +598,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 	@Override
 	public Map getEvaluationScoreInfo(String id, String binSection, String indicatorId, String organizationEvaluationRuleId) {
 
-
+		BinSection section =  CacheContext.bsnIdObject.get(binSection);
 
 		Map map = new HashMap();
 		String title1 = "";
@@ -607,7 +611,9 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 
 
 		//1.指标id是否为空（有值显示当前指标打分）
-		if (!StringUtils.isNotEmpty(indicatorId)) {
+		if (StringUtils.isNotEmpty(indicatorId)) {
+
+
 			IndicatorDTO indicator = iIndicatorService.getById(indicatorId);
 			title1 = indicator.getIndicatorName()+"打分表";
 
@@ -660,13 +666,24 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				}
 				bodylist.add(opmap);
 			}
-			map.put("title1",title1);
-			map.put("title2",indicatorName);
+
+			Map<String, Object> title = new LinkedHashMap<>();
+			title.put(title1,indicatorName);
+			map.put("title",title);
 			map.put("values",bodylist);
 
 		} else {
 			//2.指标id为空（显示所有指标打分）
 
+			if(section.getSectionCode().equals("JJ")){
+				title1 = section.getSectionName()+"项目指标打分表（工程建设部）";
+
+			}else if(section.getSectionCode().equals("QQ")){
+				title1 = section.getSectionName()+"项目指标打分表（计划发展部）";
+			}else {
+				title1 = section.getSectionName()+"企业生产指标考核打分表";
+			}
+
 			List<String> ruleIds = listdt.stream().map(EvaluationScoreInfoResDTO::getEvaluateRuleId).collect(Collectors.toList());
 			ruleIds = ruleIds.stream().distinct().collect(Collectors.toList());
 			if(ruleIds.size()>1){
@@ -748,13 +765,16 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 							zhdfflg2 = false;
 						}
 					}
-
 				}
 
 				bodylist2.add(opmap);
 			}
 
-			map.put("title",indicatorNamelist);
+			Map<String, Object> title1map = new LinkedHashMap<>();
+			Map<String, Object> title2map = new LinkedHashMap<>();
+			title2map.put("考核指标名称",indicatorNamelist);
+			title1map.put(title1,title2map);
+			map.put("title",title1map);
 			map.put("values",bodylist2);
 		}