调度人员调用类型去除,公众服务-路段发布渠道分析数据问题

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);

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);
         }

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>

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>