add

src/main/java/com/zfire/jiasm/syncdata/constant/GDAppointStatusEnum.java

@@ -0,0 +1,145 @@
+package com.zfire.jiasm.syncdata.constant;
+
+
+import lombok.Getter;
+
+/**
+ * 平台工单派工状态  分两部分(安装与维修)
+ * 左则数值为工单系统派工状态，方便对应处理
+ * @author yaozx
+ * @version 1.0
+ * @date 2023-03-18
+ */
+@Getter
+public enum GDAppointStatusEnum {
+    // 安装-工单派工状态OK
+    /**
+     * 预保存工单
+     */
+    INSTALL_STATUS_A0_0("A1100","预保存工单"),
+
+    /**
+     * 已保存工单
+     */
+    INSTALL_STATUS_A0_1("A1101","已保存工单"),
+
+    /**
+     * 待分部派工
+     */
+    INSTALL_STATUS_A0_2("A1121","待分部派工"),
+
+    /**
+     * 待分部预派工
+     */
+    INSTALL_STATUS_A0_3("A1122","待分部预派工"),
+
+    /**
+     * 格力品牌省份信息接口
+     */
+    INSTALL_STATUS_A0_4("A1125","待分中心派工"),
+
+    /**
+     * 待网点派工
+     */
+    INSTALL_STATUS_A0_5("A1129","待网点派工"),
+
+    /**
+     * 待网点预派工
+     */
+    INSTALL_STATUS_A0_6("A1130","待网点预派工"),
+
+    /**
+     * 待审批改派
+     */
+    INSTALL_STATUS_A0_7("A1135","待审批改派"),
+
+    /**
+     * 服务人员待接收
+     */
+    INSTALL_STATUS_A0_8("A1301","服务人员待接收"),
+    /**
+     * 服务人员报完工
+     */
+    INSTALL_STATUS_A4_0("A1304","服务人员报完工"),
+
+    /**
+     * 服务人员申请售后处理
+     */
+    INSTALL_STATUS_A0_9("A1307","服务人员申请售后处理"),
+
+    /**
+     * 已作废工单
+     */
+    INSTALL_STATUS_A0_10("A1308","已作废工单"),
+
+    /**
+     * 已关闭工单
+     */
+    INSTALL_STATUS_A4_1("A1309","已关闭工单"),
+
+    // 维修-工单派工状态OK
+    REPAIR_STATUS_G1("B1","保存"),
+    REPAIR_STATUS_G2("B2","待分部派工"),
+    REPAIR_STATUS_G3("B3","待分中心派工"),
+    REPAIR_STATUS_G4("B4","待网点派工"),
+    REPAIR_STATUS_G5("B5","待审批改派"),
+    REPAIR_STATUS_G6("B6","待审批支援"),
+    REPAIR_STATUS_G7("B18","待服务人员处理"),// 20,21,22,23,24
+    REPAIR_STATUS_G8("B18","服务人员报完工"),
+    // REPAIR_STATUS_G9("B51","网点报完工"),
+    REPAIR_STATUS_G10("B18","分中心报完工"),
+    REPAIR_STATUS_G11("B18","分部报完工"),
+    //REPAIR_STATUS_G12("B100","历史信息"),
+    //REPAIR_STATUS_G13("B101","批量关闭"),
+    REPAIR_STATUS_G14_0("B41","正常关闭"),
+    REPAIR_STATUS_G14_1("B51","正常关闭"),
+    REPAIR_STATUS_G14_2("B61","正常关闭"),
+    REPAIR_STATUS_G14_3("B71","正常关闭"),
+    REPAIR_STATUS_G15_0("B100","历史信息"),
+    REPAIR_STATUS_G15_1("B101","批量关闭"),
+    REPAIR_STATUS_G15_2("B102","正常关闭"),
+    REPAIR_STATUS_G16("B103","异常关闭"),
+
+
+    ;
+
+
+
+
+    /**
+     * 编码
+     */
+    private final String code;
+
+
+    private final String text;
+
+    GDAppointStatusEnum(String code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+    public static GDAppointStatusEnum getByCode(String code) {
+        for (GDAppointStatusEnum item : values()) {
+            if (code.equals(item.getCode())) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param code: code
+     * @return 对应枚举
+     **/
+    public static String getMessageByCode(String code) {
+        String result = null;
+        for (GDAppointStatusEnum item : values()) {
+            if (code.equals(item.getCode())) {
+                result = item.getText();
+                break;
+            }
+        }
+        return result;
+    }
+}

src/main/java/com/zfire/jiasm/syncdata/constant/GDOrderStatusEnum.java

@@ -0,0 +1,140 @@
+package com.zfire.jiasm.syncdata.constant;
+
+
+import lombok.Getter;
+
+/**
+ * 平台工单当前状态  分两部分(安装与维修)
+ * 左则数值为工单系统状态，方便对应处理
+ * @author yaozx
+ * @version 1.0
+ * @date 2023-02-22
+ */
+@Getter
+public enum GDOrderStatusEnum {
+    // 安装-工单状态OK
+    /**
+     * 预保存工单
+     */
+    INSTALL_STATUS_G1_0("A1100","预保存工单"),
+
+    /**
+     * 已保存工单
+     */
+    INSTALL_STATUS_G1_1("A1101","已保存工单"),
+
+    /**
+     * 待分部派工
+     */
+    INSTALL_STATUS_G2_0("A1121","待分部派工"),
+
+    /**
+     * 待分部预派工
+     */
+    INSTALL_STATUS_G2_1("A1122","待分部预派工"),
+
+    /**
+     * 格力品牌省份信息接口
+     */
+    INSTALL_STATUS_G3("A1125","待分中心派工"),
+
+    /**
+     * 待网点派工
+     */
+    INSTALL_STATUS_G4_0("A1129","待网点派工"),
+
+    /**
+     * 待网点预派工
+     */
+    INSTALL_STATUS_G4_1("A1130","待网点预派工"),
+
+    /**
+     * 待审批改派
+     */
+    INSTALL_STATUS_G5("A1135","待审批改派"),
+
+    /**
+     * 服务人员待接收
+     */
+    INSTALL_STATUS_G6("A1301","服务人员待接收"),
+
+    /**
+     * 服务人员报完工
+     */
+    INSTALL_STATUS_G7("A1304","服务人员报完工"),
+
+    /**
+     * 服务人员申请售后处理
+     */
+    INSTALL_STATUS_G8("A1307","服务人员申请售后处理"),
+
+    /**
+     * 已作废工单
+     */
+    INSTALL_STATUS_G9("A1308","已作废工单"),
+
+    /**
+     * 已关闭工单
+     */
+    INSTALL_STATUS_G10("A1309","已关闭工单"),
+
+    // 维修-工单状态OK
+    REPAIR_STATUS_G1("B1","保存"),
+    REPAIR_STATUS_G2("B2","待分部派工"),
+    REPAIR_STATUS_G3("B3","待分中心派工"),
+    REPAIR_STATUS_G4("B4","待网点派工"),
+    REPAIR_STATUS_G5("B5","待审批改派"),
+    REPAIR_STATUS_G6("B6","待审批支援"),
+    REPAIR_STATUS_G7("B18","待服务人员处理"),// 20,21,22,23,24
+    REPAIR_STATUS_G8("B41","服务人员报完工"),
+    REPAIR_STATUS_G9("B51","网点报完工"),
+    REPAIR_STATUS_G10("B61","分中心报完工"),
+    REPAIR_STATUS_G11("B71","分部报完工"),
+    REPAIR_STATUS_G12("B100","历史信息"),
+    REPAIR_STATUS_G13("B101","批量关闭"),
+    REPAIR_STATUS_G14("B102","正常关闭"),
+    REPAIR_STATUS_G15("B103","异常关闭"),
+
+
+    ;
+
+
+
+
+    /**
+     * 编码
+     */
+    private final String code;
+
+
+    private final String text;
+
+    GDOrderStatusEnum(String code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+    public static GDOrderStatusEnum getByCode(String code) {
+        for (GDOrderStatusEnum item : values()) {
+            if (code.equals(item.getCode())) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param code: code
+     * @return 对应枚举
+     **/
+    public static String getMessageByCode(String code) {
+        String result = null;
+        for (GDOrderStatusEnum item : values()) {
+            if (code.equals(item.getCode())) {
+                result = item.getText();
+                break;
+            }
+        }
+        return result;
+    }
+}

src/main/java/com/zfire/jiasm/syncdata/constant/OrderStatusEnum.java

@@ -4,7 +4,8 @@ package com.zfire.jiasm.syncdata.constant;
 import lombok.Getter;
 
 /**
- * 工单当前状态
+ * 平台工单当前状态  分两部分(安装与维修)
+ * 左则数值为格力工单系统状态，方便对应处理
  * @author yaozx
  * @version 1.0
  * @date 2023-02-22
@@ -19,12 +20,12 @@ public enum OrderStatusEnum {
     /**
      * 已保存工单
      */
-    INSTALL_STATUS_I1("A1101","已保存工单"),
+    INSTALL_STATUS_A1101("A1101","已保存工单"),
 
     /**
      * 待分部派工
      */
-    INSTALL_STATUS_I2("A1121","待分部派工"),
+    INSTALL_STATUS_A1121("A1121","待分部派工"),
 
     /**
      * 待分部预派工
@@ -34,12 +35,12 @@ public enum OrderStatusEnum {
     /**
      * 格力品牌省份信息接口
      */
-    INSTALL_STATUS_I3("A1125","待分中心派工"),
+    INSTALL_STATUS_A1125("A1125","待分中心派工"),
 
     /**
      * 待网点派工
      */
-    INSTALL_STATUS_I4("A1129","待网点派工"),
+    INSTALL_STATUS_A1129("A1129","待网点派工"),
 
     /**
      * 待网点预派工
@@ -49,48 +50,48 @@ public enum OrderStatusEnum {
     /**
      * 待审批改派
      */
-    INSTALL_STATUS_I5("A1135","待审批改派"),
+    INSTALL_STATUS_A1135("A1135","待审批改派"),
 
     /**
      * 服务人员待接收
      */
-    INSTALL_STATUS_I6("A1301","服务人员待接收"),
+    INSTALL_STATUS_A1301("A1301","服务人员待接收"),
 
     /**
      * 服务人员报完工
      */
-    INSTALL_STATUS_I7("A1304","服务人员报完工"),
+    INSTALL_STATUS_A1304("A1304","服务人员报完工"),
 
     /**
      * 服务人员申请售后处理
      */
-    INSTALL_STATUS_I8("A1307","服务人员申请售后处理"),
+    INSTALL_STATUS_A1307("A1307","服务人员申请售后处理"),
 
     /**
      * 已作废工单
      */
-    INSTALL_STATUS_I9("A1308","已作废工单"),
+    INSTALL_STATUS_A1308("A1308","已作废工单"),
 
     /**
      * 已关闭工单
      */
-    INSTALL_STATUS_I10("A1309","已关闭工单"),
-
-    REPAIR_STATUS_R1("B1","保存"),
-    REPAIR_STATUS_R2("B2","待分部派工"),
-    REPAIR_STATUS_R3("B3","待分中心派工"),
-    REPAIR_STATUS_R4("B4","待网点派工"),
-    REPAIR_STATUS_R5("B5","待审批改派"),
-    REPAIR_STATUS_R6("B6","待审批支援"),
-    REPAIR_STATUS_R7("B18","待服务人员处理"),// 20,21,22,23,24
-    REPAIR_STATUS_R8("B41","服务人员报完工"),
-    REPAIR_STATUS_R9("B51","网点报完工"),
-    REPAIR_STATUS_R10("B61","分中心报完工"),
-    REPAIR_STATUS_R11("B71","分部报完工"),
-    REPAIR_STATUS_R12("B100","历史信息"),
-    REPAIR_STATUS_R13("B101","批量关闭"),
-    REPAIR_STATUS_R14("B102","正常关闭"),
-    REPAIR_STATUS_R15("B103","异常关闭"),
+    INSTALL_STATUS_A1309("A1309","已关闭工单"),
+
+    REPAIR_STATUS_B1("B1","保存"),
+    REPAIR_STATUS_B2("B2","待分部派工"),
+    REPAIR_STATUS_B3("B3","待分中心派工"),
+    REPAIR_STATUS_B4("B4","待网点派工"),
+    REPAIR_STATUS_B5("B5","待审批改派"),
+    REPAIR_STATUS_B6("B6","待审批支援"),
+    REPAIR_STATUS_B7("B18","待服务人员处理"),// 20,21,22,23,24
+    REPAIR_STATUS_B8("B41","服务人员报完工"),
+    REPAIR_STATUS_B9("B51","网点报完工"),
+    REPAIR_STATUS_B10("B61","分中心报完工"),
+    REPAIR_STATUS_B11("B71","分部报完工"),
+    REPAIR_STATUS_B12("B100","历史信息"),
+    REPAIR_STATUS_B13("B101","批量关闭"),
+    REPAIR_STATUS_B14("B102","正常关闭"),
+    REPAIR_STATUS_B15("B103","异常关闭"),
 
 
     ;

src/main/java/com/zfire/jiasm/syncdata/download/order/install/Business.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.constant.DispatchStatusEnum;
+import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderStatusEnum;
 import com.zfire.jiasm.syncdata.dao.mapper.AZGDFYQDDownloadMapper;
 import com.zfire.jiasm.syncdata.dao.mapper.AZGDFkMxDownloadMapper;
@@ -137,7 +138,7 @@ public class Business {
         for (ItfTblAzAssignLcLsDownload item: lcls) {
             try{
                 if (orderBaselist.contains(item.getPgguid())){
-                    // 修改
+                    // 修改 TL_SynDataFrom_tbl_az_assign_lc_ls_batch
                     business.orderUpdate(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item);
                 } else {
                     // 新增 TL_SynDataFrom_tbl_az_assign_lc_ls_batch
@@ -169,13 +170,13 @@ public class Business {
                 .eq(OrderBase::getPgguid, item.getPgguid()).one();
 
         // 获取安装工单主表
-        OrderBase newLCLS = getOrderBase(item, brand);
+        OrderBase newLCLS = getAddOrderBase(item, brand);
         // 这里一定不能少
         newLCLS.setId(old.getId());
         newLCLS.setDispatchStatus(old.getDispatchStatus());
 
         // 获取工单主表要同步的数据
-        OrderBase upInfo = getOrderBase(old, item, newLCLS);
+        OrderBase upInfo = getOrderBaseUp(old, item, newLCLS);
 
         // 获取工单师傅信息来自于工单主表数据只有修改的情况
         OrderWorker own =getOrderWorkerUpdate(old.getId(), upInfo, newLCLS);
@@ -623,11 +624,11 @@ public class Business {
     }
 
     @NotNull
-    private OrderBase getOrderBase(OrderBase old, ItfTblAzAssignLcLsDownload item, OrderBase newLCLS) {
+    private OrderBase getOrderBaseUp(OrderBase old, ItfTblAzAssignLcLsDownload item, OrderBase newLCLS) {
         OrderBase upInfo = new OrderBase();
 
         // 本地订单已关闭 且总部的最后修改时间晚于本地数据修改时间 不可修改
-        if (old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode()) &&
+        if (old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()) &&
                 item.getLastModifiedDate().compareTo(old.getUpdateTime())<0){
             synItfTblAzAssignLcLsDownload(item.getSynReqId(), 99, "本地工单已关闭或作废忽略更新");
             // 这里只是不修改订单主表，其他数据表接着执行
@@ -639,9 +640,9 @@ public class Business {
             BeanUtils.copyProperties(newLCLS,upInfo);
         }
         // 2:网点信息修改 已待服务人员处理，不允更新网点   6,7,10 少6
-        if (old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode()) ||
-                old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode()) ||
-                old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode())){
+        if (old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()) ||
+                old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()) ||
+                old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode())){
             // 售后网点
             upInfo.setReceWebsitId(old.getReceWebsitId());
             upInfo.setReceWebsitName(old.getReceWebsitName());
@@ -694,76 +695,76 @@ public class Business {
         // 判断是否可更新工单状态
         Boolean allowUpdate = Boolean.FALSE;
         // 待派
-        if ((old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I1.getCode()) ||
-                old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I2.getCode()) ||
-                old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I3.getCode())) &&
+        if ((old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G1_1.getCode()) ||
+                old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode()) ||
+                old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode())) &&
                 (old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_0.getCode()))){
             allowUpdate = Boolean.TRUE;
         }
         // 改派
-        if ((old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I3.getCode())) &&
+        if ((old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode())) &&
                 (old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_0.getCode())) &&
-                (newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I3.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I4.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode()))){
+                (newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G4_0.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()))){
             allowUpdate = Boolean.TRUE;
         }
         // 待接单
-        if ((old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I4.getCode())) &&
+        if ((old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G4_0.getCode())) &&
                 (old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_0.getCode())) &&
-                (newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I8.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode()))){
+                (newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G8.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()))){
             allowUpdate = Boolean.TRUE;
         }
         // 已接单
-        if ((old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode())) &&
+        if ((old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode())) &&
                 (old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_0.getCode()) ||
                         old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_1.getCode())||
                         old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_2.getCode()) ||
                         old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_3.getCode())) &&
-                (newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I8.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode()))){
+                (newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G8.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()))){
             allowUpdate = Boolean.TRUE;
         }
         // 服务人员完工
-        if ((old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode())) &&
+        if ((old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode())) &&
                 (old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_4.getCode()) ||
                         old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_1.getCode())||
                         old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_2.getCode()) ||
                         old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_3.getCode())) &&
-                (newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I8.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode()))){
+                (newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G8.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()))){
             allowUpdate = Boolean.TRUE;
         }
         // 用户改约
-        if ((old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I5.getCode())) &&
+        if ((old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G5.getCode())) &&
                 (old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_5.getCode())) &&
-                (newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I8.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode()))){
+                (newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G8.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()))){
             allowUpdate = Boolean.TRUE;
         }
         // 作废申请
-        if ((old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I2.getCode())) &&
+        if ((old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode())) &&
                 (old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_2.getCode())) &&
-                (newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I3.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I4.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()))){
+                (newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G4_0.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()))){
             allowUpdate = Boolean.TRUE;
         }
 
         // 广佛作废时如果总部下载1121或1129也同步状态
-        if (old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()) ||
-                old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode())){
-            if (newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I2.getCode()) ||
-                    newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I3.getCode()) ||
-                    newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I4.getCode())){
+        if (old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()) ||
+                old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode())){
+            if (newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode()) ||
+                    newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()) ||
+                    newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G4_0.getCode())){
                 allowUpdate = Boolean.TRUE;
             } else {
                 allowUpdate = Boolean.FALSE;
@@ -771,21 +772,21 @@ public class Business {
         } else {
             allowUpdate = Boolean.TRUE;
         }
-        if ((old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()) ||
-                old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode())) &&
+        if ((old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()) ||
+                old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode())) &&
                 (old.getDispatchStatus().equals(DispatchStatusEnum.INSTALL_DISPATCH_STATUS_2.getCode())) &&
-                (newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I3.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I4.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()))){
+                (newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G4_0.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()))){
             allowUpdate = Boolean.TRUE;
         }
 
         // 广佛已自动派工，不根据总部状态更新
-        if ((old.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode())) &&
-                (newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I2.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I3.getCode()) ||
-                        newLCLS.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode()))){
+        if ((old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode())) &&
+                (newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()) ||
+                        newLCLS.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()))){
             allowUpdate = Boolean.FALSE;
         }
         return allowUpdate;
@@ -817,7 +818,7 @@ public class Business {
         synReqFkMxIds = fkmxs.stream().map(ItfTblAzAssignFkmxDownload::getSynReqId).collect(Collectors.toList());
 
         // 获取安装工单主表
-        OrderBase orderBase = getOrderBase(item, brand);
+        OrderBase orderBase = getAddOrderBase(item, brand);
         // 获取工单师傅信息
         OrderWorker orderWorker = getOrderWorker(orderBase);
         // 获取工单机型
@@ -1235,7 +1236,7 @@ public class Business {
         return null;
     }
 
-    private OrderBase getOrderBase(ItfTblAzAssignLcLsDownload item, Brand brand) {
+    private OrderBase getAddOrderBase(ItfTblAzAssignLcLsDownload item, Brand brand) {
         OrderBase orderBase = new OrderBase();
         OrderPar orderPar = new OrderPar();
         orderPar.setSynReqId(item.getSynReqId());

src/main/java/com/zfire/jiasm/syncdata/download/order/repair/Business.java

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.order.repair;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
 import com.zfire.jiasm.syncdata.dao.mapper.*;
@@ -219,7 +220,7 @@ public class Business {
         orderStatus = oldOrder.getOrderStatus();
         cjDowFlag = oldOrder.getOutCjDownloadFlag();
         // 批量关闭的工单 同步下载无需再修改
-        if (oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R13.getCode())){
+        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G13.getCode())){
             upItfTblAssignDownload(item.getSynReqId(),99,"last_modified_by = CLIENT__autoapp 本地已作废/关闭,忽略下载处理");
             return;
         }
@@ -284,7 +285,7 @@ public class Business {
     private void upOrderApplyDispatch(ItfTblAssignDownload item, String orderStatus, OrderBase oldOrder) {
         // 原 本地维修单表状态为5 待审批  同步过来的工单状态不是待审批时
         // 修改工单改派申请 自动审核  新增时条件不成立的
-        if (orderStatus.equals(OrderStatusEnum.REPAIR_STATUS_R5.getCode()) && !item.getStat().equals(5L)){
+        if (orderStatus.equals(GDOrderStatusEnum.REPAIR_STATUS_G5.getCode()) && !item.getStat().equals(5L)){
             OrderApplyDispatch oad = new OrderApplyDispatch();
             oad.setExamineId("system");
             oad.setExamineName("接口自动审核");
@@ -337,30 +338,30 @@ public class Business {
     private Boolean getaBoolean(ItfTblAssignDownload item, OrderBase oldOrder) {
         Boolean allowUpdate = Boolean.TRUE;
 
-        if (oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode())){
+        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode())){
             allowUpdate = Boolean.FALSE;
         }
-        if (oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R7.getCode()) &&
+        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G7.getCode()) &&
                 (item.getStat().equals(4L) || item.getStat().equals(18L))){
             allowUpdate = Boolean.FALSE;
         }
-        if (!oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I1.getCode()) &&
-                !oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I2.getCode()) &&
-                !oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I3.getCode()) &&
-                !oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I4.getCode()) &&
-                !oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I5.getCode()) &&
-                !oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode()) &&
-                !oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) &&
+        if (!oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G1_1.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G4_0.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G5.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) &&
                 item.getStat()<=4L){
             allowUpdate = Boolean.TRUE;
         }
-        if (item.getStat().equals(2L) && (!oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I1.getCode()) &&
-                !oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I2.getCode()) &&
-                !oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I3.getCode()))){
+        if (item.getStat().equals(2L) && (!oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G1_1.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()))){
             allowUpdate = Boolean.FALSE;
         }
-        if (item.getStat().equals(2L) && (oldOrder.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I5.getCode()) ||
-                oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R11.getCode()))){
+        if (item.getStat().equals(2L) && (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G5.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G11.getCode()))){
             allowUpdate = Boolean.TRUE;
         }
         return allowUpdate;
@@ -423,20 +424,20 @@ public class Business {
     @NotNull
     private Boolean getaBoolean(Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item, OrderBase oldOrder) {
         Boolean flag = Boolean.FALSE;
-        if ((oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R1.getCode()) ||
-                oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R2.getCode()) ||
-                oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R3.getCode()) ||
-                oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R4.getCode()) ||
-                oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R5.getCode()) ||
-                oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R6.getCode())) ||
-                (oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R7.getCode()) &&
+        if ((oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G1.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G2.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G3.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G4.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G5.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G6.getCode())) ||
+                (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G7.getCode()) &&
                         !oldOrder.getDispatchStatus().equals("YCJ") &&
                         !oldOrder.getDispatchStatus().equals("YBWG"))){
             flag = Boolean.TRUE;
         }
-        if ((!oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R1.getCode()) &&
-                !oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R2.getCode()) &&
-                !oldOrder.getOrderStatus().equals(OrderStatusEnum.REPAIR_STATUS_R3.getCode())) && item.getStat() == 2){
+        if ((!oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G1.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G2.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G3.getCode())) && item.getStat() == 2){
             flag = Boolean.FALSE;
         }
         // op.setMainId(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictCode());

src/main/java/com/zfire/jiasm/syncdata/upload/order/install/ProduceDataUploadList.java

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.upload.order.install;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
+import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
 import com.zfire.jiasm.syncdata.dao.mapper.*;
@@ -403,8 +404,8 @@ public class ProduceDataUploadList {
 
     private void getPJmessage(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls) {
         // 生成评价短信 不能写在产品中要写在表头，只写一次 派工状态为4(1304，1309与工单状态相同) 完工或已关闭的单
-        if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) ||
-                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode())) {
+        if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
+                orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode())) {
             if (!orderBase.getUploadFlag()){
                 // 查看是否已发送
                 ItfMessagehuifangentity message = itfMessagehuifangentityService.lambdaQuery()
@@ -438,8 +439,8 @@ public class ProduceDataUploadList {
 
                     itfMessagehuifangentityService.save(addms);
                 }
-            } else if ((orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) ||
-                    orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode())) &&
+            } else if ((orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
+                    orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode())) &&
                     !orderBase.getSaleType().equals("工程机"))  {
                 // 查看是否已发送
                 ItfMessagehuifangentity message = itfMessagehuifangentityService.lambdaQuery()
@@ -484,10 +485,10 @@ public class ProduceDataUploadList {
 
     private void generateCJData(Brand brand, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls) {
         // 工单状态order_status 6, 7, 9, 10 且为非预派工订单
-        if ((orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode()) ||
-                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) ||
-                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()) ||
-                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode())) &&
+        if ((orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()) ||
+                orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
+                orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()) ||
+                orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode())) &&
                 orderBase.getIsReservation().equals(0)){
             // 提取采集的数据
             List<OrderInstallDetail> orderInstallDetails = orderInstallDetailService.lambdaQuery()
@@ -607,8 +608,8 @@ public class ProduceDataUploadList {
         // 采集标志 1100:保存,1110:作废,1120:转结算
         Integer cjstat = 1100;
 
-        if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) ||
-                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode())){
+        if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
+                orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode())){
             cjstat = 1120;
         }
         if (detail.getStatus().equals(2)){
@@ -691,8 +692,8 @@ public class ProduceDataUploadList {
     // 处理附件采集数据上传
     public void getcjfjdata(OrderBase orderBase, OrderInstallDetail detail, String mainName) {
         // 附件上传总部标识判断
-        if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) ||
-                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode())){
+        if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
+                orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode())){
             // 安装工单采集附件表提取数据
             InstallCJDetailFile installCJDetailFile = new InstallCJDetailFile();
             installCJDetailFile.setOrderNo(detail.getOrderBaseId());

src/main/java/com/zfire/jiasm/syncdata/upload/order/install/ProduceUploadList.java

@@ -1,5 +1,6 @@
 package com.zfire.jiasm.syncdata.upload.order.install;
 
+import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
@@ -209,15 +210,15 @@ public class ProduceUploadList {
         OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(orderNo, orderBase.getId(), updateTime, itemTableName, itemOrderType, 22);
         ojtgutls.add(add);
         // 工单状态order_status 6, 7, 9, 10
-        if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode()) ||
-                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) ||
-                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()) ||
-                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode())){
-            if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode())){
+        if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()) ||
+                orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
+                orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()) ||
+                orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode())){
+            if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode())){
                 OutJiasmToGreeUploadTaskList addo = publicService.getUploadTaskList(orderNo, orderBase.getId(), updateTime, itemTableName, itemOrderType, 221);
                 ojtgutls.add(addo);
-            } else if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) ||
-                    orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode())){
+            } else if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
+                    orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode())){
                 OutJiasmToGreeUploadTaskList addt = publicService.getUploadTaskList(orderNo, orderBase.getId(), updateTime, itemTableName, itemOrderType, 221);
                 ojtgutls.add(addt);
                 OutJiasmToGreeUploadTaskList addtt = publicService.getUploadTaskList(orderNo, orderBase.getId(), orderBase.getUpdateTime(), itemTableName, itemOrderType, 222);

src/main/java/com/zfire/jiasm/syncdata/upload/order/repair/ProduceUploadList.java

@@ -1,5 +1,6 @@
 package com.zfire.jiasm.syncdata.upload.order.repair;
 
+import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
 import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
@@ -98,10 +99,10 @@ public class ProduceUploadList {
                                     orderBase.getOrderType(),66);
 
                             // 工单状态(8, 9, 10, 11, 12, 13, 14) 派工状态:(13, 14, 15) 未下载总部采集数据
-                            if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I6.getCode()) ||
-                                    orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I7.getCode()) ||
-                                    orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I9.getCode()) ||
-                                    orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_I10.getCode())){
+                            if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()) ||
+                                    orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
+                                    orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()) ||
+                                    orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode())){
 
                             }