From 97be2be1dabbb62b1875fe0ebb4a84d315ec7d49 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 15 八月 2024 16:46:18 +0800
Subject: [PATCH] feat：首页数据调整
---
ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml | 4 +
ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java | 7 +++
ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java | 10 +++++
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 19 +++++++++
ycl-server/src/main/java/com/ycl/platform/mapper/ContractScoreMapper.java | 7 ---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 10 +++++
ycl-server/src/main/java/com/ycl/platform/controller/HomeController.java | 5 +-
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 5 --
ycl-server/src/main/java/com/ycl/platform/service/IContractScoreService.java | 6 ---
ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml | 10 -----
10 files changed, 50 insertions(+), 33 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/HomeController.java b/ycl-server/src/main/java/com/ycl/platform/controller/HomeController.java
index d0406b8..dd9e475 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/HomeController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/HomeController.java
@@ -22,7 +22,6 @@
private final ITMonitorService tMonitorService;
private final WorkOrderService workOrderService;
private final YwPointService ywPointService;
- private final IContractScoreService contractScoreService;
private final ICheckScoreService checkScoreService;
@GetMapping("/ywUnitList")
@@ -56,8 +55,8 @@
}
@GetMapping("/calculate")
- public AjaxResult calculate() {
- return AjaxResult.success(contractScoreService.calculate());
+ public AjaxResult calculate(String category) {
+ return AjaxResult.success(checkScoreService.calculate(category));
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java
index a62f559..42a0ce9 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java
@@ -7,6 +7,7 @@
import com.ycl.platform.domain.entity.CheckScore;
import enumeration.OperationType;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -80,4 +81,13 @@
* @return 鏁版嵁
*/
List<Map<String, Object>> home();
+
+ /**
+ * 棣栭〉鏍哥畻
+ * @param startDate 鏈湀绗竴澶�
+ * @param endDate 褰撳墠鏃堕棿
+ * @param category 鍒嗙被
+ * @return 鏁版嵁
+ */
+ List<Map<String, Object>> calculate(Date startDate, Date endDate, String category);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/ContractScoreMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractScoreMapper.java
index 9c9ec38..df7532b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/ContractScoreMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractScoreMapper.java
@@ -4,7 +4,6 @@
import com.ycl.platform.domain.entity.ContractScore;
import java.util.List;
-import java.util.Map;
/**
* 鍚堝悓鎵撳垎Mapper鎺ュ彛
@@ -61,10 +60,4 @@
* @return 缁撴灉
*/
public int deleteDefaultScoreByIds(Long[] ids);
-
- /**
- * 棣栭〉鏍哥畻
- * @return 鏍哥畻
- */
- List<Map<String, Object>> calculate();
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java
index 7302032..48af587 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java
@@ -55,6 +55,13 @@
* @return 鏁版嵁
*/
List<Map<String, Object>> home();
+
+
+ /**
+ * 棣栭〉鏍哥畻
+ * @return 鏍哥畻
+ */
+ List<Map<String, Object>> calculate(String category);
// /**
// * 鏂板鑰冩牳绉垎鏄庣粏
// *
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IContractScoreService.java b/ycl-server/src/main/java/com/ycl/platform/service/IContractScoreService.java
index 6240574..b50a7f4 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/IContractScoreService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IContractScoreService.java
@@ -5,7 +5,6 @@
import java.io.Serializable;
import java.util.List;
-import java.util.Map;
/**
* 鍚堝悓鎵撳垎Service鎺ュ彛
@@ -48,9 +47,4 @@
*/
List<ContractScore> getDateRangeScoreByContractId(Long id, String startTime, String endTime);
- /**
- * 棣栭〉鏍哥畻
- * @return 鏍哥畻
- */
- List<Map<String, Object>> calculate();
}
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 e9503ef..decb126 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
@@ -295,6 +295,16 @@
return baseMapper.home();
}
+
+ @Override
+ public List<Map<String, Object>> calculate(String category) {
+ Calendar calendar = Calendar.getInstance();
+ Date endDate = calendar.getTime();
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ Date startDate = calendar.getTime();
+ return scoreMapper.calculate(startDate, endDate, category);
+ }
+
// /**
// * 鏂板鑰冩牳绉垎
// *
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
index 7e46a9c..33d47fe 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
@@ -17,7 +17,6 @@
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -90,8 +89,4 @@
.list();
}
- @Override
- public List<Map<String, Object>> calculate() {
- return contractScoreMapper.calculate();
- }
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 6c5fa75..6096ce2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -137,6 +137,7 @@
</select>
<select id="home" resultType="java.util.Map">
+ <![CDATA[
SELECT
DATE_FORMAT(cs.create_time, '%Y-%m-%d %h:%i:%s') AS createTime,
d.area,
@@ -147,8 +148,24 @@
t_check_score cs
LEFT JOIN t_check_template ct ON cs.template_id = ct.id
LEFT JOIN sys_dept d ON cs.dept_id = d.dept_id
- WHERE cs.score > ct.alarm_score
+ WHERE cs.score < ct.alarm_score
ORDER BY cs.create_time DESC
+ ]]>
+ </select>
+
+ <select id="calculate" resultType="java.util.Map">
+ SELECT
+ dept_name AS deptName,
+ ROUND(AVG(score)) AS score
+ FROM
+ t_check_score tcs
+ LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
+ WHERE
+ examine_tag = 1
+ AND examine_category = #{category}
+ AND DATE_FORMAT(tcs.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m') AND DATE_FORMAT(#{endDate}, '%Y-%m')
+ GROUP BY tcs.dept_id
+ ORDER BY score DESC, tcs.dept_id
</select>
</mapper>
\ No newline at end of file
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml
index 9446601..fdfb7ca 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml
@@ -112,14 +112,4 @@
</foreach>
</delete>
- <select id="calculate" resultType="java.util.Map">
- SELECT
- SUBSTRING_INDEX(rule_name, '/', 1) AS name,
- COUNT(*) AS num,
- -SUM(score) AS score
- FROM t_contract_score
- WHERE auditing_status = 'PASS' AND deleted = 0
- GROUP BY SUBSTRING_INDEX(rule_name, '/', 1)
- </select>
-
</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
index 21f0424..9df4474 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
@@ -112,11 +112,13 @@
<select id="ywUnitCount" resultType="java.util.Map">
SELECT
u.unit_name AS name,
- COUNT(tcs.id) AS num
+ COUNT(tcs.id) AS num,
+ 100 - SUM(score) AS score
FROM
t_contract_score tcs
LEFT JOIN t_yw_unit u ON tcs.unit_id = u.id
WHERE tcs.deleted = 0
GROUP BY tcs.unit_id
+ ORDER BY score DESC
</select>
</mapper>
--
Gitblit v1.8.0