Skip to content

A
amos-boot-biz
Commit b2c0bf7e authored by tianbo's avatar tianbo
Browse files
Options

fix(statistics): 修正统计数据日期字段映射错误

- 将 JGDPStatisticsServiceImpl 中的 date_format 字段替换为 auditPassDate - 更新 JGStatisticsMapper.xml 中的 SQL 查询字段别名 - 确保月度和年度统计逻辑使用正确的日期字段
parent 16c743b9
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JGStatisticsMapper.xml
View file @ b2c0bf7e
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
<select id="newRegEquCountByMonth" resultType="java.util.Map"> <select id="newRegEquCountByMonth" resultType="java.util.Map">
SELECT COUNT SELECT COUNT
(1), (1),
TO_CHAR(ur.audit_pass_date, 'YYYY-MM-DD') TO_CHAR(ur.audit_pass_date, 'YYYY-MM-DD') auditPassDate
FROM tzs_jg_use_registration ur FROM tzs_jg_use_registration ur
INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr
INNER JOIN idx_biz_jg_supervision_info si ON te.equ_id = si."RECORD" INNER JOIN idx_biz_jg_supervision_info si ON te.equ_id = si."RECORD"
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<select id="newVehicleEquCountByMonth" resultType="java.util.Map"> <select id="newVehicleEquCountByMonth" resultType="java.util.Map">
SELECT COUNT SELECT COUNT
(1), (1),
TO_CHAR(ur.audit_pass_date, 'YYYY-MM-DD') TO_CHAR(ur.audit_pass_date, 'YYYY-MM-DD') auditPassDate
FROM tzs_jg_vehicle_information ur FROM tzs_jg_vehicle_information ur
INNER JOIN tzs_jg_vehicle_information_eq te ON te.vehicle_id = ur.sequence_nbr INNER JOIN tzs_jg_vehicle_information_eq te ON te.vehicle_id = ur.sequence_nbr
INNER JOIN idx_biz_jg_supervision_info si ON te.equ_id = si."RECORD" INNER JOIN idx_biz_jg_supervision_info si ON te.equ_id = si."RECORD"
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
<select id="newRegEquCountByPeriod" resultType="java.util.Map"> <select id="newRegEquCountByPeriod" resultType="java.util.Map">
SELECT COUNT SELECT COUNT
(1), (1),
TO_CHAR(ur.audit_pass_date,'YYYY-MM') TO_CHAR(ur.audit_pass_date,'YYYY-MM') auditPassDate
FROM tzs_jg_use_registration ur FROM tzs_jg_use_registration ur
INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr
INNER JOIN idx_biz_jg_supervision_info si ON te.equ_id = si."RECORD" INNER JOIN idx_biz_jg_supervision_info si ON te.equ_id = si."RECORD"
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
<select id="newVehicleEquCountByPeriod" resultType="java.util.Map"> <select id="newVehicleEquCountByPeriod" resultType="java.util.Map">
SELECT COUNT SELECT COUNT
( 1 ) , ( 1 ) ,
TO_CHAR(ur.audit_pass_date,'YYYY-MM') TO_CHAR(ur.audit_pass_date,'YYYY-MM') auditPassDate
FROM FROM
tzs_jg_vehicle_information ur tzs_jg_vehicle_information ur
INNER JOIN tzs_jg_vehicle_information_eq te ON te.vehicle_id = ur.sequence_nbr INNER JOIN tzs_jg_vehicle_information_eq te ON te.vehicle_id = ur.sequence_nbr
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java
View file @ b2c0bf7e
...@@ -1730,10 +1730,10 @@ public class JGDPStatisticsServiceImpl { ...@@ -1730,10 +1730,10 @@ public class JGDPStatisticsServiceImpl {
List<Map<String, Object>> useCountList = jgStatisticsMapper.newRegEquCountByMonth(orgCodeP); List<Map<String, Object>> useCountList = jgStatisticsMapper.newRegEquCountByMonth(orgCodeP);
List<Map<String, Object>> vehicleCountList = jgStatisticsMapper.newVehicleEquCountByMonth(orgCodeP); List<Map<String, Object>> vehicleCountList = jgStatisticsMapper.newVehicleEquCountByMonth(orgCodeP);
for (int i = 0; i < useCountList.size(); i++) { for (int i = 0; i < useCountList.size(); i++) {
useCountMap.put(useCountList.get(i).getOrDefault("date_format", "") + "", Integer.valueOf(useCountList.get(i).getOrDefault("count", 0) + "")); useCountMap.put(useCountList.get(i).getOrDefault("auditPassDate", "") + "", Integer.valueOf(useCountList.get(i).getOrDefault("count", 0) + ""));
} }
for (int i = 0; i < vehicleCountList.size(); i++) { for (int i = 0; i < vehicleCountList.size(); i++) {
vehicleCountMap.put(vehicleCountList.get(i).getOrDefault("date_format", "") + "", Integer.valueOf(vehicleCountList.get(i).getOrDefault("count", 0) + "")); vehicleCountMap.put(vehicleCountList.get(i).getOrDefault("auditPassDate", "") + "", Integer.valueOf(vehicleCountList.get(i).getOrDefault("count", 0) + ""));
} }
for (int i = 0; i < LocalDate.now().getDayOfMonth(); i++) { for (int i = 0; i < LocalDate.now().getDayOfMonth(); i++) {
xDataList.add(LocalDate.now().minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); xDataList.add(LocalDate.now().minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
...@@ -1745,10 +1745,10 @@ public class JGDPStatisticsServiceImpl { ...@@ -1745,10 +1745,10 @@ public class JGDPStatisticsServiceImpl {
List<Map<String, Object>> useCountList = jgStatisticsMapper.newRegEquCountByPeriod(orgCodeP, DateUtil.beginOfYear(new Date()), DateUtil.endOfYear(new Date())); List<Map<String, Object>> useCountList = jgStatisticsMapper.newRegEquCountByPeriod(orgCodeP, DateUtil.beginOfYear(new Date()), DateUtil.endOfYear(new Date()));
List<Map<String, Object>> vehicleCountList = jgStatisticsMapper.newVehicleEquCountByPeriod(orgCodeP, DateUtil.beginOfYear(new Date()), DateUtil.endOfYear(new Date())); List<Map<String, Object>> vehicleCountList = jgStatisticsMapper.newVehicleEquCountByPeriod(orgCodeP, DateUtil.beginOfYear(new Date()), DateUtil.endOfYear(new Date()));
for (int i = 0; i < useCountList.size(); i++) { for (int i = 0; i < useCountList.size(); i++) {
useCountMap.put(useCountList.get(i).getOrDefault("date_format", "") + "", Integer.valueOf(useCountList.get(i).getOrDefault("count", 0) + "")); useCountMap.put(useCountList.get(i).getOrDefault("auditPassDate", "") + "", Integer.valueOf(useCountList.get(i).getOrDefault("count", 0) + ""));
} }
for (int i = 0; i < vehicleCountList.size(); i++) { for (int i = 0; i < vehicleCountList.size(); i++) {
vehicleCountMap.put(vehicleCountList.get(i).getOrDefault("date_format", "") + "", Integer.valueOf(vehicleCountList.get(i).getOrDefault("count", 0) + "")); vehicleCountMap.put(vehicleCountList.get(i).getOrDefault("auditPassDate", "") + "", Integer.valueOf(vehicleCountList.get(i).getOrDefault("count", 0) + ""));
} }
for (int i = 0; i < LocalDate.now().getMonth().getValue(); i++) { for (int i = 0; i < LocalDate.now().getMonth().getValue(); i++) {
xDataList.add(LocalDate.now().minusMonths(i).format(DateTimeFormatter.ofPattern("yyyy-MM"))); xDataList.add(LocalDate.now().minusMonths(i).format(DateTimeFormatter.ofPattern("yyyy-MM")));
...@@ -1760,10 +1760,10 @@ public class JGDPStatisticsServiceImpl { ...@@ -1760,10 +1760,10 @@ public class JGDPStatisticsServiceImpl {
List<Map<String, Object>> useCountList = jgStatisticsMapper.newRegEquCountByPeriod(orgCodeP, DateUtil.beginOfYear(DateUtil.offset(new Date(), DateField.YEAR, -1)), DateUtil.endOfYear(DateUtil.offset(new Date(), DateField.YEAR, -1))); List<Map<String, Object>> useCountList = jgStatisticsMapper.newRegEquCountByPeriod(orgCodeP, DateUtil.beginOfYear(DateUtil.offset(new Date(), DateField.YEAR, -1)), DateUtil.endOfYear(DateUtil.offset(new Date(), DateField.YEAR, -1)));
List<Map<String, Object>> vehicleCountList = jgStatisticsMapper.newVehicleEquCountByPeriod(orgCodeP, DateUtil.beginOfYear(DateUtil.offset(new Date(), DateField.YEAR, -1)), DateUtil.endOfYear(DateUtil.offset(new Date(), DateField.YEAR, -1))); List<Map<String, Object>> vehicleCountList = jgStatisticsMapper.newVehicleEquCountByPeriod(orgCodeP, DateUtil.beginOfYear(DateUtil.offset(new Date(), DateField.YEAR, -1)), DateUtil.endOfYear(DateUtil.offset(new Date(), DateField.YEAR, -1)));
for (int i = 0; i < useCountList.size(); i++) { for (int i = 0; i < useCountList.size(); i++) {
useCountMap.put(useCountList.get(i).getOrDefault("date_format", "") + "", Integer.valueOf(useCountList.get(i).getOrDefault("count", 0) + "")); useCountMap.put(useCountList.get(i).getOrDefault("auditPassDate", "") + "", Integer.valueOf(useCountList.get(i).getOrDefault("count", 0) + ""));
} }
for (int i = 0; i < vehicleCountList.size(); i++) { for (int i = 0; i < vehicleCountList.size(); i++) {
vehicleCountMap.put(vehicleCountList.get(i).getOrDefault("date_format", "") + "", Integer.valueOf(vehicleCountList.get(i).getOrDefault("count", 0) + "")); vehicleCountMap.put(vehicleCountList.get(i).getOrDefault("auditPassDate", "") + "", Integer.valueOf(vehicleCountList.get(i).getOrDefault("count", 0) + ""));
} }
int lastYear = LocalDate.now().getYear() - 1; int lastYear = LocalDate.now().getYear() - 1;
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment