Merge branch 'feature-dispatch-zx' into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Customer.java

@@ -173,7 +173,7 @@ public class Customer {
                 ", endTime=" + endTime +
                 ", serviceDuration=" + serviceDuration +
                 ", requiredSkill='" + requiredSkill + '\'' +
-                ", technician=" + technician.getCode() +
+                ", technician=" + ((technician!=null) ? technician.getCode() : "null") +
                 ", previousCustomer=" + ((previousCustomer != null) ? previousCustomer.getCode() : "null") +
                 ", nextCustomer=" + ((nextCustomer != null) ? nextCustomer.getCode() : "null") +
                 ", arrivalTime=" + arrivalTime +

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

@@ -71,7 +71,6 @@ public class BatchServiceImpl implements BatchService {
                     " VALUES(?, ?, ?, ?, ?, ?, ?, ?)";
 
             jdbcTemplate.update(sqlInsert, groupId, batchNo, batchDay, 0, 0, LocalDateTime.now(), null, "RUNNING");
-//                queryRunner.execute(sqlInsert, groupId, batchNo, batchDay, 0, 0, LocalDateTime.now(), null, "RUNNING");
             log.info("生成新批次, groupId:{}, day:{}", groupId, batchDay);
         } else {
             batchNo = optional.get().getBatchNo();
@@ -104,7 +103,7 @@ public class BatchServiceImpl implements BatchService {
                 "          order by a.expect_time_begin asc  ";
         int orderCount = jdbcTemplate.update(sqlOrder, batchNo, groupId, batchDay + " 00:00:00", batchDay + " 23:59:59");
 
-        jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=? where group_id=? and batch_no=?", engCount, orderCount, groupId, batchNo);
+        jdbcTemplate.update("update dispatch_batch set engineer_num=? , order_num=?, status='RUNNING' where group_id=? and batch_no=?", engCount, orderCount, groupId, batchNo);
 
 
         log.info("准备批次数据完成, groupId:{}, day:{}, batchNo:{}", groupId, batchDay, batchNo);

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

@@ -129,6 +129,10 @@ public class ExtractServiceImpl implements ExtractService {
 
         });
 
+
+        Object[] paramBatch= {groupId, batchNo};
+        jdbcTemplate.update(" update dispatch_batch set status='DONE'  where group_id=? and batch_no=? ", paramBatch);
+
         log.info("算法结果回写dispatch完成, groupId:{}, batchNo:{}", groupId, batchNo);
 
     }