首页查询日期参数接口

ims-service/ims-eval/src/main/java/com/ims/eval/controller/EvaluationPortalController.java

@@ -41,9 +41,14 @@ public class EvaluationPortalController {
 
 	@GetMapping(value = "listPage")
 	public R listpage(String binSection, String year, String season) {
-		Map<String, Object> data = portalService.getPortalData(binSection, year, season);
 
 		IPage<EvaluationPortal> list = portalService.listPage(binSection, year, season);
+		return R.ok().data(list);
+	}
+
+	@GetMapping(value = "homeSeason")
+	public R getHomeSeason() {
+		Map<String, String> data = portalService.getHomeSeason();
 		return R.ok().data(data);
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationPortalMapper.java

@@ -19,4 +19,7 @@ public interface EvaluationPortalMapper extends BaseMapper<EvaluationPortal> {
     List<Map<String, Object>> selectPortalList(String binSection, String year, String season);
 
 	List<EvaluationPortal> selectEvaluationPortalList(String year, String season,String binSection, String memo1);
+
+
+	EvaluationPortal getHomeSeason();
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationPortalService.java

@@ -62,4 +62,7 @@ public interface IEvaluationPortalService extends IService<EvaluationPortal> {
 	IPage<EvaluationPortal> listPage(String binSection, String year, String season);
 
 	Map<String, Object> selectPortalList(String binSection, String year, String season);
+
+
+	Map<String, String> getHomeSeason();
 }

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

@@ -268,12 +268,11 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 
 					List<EvaluationScoreCount> scoreCount1 = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("SCJY".split(",")),bi.getId());
 
+					//基准分
 					heighStandard = scoreCount1.stream().filter(s->s.getStandard().equals("1")).map(EvaluationScoreCount::getRemark).collect(Collectors.joining(System.lineSeparator()));
 					lowStandard = scoreCount1.stream().filter(s->s.getStandard().equals("-1")).map(EvaluationScoreCount::getRemark).collect(Collectors.joining(System.lineSeparator()));
 
 
-
-
 					//等分
 					double score1 = scoreCount1.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
 					spMultiply = spMultiply + (mb.getProfit() * score1);
@@ -286,6 +285,11 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 						List<EvaluationScoreCount> scoreCount2 = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, ruleMap.get(pb.getOrganizationId()).getId(), null, Arrays.asList("SCJY".split(",")),pb.getBinSection());
 						double score2 = scoreCount2.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
 						spMultiply = spMultiply + (pb.getProfit() * score2);
+
+//						//基准分
+//						heighStandard = heighStandard+scoreCount2.stream().filter(s->s.getStandard().equals("1")).map(EvaluationScoreCount::getRemark).collect(Collectors.joining(",","",","));
+//						lowStandard = lowStandard+scoreCount2.stream().filter(s->s.getStandard().equals("-1")).map(EvaluationScoreCount::getRemark).collect(Collectors.joining(",","",","));
+
 					}
 
 					scjyScore = spMultiply / totalProfit;
@@ -321,7 +325,7 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 				//生产经营得分
 				if(scjyScore>0){
 					reportInfo.setScjyScore(DoubleUtils.keepPrecision(scjyScore, 2));//保存到考评报告
-					portal.setScore(DoubleUtils.keepPrecision(scjyScore, 2));//保存到首页排行
+
 				}else {
 					//保存到考评报告
 					List<EvaluationScoreCount> scjyScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("SCJY".split(",")),bi.getId());
@@ -332,18 +336,28 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 					heighStandard = scjyScoreCount.stream().filter(s->s.getStandard().equals("1")).map(EvaluationScoreCount::getRemark).collect(Collectors.joining(System.lineSeparator()));
 					lowStandard = scjyScoreCount.stream().filter(s->s.getStandard().equals("-1")).map(EvaluationScoreCount::getRemark).collect(Collectors.joining(System.lineSeparator()));
 
-					portal.setScore(DoubleUtils.keepPrecision(scjyScore, 2));//保存到首页排行
+
 				}
 
 				//前期得分
 				List<EvaluationScoreCount> qqScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("QQXM".split(",")),"");
+				//前期得分
 				Double qqScore = qqScoreCount.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
 				reportInfo.setQqScore(DoubleUtils.keepPrecision(qqScore, 2));
+				//前期发展基准分
+				heighStandard = heighStandard+System.lineSeparator()+qqScoreCount.stream().filter(s->s.getStandard().equals("1")).map(EvaluationScoreCount::getRemark).collect(Collectors.joining(System.lineSeparator()));
+				lowStandard = lowStandard+System.lineSeparator()+qqScoreCount.stream().filter(s->s.getStandard().equals("-1")).map(EvaluationScoreCount::getRemark).collect(Collectors.joining(System.lineSeparator()));
+
 
 				//基建得分
 				List<EvaluationScoreCount> jjScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("JJXM".split(",")),"");
+				//基建得分
 				Double jjScore = jjScoreCount.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
 				reportInfo.setJjScore(DoubleUtils.keepPrecision(jjScore, 2));
+				//基建基准分
+				heighStandard = heighStandard+System.lineSeparator()+jjScoreCount.stream().filter(s->s.getStandard().equals("1")).map(EvaluationScoreCount::getRemark).collect(Collectors.joining(System.lineSeparator()));
+				lowStandard = lowStandard+System.lineSeparator()+jjScoreCount.stream().filter(s->s.getStandard().equals("-1")).map(EvaluationScoreCount::getRemark).collect(Collectors.joining(System.lineSeparator()));
+
 
 
 				List<EvaluationScoreCount> addSubScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("ZDZX,GLSX".split(",")),"");
@@ -355,7 +369,7 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 				String zdzxJfRemark = zdzxScoreCount.stream().map(EvaluationScoreCount::getJfRemark).collect(Collectors.joining(System.lineSeparator()));
 
 				//重点专项-减分
-				Double zdzxkfScore = zdzxScoreCount.stream().mapToDouble(EvaluationScoreCount::getJfScore).sum();
+				Double zdzxkfScore = zdzxScoreCount.stream().mapToDouble(EvaluationScoreCount::getKfScore).sum();
 				String zdzxKfRemark = zdzxScoreCount.stream().map(EvaluationScoreCount::getKfRemark).collect(Collectors.joining(System.lineSeparator()));
 
 
@@ -456,6 +470,7 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 				}else {
 					reportInfo.setScore(DoubleUtils.keepPrecision(zhScore, 2));
 					reportInfo.setDiscountScore(1.0);
+					portal.setScore(DoubleUtils.keepPrecision(zhScore, 2));//保存到首页排行
 				}
 				reportInfo.setRemark(remark.toString());
 				evaluateRuleInfoList.add(reportInfo);

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

@@ -139,5 +139,15 @@ public class EvaluationPortalServiceImpl extends ServiceImpl<EvaluationPortalMap
 		return map;
 	}
 
+	@Override
+	public Map<String, String> getHomeSeason() {
+		Map<String, String> hs = new HashMap<>();
+		EvaluationPortal portal = baseMapper.getHomeSeason();
 
+		if(null != portal){
+			hs.put("year",portal.getYear());
+			hs.put("season",portal.getSeason());
+		}
+		return hs;
+	}
 }

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

@@ -105,4 +105,12 @@
     </select>
 
 
+    <select id="getHomeSeason" resultType="com.ims.eval.entity.EvaluationPortal">
+        SELECT *
+        FROM evaluation_portal
+        ORDER BY year DESC, season DESC
+        LIMIT 1;
+    </select>
+
+
 </mapper>