Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/BatchServiceImpl.java

@@ -139,16 +139,16 @@ public class BatchServiceImpl implements BatchService {
                 "                  and a.dt = ?  " +
                 "                  and a.dt = ?  " +
                 "                  and o.pre_status in ('CONFIRM') \n" +
                 "                  and o.pre_status in ('CONFIRM') \n" +
                 "    order by a.expect_time_begin asc  ";
                 "    order by a.expect_time_begin asc  ";
-        int orderCountConfirm = jdbcTemplate.update(sqlOrderConfirm, batchNo, groupId, batchDay);
+//        int orderCountConfirm = jdbcTemplate.update(sqlOrderConfirm, batchNo, groupId, batchDay);
 
 
         log.info("准备批次数据 orderCount :{}", orderCount);
         log.info("准备批次数据 orderCount :{}", orderCount);
         log.info("准备批次数据 orderCountPre :{}", orderCountPre);
         log.info("准备批次数据 orderCountPre :{}", orderCountPre);
-        log.info("准备批次数据 orderCountConfirm :{}", orderCountConfirm);
+//        log.info("准备批次数据 orderCountConfirm :{}", orderCountConfirm);
 
 
 
 
         if (orderCount + orderCountPre > 0) {
         if (orderCount + orderCountPre > 0) {
             jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=?, start_time=?, end_time=null, status='RUNNING' where group_id=? and batch_no=?",
             jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=?, start_time=?, end_time=null, status='RUNNING' where group_id=? and batch_no=?",
-                    engCount, orderCount + orderCountPre + orderCountConfirm, LocalDateTime.now(), groupId, batchNo);
+                    engCount, orderCount + orderCountPre , LocalDateTime.now(), groupId, batchNo);
         } else {
         } else {
             jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=?, start_time=?, end_time=?, status='DONE' where group_id=? and batch_no=?",
             jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=?, start_time=?, end_time=?, status='DONE' where group_id=? and batch_no=?",
                     engCount, 0, LocalDateTime.now(), LocalDateTime.now(), groupId, batchNo);
                     engCount, 0, LocalDateTime.now(), LocalDateTime.now(), groupId, batchNo);

project-order/src/main/java/com/dituhui/pea/order/dto/ScheduleOverviewResp.java

@@ -44,5 +44,6 @@ public class ScheduleOverviewResp {
 		private Integer fixNum;
 		private Integer fixNum;
 		private Integer designNum;
 		private Integer designNum;
 		private Integer cleanNum;
 		private Integer cleanNum;
+		private Integer reformNum;
 	}
 	}
 }
 }

project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java

@@ -291,8 +291,9 @@ public class ScheduleServiceImpl implements ScheduleService {
 		s.setTotal(orders.size());
 		s.setTotal(orders.size());
 		s.setInstallNum(skillCounter.getOrDefault("安装", 0));
 		s.setInstallNum(skillCounter.getOrDefault("安装", 0));
 		s.setFixNum(skillCounter.getOrDefault("维修", 0));
 		s.setFixNum(skillCounter.getOrDefault("维修", 0));
-		s.setDesignNum(skillCounter.getOrDefault("整改", 0));
+		s.setDesignNum(0); // 前端接口已废弃
 		s.setCleanNum(skillCounter.getOrDefault("清洁保养", 0));
 		s.setCleanNum(skillCounter.getOrDefault("清洁保养", 0));
+		s.setReformNum(skillCounter.getOrDefault("整改", 0));
 		return s;
 		return s;
 	}
 	}