From de2acc3d04a7ddb0e22aa577f991371ace8d428f Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Wed, 13 Nov 2024 14:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=91=A8=E6=9C=9F=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/entity/so/CommonDataPageSo.java  |  2 +-
 .../project/xyt/entity/vo/ProjectEventsVo.java   |  2 +-
 .../project/xyt/mapper/ProjectEventsMapper.java  | 16 ++++++++++++++++
 .../xyt/service/ProjectEventsService.java        |  4 ++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo.java b/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo.java
index 0174df8..e65fcf8 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo.java
@@ -29,7 +29,7 @@ public class CommonDataPageSo {
     @Schema(description = "时间范围")
     private DateRangeSo dateSo;
 
-    @Schema(description = "类型（1大事记 2调度指令 3维修养护 4安全鉴定 5除险加固 6白蚁普查）")
+    @Schema(description = "类型（1大事记 2调度记录 3维修养护 4安全鉴定 5除险加固 6白蚁普查）")
     private List<Integer> types;
 
 }
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/ProjectEventsVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/ProjectEventsVo.java
index 6eedb72..f4b5ad8 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/vo/ProjectEventsVo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/ProjectEventsVo.java
@@ -57,7 +57,7 @@ public class ProjectEventsVo  {
         if (this.type == 1) {
             this.typeName = "大事记";
         } else if (this.type == 2) {
-            this.typeName = "调度指令";
+            this.typeName = "调度记录";
         } else if (this.type == 3) {
             this.typeName = "维修养护";
         }else if (this.type == 4) {
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/ProjectEventsMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/ProjectEventsMapper.java
index 114e785..4ef5df7 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/ProjectEventsMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/ProjectEventsMapper.java
@@ -106,4 +106,20 @@ public interface ProjectEventsMapper extends BaseMapper<ProjectEvents> {
                         </script>
                          """)
     List<Long> queryTermiteDetail(@Param("id") Long id);
+
+    @Select("""
+                        <script>
+                                
+            select t.id,t.start_time as eventsDate,t.dispatch_detail as eventsDesc,2 as type from  public.dispatch_record t 
+            <where>
+                 <if test="obj.dateSo != null and obj.dateSo.start != null">
+                      t.start_time <![CDATA[>=]]> #{obj.dateSo.start}
+                </if>  
+                <if test="obj.dateSo != null and obj.dateSo.end != null">
+                    and t.start_time <![CDATA[<=]]> #{obj.dateSo.end}
+                </if>
+            </where>
+                        </script>
+                         """)
+    List<ProjectEventsVo> dispatchList(@Param("obj") CommonDataPageSo page);
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java b/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java
index f9cbc7c..9652b19 100644
--- a/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java
@@ -136,6 +136,10 @@ public class ProjectEventsService extends ServiceImpl<ProjectEventsMapper, Proje
             List<ProjectEventsVo> projectEventsVos = this.baseMapper.eventList(page);
             list.addAll(projectEventsVos);
         }
+        if(CollectionUtils.isEmpty(types) || (CollectionUtils.isNotEmpty(types)) && types.contains(2)){
+            List<ProjectEventsVo> projectEventsVos = this.baseMapper.dispatchList(page);
+            list.addAll(projectEventsVos);
+        }
         if(CollectionUtils.isEmpty(types) || (CollectionUtils.isNotEmpty(types)) && types.contains(3)){
             List<ProjectEventsVo> projectEventsVos = this.baseMapper.maintainList(page);
             list.addAll(projectEventsVos);