add

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceUploadListServiceImpl.java

@@ -338,13 +338,11 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
             // 单号，主键，同步任务生成时间，同步的表名，工单类型，任务类型
             OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(itemOrderNo, itemTableNameId,orderBase.getUpdateTime(), itemTableName,
                     orderBase.getOrderType(),66);
-
             ojtgutls.add(add);
-log.info("生成66 ");
+
             // 生成661类型上传任务数据
             OrderBase up = generateTaskList(itemTableName, itemOrderNo, itemTableNameId, orderBase, ojtgutls);
 
-
             if (ojtgutls.size()>0){
                 outJiasmToGreeUploadTaskListService.saveBatch(ojtgutls);
                 ojtgutls.clear();
@@ -370,9 +368,9 @@ log.info("生成66 ");
         return up;
     }
 
-    private OrderBase generateTaskList(String itemTableName, String itemOrderNo, String itemTableNameId, OrderBase orderBase, List<OutJiasmToGreeUploadTaskList> ojtgutls) {
+    private OrderBase generateTaskList(String itemTableName, String itemOrderNo, String itemTableNameId,
+                                       OrderBase orderBase, List<OutJiasmToGreeUploadTaskList> ojtgutls) {
         // 工单状态(8, 9, 10, 11, 12, 13, 14) 派工状态:(13, 14, 15) 未下载总部采集数据
-
         log.info("生成661 getOrderStatus{} getDispatchStatus{} getOutCjDownloadFlag{}",
                 orderBase.getOrderStatus(),orderBase.getDispatchStatus(),orderBase.getOutCjDownloadFlag());
 
@@ -383,8 +381,8 @@ log.info("生成66 ");
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G12.getCode())||
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G13.getCode())||
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G14.getCode())) &&
-                (orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G13) ||
-                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G14)||
+                (orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G13.getCode()) ||
+                        orderBase.getDispatchStatus().equals(GDAppointStatusEnum.REPAIR_STATUS_G14.getCode())||
                         orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G14.getCode())) &&
                 orderBase.getOutCjDownloadFlag().equals(0)){
             OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(itemOrderNo, itemTableNameId, itemTableName,