From a225b953d1eb278732a14e88cb87ce16ffedf0d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”>
Date: Wed, 5 Mar 2025 15:32:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E7=A8=8B=E5=B7=A1=E6=9F=A5?=
 =?UTF-8?q?=E6=A6=82=E5=86=B5=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java    | 3 +++
 .../java/com/kms/yxgh/df/service/DfYhRecordService.java  | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
index 9d783b7d..867eb1fe 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
@@ -90,6 +90,9 @@ public interface DfYhRecordMapper extends BaseMapper<DfYhRecord> {
             "AND (DATE_FORMAT(bsdx.create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
             "AND DATE_FORMAT(bsdx.create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
             "</if> " +
+            "<if test='dto.adcdQx != null and searchDto.adcdQx != \"\"'> "+
+            "adb.adcd like concat(#{dto.adcdQx}, '%')  "+
+            "</if> "+
             "group by adb.adcd ,bsdx.duty_holder_type "+
             "</script>")
     List<DfYhStatisticsModelDto> situation (@Param("dto") DfYhStatisticsQueDto data);
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
index 41fbc2f2..6ea57067 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
@@ -59,9 +59,7 @@ public class DfYhRecordService extends DefaultApprovalBusinessService<DfYhRecord
                 .collect(Collectors.groupingBy(DfYhStatisticsModelDto::getAdcd));
 
         List<String> xList =new ArrayList<>();
-        DfYhCharInfoDto.YAxis yAxisInfo=new DfYhCharInfoDto.YAxis();
-        yAxisInfo.setName("次数");
-        yAxisInfo.setUnit("个");
+        List<DfYhCharInfoDto.YAxis>yAxisList=new ArrayList<>();
         for (Map.Entry<String, List<DfYhStatisticsModelDto>> entry : groupingByList.entrySet()) {
             // 设置 x轴
             xList.add(entry.getKey());
@@ -73,8 +71,13 @@ public class DfYhRecordService extends DefaultApprovalBusinessService<DfYhRecord
                 seriesList.add(series);
             }
             // 设置 y轴
+            DfYhCharInfoDto.YAxis yAxisInfo=new DfYhCharInfoDto.YAxis();
+            yAxisInfo.setName("次数");
+            yAxisInfo.setUnit("个");
             yAxisInfo.setSeries(seriesList);
         }
+        dtoInfo.setYAxis(yAxisList);
+        dtoInfo.setXAxis(xList);
         return dtoInfo;
     }