修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderStatisticsController.java

@@ -265,15 +265,14 @@ public class WorkOrderStatisticsController {
         }
         workOrderManageDto.setStartDate(startDate);
         workOrderManageDto.setEndDate(endDate);
-        if(sort == 1){
-            idList.add(id);
-        }
-        else {
+        if(sort == 2){
             AjaxMessage<List<Map<String, Object>>> ajaxMessage = smsWaterClient.selectAlarmDeviceIdBySenceId(id);
-             for(Map<String,Object> map : ajaxMessage.getData()){
+             for(Map<String,Object> map : ajaxMessage.getData()) {
                  int deviceId = Integer.parseInt(map.get("device_id").toString());
                  idList.add(deviceId);
              }
+        }else if(sort==1){
+            idList.add(id);
         }
         if(type ==0 || type ==2){
             statistics =  workOrderManageService.dispatchTimesMonthStatistics(workOrderManageDto,idList);

operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -10,6 +10,7 @@ import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.order.service.WorkOrderManageService;
 import com.huaxu.util.UserUtil;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -251,7 +252,7 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
     }
 
     @Override
-    public List<Map<String, Object>> dispatchTimesMonthStatistics(WorkOrderManageDto workOrderManageDto, List<Integer> idList) {
+    public List<Map<String, Object>> dispatchTimesMonthStatistics(WorkOrderManageDto workOrderManageDto,List<Integer> idList) {
         String strMonth = workOrderManageDto.getStartDate().substring(5,7);
         int days = getDaysByYearMonth(Integer.parseInt(strMonth));
         List<Map<String,Object>> result = new ArrayList<Map<String,Object>>();

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -1204,10 +1204,10 @@
       select count(1) 数量, DATE_FORMAT(send_time,'%Y-%m-%d') 日期
       from sc_work_order_manage t1
       where t1.send_time >= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%m-%d')
-              and t1.send_time < date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%m-%d')
-      device_id in
+      and t1.send_time < date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%m-%d')
+      and device_id in
       <foreach collection="idList" item="item" open="(" close=")" separator=",">
-        #{item}
+        #{item,jdbcType=INTEGER}
       </foreach>
       group by DATE_FORMAT(send_time,'%Y-%m-%d')
   </select>
@@ -1219,7 +1219,7 @@
     and t1.send_time &lt; date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%m-%d')
     and device_id in
     <foreach collection="idList" item="item" open="(" close=")" separator=",">
-      #{item}
+      #{item,jdbcType=INTEGER}
     </foreach>
     group by DATE_FORMAT(send_time,'%Y-%m')
   </select>