From d3e36feef46d4b5d381333698977a5a913f18284 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 29 九月 2025 13:39:59 +0800
Subject: [PATCH] 新问题
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 22 ++++++++++++++++------
ycl-common/src/main/java/enumeration/ConstructionTypeEnum.java | 11 ++++++-----
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 12 ++++++++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 8 ++++++++
4 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/ycl-common/src/main/java/enumeration/ConstructionTypeEnum.java b/ycl-common/src/main/java/enumeration/ConstructionTypeEnum.java
index 3d2de5f..36b6f7a 100644
--- a/ycl-common/src/main/java/enumeration/ConstructionTypeEnum.java
+++ b/ycl-common/src/main/java/enumeration/ConstructionTypeEnum.java
@@ -11,11 +11,12 @@
**/
@Getter
public enum ConstructionTypeEnum {
- PHASE_ONE_TWO("涓�浜屾湡"),
- PHASE_THREE("涓夋湡"),
- PHASE_FOURTH("鍥涙湡"),
- CHECK_ENTER_SICHUAN("鍏ュ窛鍗虫");
-
+ PHASE_ONE_TWO("涓�浜屾湡"),//DX_
+ PHASE_THREE("涓夋湡"),//LT
+ PHASE_FOURTH("鍥涙湡"),//DX_R\DX_RS
+ CHECK_ENTER_SICHUAN("鍏ュ窛鍗虫"),
+ EASTERN_NEW_CITY("涓滈儴鏂板煄"),//DX_RD
+ YAN_TAN_PHASE_TWO_FACE("娌挎哗浜屾湡浜鸿劯");//DX_R2
private String desc;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index bf361f3..83fe3b2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -42,6 +42,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.InetAddress;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
@@ -570,24 +571,33 @@
dashboardQuery.setStartTime(format.format(DateUtils.getDayStart(now)));
dashboardQuery.setEndTime(format.format(DateUtils.getDayEnd(now)));
List<CheckScore> dashboard = scoreMapper.dashboard(dashboardQuery);
+ DecimalFormat decimalFormat = new DecimalFormat("0.00%");
+ // 璁剧疆鍥涜垗浜斿叆妯″紡
+ decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
//鍒濆鍖栧悇涓尯鍘挎暟鎹�
Map<String, Map<String, Object>> resultMap = new HashMap<>();
for (AreaDeptEnum value : AreaDeptEnum.values()) {
Map<String, Object> map = new HashMap<>();
- map.put("video", 0);
- map.put("car", 0);
- map.put("face", 0);
+ map.put("video", "0.00%");
+ map.put("car","0.00%");
+ map.put("face", "0.00%");
resultMap.put(value.getName(), map);
}
//濉厖鍚勪釜鍖哄幙鏁版嵁
for (CheckScore checkScore : dashboard) {
Map<String, Object> map = resultMap.get(checkScore.getDeptName());
+ BigDecimal score = checkScore.getScore();
+ // 鏍稿績閫昏緫锛氬師濮媠core 脳10 鈫� 淇濈暀涓や綅灏忔暟 鈫� 鎷兼帴鐧惧垎鍙�
+ BigDecimal scoreMultiplied = score.multiply(new BigDecimal("10")); // 4.6160 脳10 = 46.160
+ BigDecimal scoreWithTwoDecimals = scoreMultiplied.setScale(2, RoundingMode.HALF_UP); // 淇濈暀涓や綅灏忔暟锛�46.16
+ String formattedScore = scoreWithTwoDecimals + "%"; // 鎷兼帴鐧惧垎鍙凤細46.16%
+
if (CheckConstants.Rule_Category_Video.equals(checkScore.getExamineCategory())) {
- map.put("video", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ map.put("video", formattedScore);
} else if (CheckConstants.Rule_Category_Car.equals(checkScore.getExamineCategory())) {
- map.put("car", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ map.put("car", formattedScore);
} else if (CheckConstants.Rule_Category_Face.equals(checkScore.getExamineCategory())) {
- map.put("face", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ map.put("face",formattedScore);
}
resultMap.put(checkScore.getDeptName(), map);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index 4b06f6c..14e36ca 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -258,6 +258,14 @@
public Result page(ReportQuery query) {
IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
query.setUnitId(SecurityUtils.getUnitId());
+ if (query.getReportTimeEnd() != null) {
+ query.setReportTimeEnd(DateUtils.getDayEnd(query.getReportTimeEnd()));
+ }
+
+ if (query.getEffectTimeEnd() != null) {
+ query.setEffectTimeEnd(DateUtils.getDayEnd(query.getEffectTimeEnd()));
+ }
+
baseMapper.page(page, query);
List<SysDictData> errorTypeList = dictTypeService.selectDictDataByType("report_error_type");
Map<String, String> dictMap = errorTypeList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index c35f26a..bdf1ed6 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -182,6 +182,12 @@
m.name LIKE 'DX_RS%'
)
</when>
+ <when test="constructionType == 'EASTERN_NEW_CITY'">
+ and m.name LIKE 'DX_RD%'
+ </when>
+ <when test="constructionType == 'YAN_TAN_PHASE_TWO_FACE'">
+ and m.name LIKE 'DX_R2%'
+ </when>
</choose>
</if>
@@ -450,6 +456,12 @@
m.name LIKE 'DX_RS%'
)
</when>
+ <when test="constructionType == 'EASTERN_NEW_CITY'">
+ and m.name LIKE 'DX_RD%'
+ </when>
+ <when test="constructionType == 'YAN_TAN_PHASE_TWO_FACE'">
+ and m.name LIKE 'DX_R2%'
+ </when>
</choose>
</if>
${params.dataScope}
--
Gitblit v1.8.0