From 05bd8138d7a55359f24bfcd172d3b3466a3eb33f Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Fri, 14 Jun 2024 15:11:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=BA=BA=E5=91=98=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E7=B1=BB=E5=9E=8B=E5=8E=BB=E9=99=A4,=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E6=9C=8D=E5=8A=A1-=E8=B7=AF=E6=AE=B5=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=B8=A0=E9=81=93=E5=88=86=E6=9E=90=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zc/business/mapper/DcWarningMapper.java | 3 +--
 .../zc/business/service/impl/DcWarningServiceImpl.java    | 1 -
 .../resources/mapper/business/DcPublishManageMapper.xml   | 2 +-
 .../main/resources/mapper/business/DcWarningMapper.xml    | 8 +++-----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java
index ac585d4e..05795762 100644
--- a/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java
+++ b/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java
@@ -131,8 +131,7 @@ public interface DcWarningMapper
     public HashMap<String,Object> selectOrganization();
     //选中的人员信息
     public List<HashMap<String,Object>> selectEmployeesChoice(@Param("dispatchId")Long dispatchId);
-    //查询最近的交警人员和电话
-    public List<HashMap<String,Object>> selectTrafficPolice(@Param("organizationId")Long organizationId);
+
     //选中的车辆信息
     public List<HashMap<String,Object>> selectVehiclesChoice(@Param("dispatchId")Long dispatchId);
     public Integer deleteDispatchResource(@Param("dispatchId")Long dispatchId);
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
index eef40aa8..e85b6a36 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
@@ -665,7 +665,6 @@ public class DcWarningServiceImpl implements IDcWarningService
             Long id = Long.parseLong(map.get("id").toString());//取出最近的机构id
 
 //todo 交警
-            List<HashMap<String, Object>> trafficPolice = dcWarningMapper.selectTrafficPolice(id);//交警人员信息
             DcTrafficPolice dcTrafficPolice = dcTrafficPoliceService.selectEvent(dcWarning.getStakeMark());
             mapAll.put("trafficPolice",dcTrafficPolice);
         }
diff --git a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml
index 07729130..441e7ca8 100644
--- a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml
@@ -333,7 +333,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      left join dc_event on dc_publish_manage.event_id=dc_event.id
             WHERE YEAR(publish_time) = YEAR(CURDATE())
               AND MONTH(publish_time) = MONTH(#{publishTime})
-            GROUP BY publish_channels
+            GROUP BY eventType,publish_channels
         ) AS m ON h.eventType = m.eventType AND pc.publish_channels = m.publish_channels
         ORDER BY h.eventType, pc.publish_channels;
     </select>
diff --git a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
index 7992b584..514ba14f 100644
--- a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
@@ -319,7 +319,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where parent_id!=0
     </select>
     <select id="selectOrganizationEmployees" resultType="java.util.HashMap">
-        select id, name,contact_number contactNumber from dc_employees where organization_id=#{organizationId} and employees_type=1
+        select id, name,contact_number contactNumber from dc_employees where organization_id=#{organizationId}
     </select>
     <select id="selectShifts" resultType="java.util.HashMap">
         select shifts.scheduling,employees.name shiftsName,employees.contact_number shiftsNumber  from dc_shifts as shifts
@@ -380,7 +380,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             where employees.organization_id = #{organizationId}
               and respurce.dispatch_type = 1
               and path.event_id = #{eventId}) as t on t.id = dc_employees.id
-        where organization_id =  #{organizationId}  and dc_employees.employees_type=1
+        where organization_id =  #{organizationId}
     </select>
     <select id="selectVehiclesDispatch" resultType="java.util.HashMap">
         select DISTINCT dc_vehicles.id,
@@ -427,9 +427,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="vehiclesType" resultType="java.lang.String">
         select  vehicle_type from dc_vehicles where id=#{id}
     </select>
-    <select id="selectTrafficPolice" resultType="java.util.HashMap">
-        select name,contact_number contactNumber from dc_employees where organization_id=#{organizationId} and employees_type=2
-    </select>
+
     <select id="selectDispatchId" resultType="java.util.HashMap">
         select id dispatchId from dc_dispatch where event_id=#{eventId}
     </select>