首页悬悬浮信息修改

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationPortalAttach.java

@@ -41,7 +41,7 @@ public class EvaluationPortalAttach extends Model {
     /**
      * 管理加分原因
      */
-    private String manageHeightNote;
+    private String manageHeighNote;
 
     /**
      * 管理扣分原因

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

@@ -2,6 +2,7 @@ package com.ims.eval.service.impl;
 
 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.DoubleUtils;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.cache.CacheContext;
@@ -102,17 +103,23 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 
 
 			EvaluateReport evaluateReport = new EvaluateReport();
+
+			StringBuilder des = new StringBuilder();
 			StringBuilder reportName = new StringBuilder();
+
+			reportName.append(evaluation.getYear()).append("年");
 			if ("NDKP".equals(evaluation.getCheckCycle())) {
 				if("FD".equals(bi.getSectionCode()) || "GD".equals(bi.getSectionCode())){
 					continue;
 				}
-				reportName.append("年度-");
+				des.append("年度");
+				reportName.append("-");
 				month = "";
 				evaluateReport.setMonth("-");
 			}
 			if ("JDKP".equals(evaluation.getCheckCycle())) {
-				reportName.append("季度-");
+				des.append("季度");
+				reportName.append(evaluation.getMonth()).append("季度-");
 				evaluateReport.setMonth(evaluation.getMonth());
 				if("XNYFG".equals(bi.getSectionCode()) || "ZHZC".equals(bi.getSectionCode())||
 					"GCGS".equals(bi.getSectionCode()) || "TJGS".equals(bi.getSectionCode())|
@@ -130,21 +137,20 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 					"GD".equals(bi.getSectionCode())){
 					continue;
 				}
-				reportName.append("月度-");
+				des.append("月度");
+				reportName.append(evaluation.getMonth()).append("月-");
 				month = evaluation.getMonth();
 				evaluateReport.setMonth(evaluation.getMonth());
 			}
+			des.append(bi.getSectionName());
+			des.append("综合考核评分汇总表");
+
 			reportName.append(bi.getSectionName());
-			if ("DWKP".equals(evaluation.getOrganizationType())) {
-				reportName.append("单位");
-			}
-			if ("BNMKP".equals(evaluation.getOrganizationType())) {
-				reportName.append("部门");
-			}
-			reportName.append("综合考核评分汇总表");
+			reportName.append("考核评分");
+
 
 			evaluateReport.setEvaluateReportName(reportName.toString());
-			evaluateReport.setDes(reportName.toString());
+			evaluateReport.setDes(des.toString());
 			evaluateReport.setOrganizationEvaluationId(evaluation.getId());
 			evaluateReport.setBinSection(bi.getId());
 			evaluateReport.setBinSectionName(bi.getSectionName());
@@ -379,7 +385,7 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 				//管理事项-加分事项
 				if(glsxjfScore>0){
 					portal.setManageHeigh(1);
-					portalAttach.setManageHeightNote(glsxJfRemark);
+					portalAttach.setManageHeighNote(glsxJfRemark);
 				}
 				//管理事项-扣分事项
 				if(glsxkfScore<0){
@@ -487,6 +493,18 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 		if (null == pageNum || null == pageSize) {
 			throw new CustomException("分页参数为空");
 		}
+
+		//季度
+		if ("JDKP".equals(checkCycle)) {
+			Date date = null;
+			if (StringUtils.isNotEmpty(month)) {
+				//随便填入年份和日期；只需要返回第几季度即可
+				date = DateUtils.toDate("2023-" + month + "-01");
+				month  =String.valueOf(DateUtils.getSeason(date));
+			}
+
+		}
+
 		IPage<EvaluateReport> list = null;
 		try {
 			list = baseMapper.selectListPage(page, id, evaluateReportName, binSection, organizationEvaluationId, organizationType, checkCycle, year, month);
@@ -497,6 +515,7 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 		return list;
 	}
 
+
 	@Override
 	public List<EvaluateReport> list(String organizationEvaluationId, String binSection) {
 		List<EvaluateReport> list = baseMapper.selectListAll(organizationEvaluationId,binSection);