add

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

@@ -78,26 +78,26 @@ public enum GDAppointStatusEnum {
     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_G1("A1101","保存"),
+    REPAIR_STATUS_G2("A1121","待分部派工"),
+    REPAIR_STATUS_G3("A1129","待分中心派工"),
+    REPAIR_STATUS_G4("A1129","待网点派工"),
+    REPAIR_STATUS_G5("A1135","待审批改派"),
     REPAIR_STATUS_G6("B6","待审批支援"),
-    REPAIR_STATUS_G7("B18","待服务人员处理"),// 20,21,22,23,24
-    REPAIR_STATUS_G8("B18","服务人员报完工"),
+    REPAIR_STATUS_G7("A1301","待服务人员处理"),// 20,21,22,23,24
+    REPAIR_STATUS_G8("A1301","服务人员报完工"),
     // REPAIR_STATUS_G9("B51","网点报完工"),
-    REPAIR_STATUS_G10("B18","分中心报完工"),
-    REPAIR_STATUS_G11("B18","分部报完工"),
+    REPAIR_STATUS_G10("A1301","分中心报完工"),
+    REPAIR_STATUS_G11("A1301","分部报完工"),
     //REPAIR_STATUS_G12("B100","历史信息"),
     //REPAIR_STATUS_G13("B101","批量关闭"),
-    REPAIR_STATUS_G14_0("B41","正常关闭"),
+    REPAIR_STATUS_G14_0("A1304","正常关闭"),
     REPAIR_STATUS_G14_1("B51","正常关闭"),
-    REPAIR_STATUS_G14_2("B61","正常关闭"),
+    REPAIR_STATUS_G14_2("B51","正常关闭"),
     REPAIR_STATUS_G14_3("B71","正常关闭"),
     REPAIR_STATUS_G15_0("B100","历史信息"),
     REPAIR_STATUS_G15_1("B101","批量关闭"),
-    REPAIR_STATUS_G15_2("B102","正常关闭"),
+    REPAIR_STATUS_G15_2("A1309","正常关闭"),
     REPAIR_STATUS_G16("B103","异常关闭"),
 
 

src/main/java/com/zfire/jiasm/syncdata/constant/GDAppointStatusEnumBak.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 GDAppointStatusEnumBak {
+    // 安装-工单派工状态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;
+
+    GDAppointStatusEnumBak(String code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+    public static GDAppointStatusEnumBak getByCode(String code) {
+        for (GDAppointStatusEnumBak 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 (GDAppointStatusEnumBak item : values()) {
+            if (code.equals(item.getCode())) {
+                result = item.getText();
+                break;
+            }
+        }
+        return result;
+    }
+}

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

@@ -79,20 +79,20 @@ public enum GDOrderStatusEnum {
     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_G1("A1101","保存"),
+    REPAIR_STATUS_G2("A1121","待分部派工"),
+    REPAIR_STATUS_G3("A1129","待分中心派工"),
+    REPAIR_STATUS_G4("A1129","待网点派工"),
+    REPAIR_STATUS_G5("A1135","待审批改派"),
     REPAIR_STATUS_G6("B6","待审批支援"),
-    REPAIR_STATUS_G7("B18","待服务人员处理"),// 20,21,22,23,24
-    REPAIR_STATUS_G8("B41","服务人员报完工"),
+    REPAIR_STATUS_G7("A1301","待服务人员处理"),// 20,21,22,23,24
+    REPAIR_STATUS_G8("A1304","服务人员报完工"),
     REPAIR_STATUS_G9("B51","网点报完工"),
-    REPAIR_STATUS_G10("B61","分中心报完工"),
+    REPAIR_STATUS_G10("B51","分中心报完工"),
     REPAIR_STATUS_G11("B71","分部报完工"),
     REPAIR_STATUS_G12("B100","历史信息"),
     REPAIR_STATUS_G13("B101","批量关闭"),
-    REPAIR_STATUS_G14("B102","正常关闭"),
+    REPAIR_STATUS_G14("A1309","正常关闭"),
     REPAIR_STATUS_G15("B103","异常关闭"),
 
 

src/main/java/com/zfire/jiasm/syncdata/constant/GDOrderStatusEnumBak.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 GDOrderStatusEnumBak {
+    // 安装-工单状态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;
+
+    GDOrderStatusEnumBak(String code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+    public static GDOrderStatusEnumBak getByCode(String code) {
+        for (GDOrderStatusEnumBak 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 (GDOrderStatusEnumBak item : values()) {
+            if (code.equals(item.getCode())) {
+                result = item.getText();
+                break;
+            }
+        }
+        return result;
+    }
+}

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

@@ -77,20 +77,20 @@ public enum OrderStatusEnum {
      */
     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_B1("A1101","保存"),
+    REPAIR_STATUS_B2("A1121","待分部派工"),
+    REPAIR_STATUS_B3("A1129","待分中心派工"),
+    REPAIR_STATUS_B4("A1129","待网点派工"),
+    REPAIR_STATUS_B5("A1135","待审批改派"),
     REPAIR_STATUS_B6("B6","待审批支援"),
-    REPAIR_STATUS_B7("B18","待服务人员处理"),// 20,21,22,23,24
-    REPAIR_STATUS_B8("B41","服务人员报完工"),
+    REPAIR_STATUS_B7("A1301","待服务人员处理"),// 20,21,22,23,24
+    REPAIR_STATUS_B8("A1304","服务人员报完工"),
     REPAIR_STATUS_B9("B51","网点报完工"),
-    REPAIR_STATUS_B10("B61","分中心报完工"),
+    REPAIR_STATUS_B10("B51","分中心报完工"),
     REPAIR_STATUS_B11("B71","分部报完工"),
     REPAIR_STATUS_B12("B100","历史信息"),
     REPAIR_STATUS_B13("B101","批量关闭"),
-    REPAIR_STATUS_B14("B102","正常关闭"),
+    REPAIR_STATUS_B14("A1309","正常关闭"),
     REPAIR_STATUS_B15("B103","异常关闭"),
 
 

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

@@ -0,0 +1,138 @@
+package com.zfire.jiasm.syncdata.constant;
+
+
+import lombok.Getter;
+
+/**
+ * 平台工单当前状态  分两部分(安装与维修)
+ * 左则数值为格力工单系统状态，方便对应处理
+ * @author yaozx
+ * @version 1.0
+ * @date 2023-02-22
+ */
+@Getter
+public enum OrderStatusEnumBak {
+    /**
+     * 预保存工单
+     */
+    INSTALL_STATUS_A1100("A1100","预保存工单"),
+
+    /**
+     * 已保存工单
+     */
+    INSTALL_STATUS_A1101("A1101","已保存工单"),
+
+    /**
+     * 待分部派工
+     */
+    INSTALL_STATUS_A1121("A1121","待分部派工"),
+
+    /**
+     * 待分部预派工
+     */
+    INSTALL_STATUS_A1122("A1122","待分部预派工"),
+
+    /**
+     * 格力品牌省份信息接口
+     */
+    INSTALL_STATUS_A1125("A1125","待分中心派工"),
+
+    /**
+     * 待网点派工
+     */
+    INSTALL_STATUS_A1129("A1129","待网点派工"),
+
+    /**
+     * 待网点预派工
+     */
+    INSTALL_STATUS_A1130("A1130","待网点预派工"),
+
+    /**
+     * 待审批改派
+     */
+    INSTALL_STATUS_A1135("A1135","待审批改派"),
+
+    /**
+     * 服务人员待接收
+     */
+    INSTALL_STATUS_A1301("A1301","服务人员待接收"),
+
+    /**
+     * 服务人员报完工
+     */
+    INSTALL_STATUS_A1304("A1304","服务人员报完工"),
+
+    /**
+     * 服务人员申请售后处理
+     */
+    INSTALL_STATUS_A1307("A1307","服务人员申请售后处理"),
+
+    /**
+     * 已作废工单
+     */
+    INSTALL_STATUS_A1308("A1308","已作废工单"),
+
+    /**
+     * 已关闭工单
+     */
+    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","异常关闭"),
+
+
+    ;
+
+
+
+
+    /**
+     * 编码
+     */
+    private final String code;
+
+
+    private final String text;
+
+    OrderStatusEnumBak(String code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+    public static OrderStatusEnumBak getByCode(String code) {
+        for (OrderStatusEnumBak 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 (OrderStatusEnumBak item : values()) {
+            if (code.equals(item.getCode())) {
+                result = item.getText();
+                break;
+            }
+        }
+        return result;
+    }
+}

src/main/java/com/zfire/jiasm/syncdata/dao/mapper/OrderInformationNewMapper.java

@@ -2,6 +2,7 @@ package com.zfire.jiasm.syncdata.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zfire.jiasm.syncdata.parameter.OrderPar;
+import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignXzydUpload;
 import com.zfire.jiasm.syncdata.plus.entity.ItfTblAzAssignXzydUpload;
 import com.zfire.jiasm.syncdata.plus.entity.OrderInformation;
 import org.apache.ibatis.annotations.Param;
@@ -9,6 +10,7 @@ import org.apache.ibatis.annotations.Param;
 public interface OrderInformationNewMapper extends BaseMapper<OrderInformation> {
 
     ItfTblAzAssignXzydUpload getOrderInformation (@Param("request") OrderPar request);
+    ItfTblAssignXzydUpload getOrderInformationrepair (@Param("request") OrderPar request);
 
     void upYdid (@Param("request") OrderPar request);
 }

src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusiness.java

@@ -1007,14 +1007,12 @@ public class InstallBusiness {
             CustomerInformationWebsit ciw = null;
             WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                     .eq(WebsitOrderSign::getBrandWebsitId, s.getHfwdno())
-                    .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                     .one();
             if (wos !=null){
                 o.setRvisitWebsitId(wos.getWebsitId());
             } else {
                 ciw = customerInformationWebsitService.lambdaQuery()
                         .eq(CustomerInformationWebsit::getRefWebsitId, s.getHfwdno())
-                        .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                         .one();
                 if (ciw !=null){
                     o.setRvisitWebsitId(wos.getWebsitId());
@@ -1105,7 +1103,6 @@ public class InstallBusiness {
                 // 从销售网点查
                 CustomerInformationWebsit ciw = customerInformationWebsitService.lambdaQuery()
                         .eq(CustomerInformationWebsit::getRefWebsitId, fkmx.getWdno())
-                        .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                         .one();
                 if (ciw !=null){
                     oiol.setWebsitNumber(ciw.getWebsitId());// 为售后网点火器

src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusiness.java

@@ -93,10 +93,10 @@ public class RepairBusiness {
     // 1：工单落入本地表 TL_SynDataFrom_tbl_assign_batch
     @Scheduled(fixedDelay = 1 * 5 * 1000)
     public void inputOrder() {
-        if (1 == 1) {
+        /*if (1 == 1) {
             return;
         }
-
+*/
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<ItfTblAssignDownload> repairRec = new ArrayList<>();
         List<Long> pgids = new ArrayList<>();
@@ -682,9 +682,9 @@ public class RepairBusiness {
 
     private void getUpOrderInfor(Brand brand, List<OrderInformation> oilistUp, ItfTblAssignXzydDownload yd) {
         OrderInformation up = new OrderInformation();
-        up.setId(String.valueOf(yd.getXzid()));
+        up.setXzid(yd.getXzid());
         up.setAskCategoryId(yd.getXzyqlb());
-        up.setAskCategoryName(yd.getXzyq());
+        up.setRemark(yd.getXzyq());
         up.setReadStatus(yd.getYdbz());
         up.setReadTime(yd.getYdsj());
         up.setReadName(yd.getYdrmc());
@@ -696,9 +696,9 @@ public class RepairBusiness {
 
     private void getAddOrderInfor(Brand brand, OrderBase order, List<OrderInformation> oilist, ItfTblAssignXzydDownload yd) {
         OrderInformation add = new OrderInformation();
-        add.setId(String.valueOf(yd.getXzid()));
+        add.setXzid(yd.getXzid());
         add.setAskCategoryId(yd.getXzyqlb());
-        add.setAskCategoryName(yd.getXzyq());
+        add.setRemark(yd.getXzyq());
         add.setOrderBaseId(order.getId());
         add.setCreateBy(yd.getCreatedBy());
         add.setCreateTime(yd.getCreatedDate());

src/main/java/com/zfire/jiasm/syncdata/download/order/RepairDownload.java

@@ -52,9 +52,9 @@ public class RepairDownload {
     @Scheduled(fixedDelay = 1 * 5 * 1000)
     public void download() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if (1 == 1) {
+        /*if (1 == 1) {
             return;
-        }
+        }*/
 
 
         try {

src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryAdd.java

@@ -322,8 +322,7 @@ public class GLPPWXGQueryAdd {
         // 网点对应关系
         List<CustomerInformationWebsit> ciws = customerInformationWebsitService.lambdaQuery()
                 .select(CustomerInformationWebsit::getWebsitId,
-                        CustomerInformationWebsit::getRefWebsitId)
-                .eq(CustomerInformationWebsit::getBrandId,brand.getBrandId()).list();
+                        CustomerInformationWebsit::getRefWebsitId).list();
         if (ciws ==null || ciws.size()<1){
             return;
         }

src/main/java/com/zfire/jiasm/syncdata/parameter/OrderPar.java

@@ -31,5 +31,5 @@ public class OrderPar {
     private String fkid;
 
     // 阅读ID
-    private String ydid;
+    private String xzid;
 }

src/main/java/com/zfire/jiasm/syncdata/plus/mapper/AdminFastEntryMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-04
+ * @since 2023-04-28
  */
 public interface AdminFastEntryMapper extends BaseMapper<AdminFastEntry> {
 

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

@@ -963,14 +963,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         String brandWebsitNumber = "";
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, detail.getWebsitId())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             brandWebsitNumber = wos.getBrandWebsitNumber();
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, detail.getWebsitId())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 brandWebsitNumber = ciwx.getRefWebsitId();
@@ -1021,14 +1019,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         String brandWebsitNumber = "";
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, detail.getWebsitId())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             brandWebsitNumber = wos.getBrandWebsitNumber();
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, detail.getWebsitId())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 brandWebsitNumber = ciwx.getRefWebsitId();
@@ -1079,14 +1075,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         String brandWebsitNumber = "";
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, detail.getWebsitId())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             brandWebsitNumber = wos.getBrandWebsitNumber();
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, detail.getWebsitId())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 brandWebsitNumber = ciwx.getRefWebsitId();
@@ -1109,14 +1103,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         // 先从售后网点查
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getZjczwdxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             mxup.setZjczwdxtbh(wos.getBrandWebsitNumber());
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, mxup.getZjczwdxtbh())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 mxup.setZjczwdxtbh(ciwx.getRefWebsitId());
@@ -1131,7 +1123,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
         WebsitOrderSign wost = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getJsdwxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wost != null){
             mxup.setJsdwxtbh(wos.getBrandWebsitId());
@@ -1144,14 +1135,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         // 先从售后网点查
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getZjczwdxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             mxup.setZjczwdxtbh(wos.getBrandWebsitNumber());
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, mxup.getZjczwdxtbh())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 mxup.setZjczwdxtbh(ciwx.getRefWebsitId());
@@ -1166,7 +1155,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
         WebsitOrderSign wost = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getJsdwxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wost != null){
             mxup.setJsdwxtbh(wos.getBrandWebsitId());
@@ -1179,14 +1167,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         // 先从售后网点查
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getZjczwdxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             mxup.setZjczwdxtbh(wos.getBrandWebsitNumber());
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, mxup.getZjczwdxtbh())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 mxup.setZjczwdxtbh(ciwx.getRefWebsitId());
@@ -1200,7 +1186,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
         WebsitOrderSign wost = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getJsdwxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wost != null){
             mxup.setJsdwxtbh(wos.getBrandWebsitId());

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

@@ -56,14 +56,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         // 先从销售网点查
         CustomerInformationWebsit ciw = customerInformationWebsitService.lambdaQuery()
                 .eq(CustomerInformationWebsit::getRefWebsitId, orderBase.getCreateSys())
-                .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                 .one();
         if (ciw !=null){
             orderBase.setCreateSys(ciw.getWebsitId());
         } else {
             WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                     .eq(WebsitOrderSign::getBrandWebsitId, orderBase.getCreateSys())
-                    .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                     .one();
             if (wos != null){
                 orderBase.setCreateSys(wos.getWebsitId());
@@ -75,7 +73,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         // 先从销售网点查
         CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                 .eq(CustomerInformationWebsit::getRefWebsitId, orderBase.getLastOperatorWebsit())
-                .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                 .one();
         if (ciwx !=null){
             orderBase.setLastOperatorWebsit(ciwx.getWebsitId());
@@ -83,7 +80,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         } else {
             WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                     .eq(WebsitOrderSign::getBrandWebsitId, orderBase.getLastOperatorWebsit())
-                    .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                     .one();
             if (wos != null){
                 orderBase.setLastOperatorWebsit(wos.getWebsitId());
@@ -120,14 +116,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         // 先从销售网点查
         CustomerInformationWebsit ciw = customerInformationWebsitService.lambdaQuery()
                 .eq(CustomerInformationWebsit::getRefWebsitId, orderBase.getCreateSys())
-                .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                 .one();
         if (ciw !=null){
             orderBase.setCreateSys(ciw.getWebsitId());
         } else {
             WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                     .eq(WebsitOrderSign::getBrandWebsitId, orderBase.getCreateSys())
-                    .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                     .one();
             if (wos != null){
                 orderBase.setCreateSys(wos.getWebsitId());
@@ -139,7 +133,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         // 先从销售网点查
         CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                 .eq(CustomerInformationWebsit::getRefWebsitId, orderBase.getLastOperatorWebsit())
-                .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                 .one();
         if (ciwx !=null){
             orderBase.setLastOperatorWebsit(ciwx.getWebsitId());
@@ -147,7 +140,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         } else {
             WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                     .eq(WebsitOrderSign::getBrandWebsitId, orderBase.getLastOperatorWebsit())
-                    .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                     .one();
             if (wos != null){
                 orderBase.setLastOperatorWebsit(wos.getWebsitId());

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

@@ -199,7 +199,7 @@ public class PrepareServiceImpl implements PrepareService {
 					"SELECT * FROM " + tabName + " where  id=? ", new Object[] { id });
 		} else if (tabName.equals("order_information")){
 			result = jdbcTemplate.queryForMap(
-					"SELECT * FROM " + tabName + " where worker_order_no=? and id=? ", new Object[] { orderNo, id });
+					"SELECT * FROM " + tabName + " where order_base_id =? and id=? ", new Object[] { orderNo, id });
 		}
 		else {
 			result = jdbcTemplate.queryForMap(

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

@@ -192,14 +192,12 @@ public class PublicServiceImpl implements PublicService {
         // 先从售后网点查
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getBrandWebsitNumber, websitNo)
-                .eq(WebsitOrderSign::getBrandId, brandId)
                 .one();
         if (wos != null){
             resultData.setWdId(wos.getWebsitId());
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getRefWebsitId, websitNo)
-                    .eq(CustomerInformationWebsit::getBrandId, brandId)
                     .one();
             if (ciwx !=null){
                 resultData.setWdId(ciwx.getWebsitId());
@@ -235,7 +233,6 @@ public class PublicServiceImpl implements PublicService {
         // 先从售后网点查
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, websitId)
-                .eq(WebsitOrderSign::getBrandId, brandId)
                 .one();
         if (wos != null){
             resultData.setWdno(wos.getBrandWebsitNumber());
@@ -244,7 +241,6 @@ public class PublicServiceImpl implements PublicService {
             // 查看销售网点
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, websitId)
-                    .eq(CustomerInformationWebsit::getBrandId, brandId)
                     .one();
             if (ciwx !=null){
                 resultData.setWdno(ciwx.getRefWebsitId());

src/main/java/com/zfire/jiasm/syncdata/test.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
 
 import java.sql.Timestamp;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -47,17 +48,17 @@ public class test {
             System.out.println("R="+r);
         }*/
 
-        Calendar cal=Calendar.getInstance();
-        int y = cal.get(Calendar.YEAR);
-        int m = cal.get(Calendar.MONTH) + 1;
-        int d = cal.get(Calendar.DATE);
-        int h = cal.get(Calendar.HOUR_OF_DAY);
-        int f = cal.get(Calendar.MINUTE);
-        int s = cal.get(Calendar.SECOND);
-        int hm = cal.get(Calendar.MILLISECOND) % 100000;
-
-        System.out.println(String.format("%04d%02d%02d%02d%02d%02d%05d",y,m,d,h,f,s,hm));
-
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try
+        {
+            Date d1 = df.parse("2004-03-26 13:30:40");
+            Date d2 = df.parse("2004-03-26 13:35:40");
+            long diff = d2.getTime() - d1.getTime();
+            System.out.println("diff:"+diff / (60 * 1000));
+        }
+        catch (Exception e)
+        {
+        }
 
 
 

src/main/java/com/zfire/jiasm/syncdata/upload/order/InstallProduceDataUploadList.java

@@ -271,10 +271,10 @@ public class InstallProduceDataUploadList {
                                 ojtutl.getOrderType().equals(OrderTypeEnum.ORDER_TYPE_INSTALL.getCode())){
                             installProduceDataUploadList.generateAzMx(brand, ojtutl);
                         }
-                        // 生成安装工单明细数据 TL_PrePareSynDataby_fa_order_install_information
+                        // 生成安装工单子信息数据 TL_PrePareSynDataby_fa_order_install_information
                         if (ojtutl.getTableName().equals("order_information") &&
                                 ojtutl.getOrderType().equals(OrderTypeEnum.ORDER_TYPE_INSTALL.getCode())){
-                            installProduceDataUploadList.generateInformation(ojtutl);
+                            installProduceDataUploadList.generateInformation(ojtutl,brand);
                         }
                     } catch (Exception ex) {
                         ex.printStackTrace();
@@ -294,7 +294,7 @@ public class InstallProduceDataUploadList {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void generateInformation(OutJiasmToGreeUploadTaskList ojtutl) {
+    public void generateInformation(OutJiasmToGreeUploadTaskList ojtutl,Brand brand) {
         // 提取对应的子信息
         OrderInformation oi = orderInformationService.lambdaQuery()
                 .eq(OrderInformation::getId, ojtutl.getId()).one();
@@ -307,6 +307,8 @@ public class InstallProduceDataUploadList {
             OrderPar orderPar = new OrderPar();
             orderPar.setId(ojtutl.getId());
             ItfTblAzAssignXzydUpload rec = orderInformationNewMapper.getOrderInformation(orderPar);
+            WebsitPP pp = publicService.WebsitToPP(rec.getWdno(),brand.getBrandId());
+            rec.setWdno(pp.getWdno());
             itfTblAzAssignXzydUploadService.save(rec);
         }
         // 修改数据上传任务表中的状态 单号,id,同步状态,类型
@@ -472,7 +474,6 @@ public class InstallProduceDataUploadList {
         // 先从售后网点查
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, websitId)
-                .eq(WebsitOrderSign::getBrandId, brandId)
                 .one();
         if (wos != null){
             resultData.setWdno(wos.getBrandWebsitNumber());
@@ -480,7 +481,6 @@ public class InstallProduceDataUploadList {
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, websitId)
-                    .eq(CustomerInformationWebsit::getBrandId, brandId)
                     .one();
             if (ciwx !=null){
                 resultData.setWdno(ciwx.getRefWebsitId());
@@ -1164,14 +1164,12 @@ public class InstallProduceDataUploadList {
         String brandWebsitNumber = "";
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, detail.getWebsitId())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             brandWebsitNumber = wos.getBrandWebsitNumber();
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, detail.getWebsitId())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 brandWebsitNumber = ciwx.getRefWebsitId();
@@ -1222,14 +1220,12 @@ public class InstallProduceDataUploadList {
         String brandWebsitNumber = "";
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, detail.getWebsitId())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             brandWebsitNumber = wos.getBrandWebsitNumber();
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, detail.getWebsitId())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 brandWebsitNumber = ciwx.getRefWebsitId();
@@ -1280,14 +1276,12 @@ public class InstallProduceDataUploadList {
         String brandWebsitNumber = "";
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, detail.getWebsitId())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             brandWebsitNumber = wos.getBrandWebsitNumber();
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, detail.getWebsitId())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 brandWebsitNumber = ciwx.getRefWebsitId();
@@ -1309,14 +1303,12 @@ public class InstallProduceDataUploadList {
         // 先从售后网点查
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getZjczwdxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             mxup.setZjczwdxtbh(wos.getBrandWebsitNumber());
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, mxup.getZjczwdxtbh())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 mxup.setZjczwdxtbh(ciwx.getRefWebsitId());
@@ -1330,7 +1322,6 @@ public class InstallProduceDataUploadList {
 
         WebsitOrderSign wost = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getJsdwxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wost != null){
             mxup.setJsdwxtbh(wos.getBrandWebsitId());
@@ -1342,14 +1333,12 @@ public class InstallProduceDataUploadList {
         // 先从售后网点查
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getZjczwdxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             mxup.setZjczwdxtbh(wos.getBrandWebsitNumber());
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, mxup.getZjczwdxtbh())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 mxup.setZjczwdxtbh(ciwx.getRefWebsitId());
@@ -1364,7 +1353,6 @@ public class InstallProduceDataUploadList {
 
         WebsitOrderSign wost = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getJsdwxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wost != null){
             mxup.setJsdwxtbh(wos.getBrandWebsitId());
@@ -1376,14 +1364,12 @@ public class InstallProduceDataUploadList {
         // 先从售后网点查
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getZjczwdxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wos != null){
             mxup.setZjczwdxtbh(wos.getBrandWebsitNumber());
         } else {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, mxup.getZjczwdxtbh())
-                    .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
                     .one();
             if (ciwx !=null){
                 mxup.setZjczwdxtbh(ciwx.getRefWebsitId());
@@ -1398,7 +1384,6 @@ public class InstallProduceDataUploadList {
 
         WebsitOrderSign wost = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, mxup.getJsdwxtbh())
-                .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
                 .one();
         if (wost != null){
             mxup.setJsdwxtbh(wos.getBrandWebsitId());

src/main/java/com/zfire/jiasm/syncdata/upload/order/InstallProduceUploadList.java

@@ -123,7 +123,7 @@ public class InstallProduceUploadList {
                         // TL_PrePare_task_by_fa_order_install_product 24
                         installProduceUploadList.orderProductProess(item, itemTableName, itemOrderNo, itemTableNameId);
                     }
-                    // 子信息  26
+                    // 安装工单子信息  26
                     if (itemTableName.equals("order_information") &&
                             itemOrderType.equals(OrderTypeEnum.ORDER_TYPE_INSTALL.getCode())){
                         // TL_PrePare_task_by_fa_order_install_information

src/main/java/com/zfire/jiasm/syncdata/upload/order/RepairProduceUploadList.java

@@ -2,6 +2,7 @@ package com.zfire.jiasm.syncdata.upload.order;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.GDAppointStatusEnum;
 import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
@@ -10,6 +11,7 @@ import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.parameter.OrderPar;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
+import com.zfire.jiasm.syncdata.response.WebsitPP;
 import com.zfire.jiasm.syncdata.service.PrepareService;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.utils.*;
@@ -58,9 +60,13 @@ public class RepairProduceUploadList {
     OrderInformationService orderInformationService;
     @Resource
     OrderInformationNewMapper orderInformationNewMapper;
+    @Resource
+    ItfTblAssignXzydUploadService itfTblAssignXzydUploadService;
+    @Resource
+    BaseService baseService;
 
 
-    @Scheduled(fixedDelay = 1 * 5 * 1000)
+    @Scheduled(fixedDelayString = "${repairone}")
     private void produceList() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<OutJiasmToGreeUploadTaskList> ojtgutls = new ArrayList<>();
@@ -68,7 +74,11 @@ public class RepairProduceUploadList {
             return;
         }*/
 
-
+        // 提取品牌信息
+        Brand brand = baseService.getBrand();
+        if (brand == null) {
+            return;
+        }
 
           log.info("开始预处理需要上传的维修工单数据: \uF0B7{}",sdf.format(new Date()));
 
@@ -116,41 +126,11 @@ public class RepairProduceUploadList {
                         // TL_PrePare_task_by_fa_order_repair_operating_log
                         repairProduceUploadList.logProess(item, itemTableName, itemOrderNo, itemTableNameId);
                     }
-                    // 子信息
+                    // 子信息 TL_PrePareSynDataby_fa_order_repair_information
                     if (itemTableName.equals("order_information") &&
                             itemOrderType.equals(OrderTypeEnum.ORDER_TYPE_REPAIR.getCode())){
-                        String newDykh = "";
                         // 执行 TL_get_fa_order_repair_information_pgid 取pgid 从工单主表中看
-                        // 提取工单数据
-                        OrderBase orderBase = orderBaseService.lambdaQuery()
-                                .eq(OrderBase::getId, itemOrderNo).one();
-                        // 提取对应的子信息
-                        OrderInformation oi = orderInformationService.lambdaQuery()
-                                .eq(OrderInformation::getId, itemTableNameId).one();
-
-                        // 为空不做处理
-                        if (StringUtils.isNotEmpty(orderBase.getPgid())){
-                            // 看 ydid 值 不为空取该值 为空时网络获取
-                            if (oi != null){
-                                // 获取YDID 表中不存在时从接口中获取
-                                newDykh = getYdId(token, itemOrderNo, itemTableNameId, srcTabName, orderBase, oi);
-                                // 修改 ydid 来自接口
-                                upYdid(itemTableNameId, newDykh);
-
-
-
-
-
-                            }
-                        }
-
-
-                        // 工单主表的pgid为空时不同步 不修改同步表数据
-                        // 看表的 fkid字段值
-
-
-                        // TL_PrePare_task_by_fa_order_repair_operating_log
-                        repairProduceUploadList.logProess(item, itemTableName, itemOrderNo, itemTableNameId);
+                        repairProduceUploadList.orderInformationProess(token, item, itemOrderNo, itemTableNameId, srcTabName, brand);
                     }
                 } catch (Exception ex) {
                     errorMessage = ex.getMessage();
@@ -169,18 +149,55 @@ public class RepairProduceUploadList {
 
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void orderInformationProess(Token token, OutJiasmToGreeUploadnotifylist item, String itemOrderNo,
+                                       String itemTableNameId, String srcTabName, Brand brand) throws Exception {
+        String newDykh = "";
+        // 提取工单数据
+        OrderBase orderBase = orderBaseService.lambdaQuery()
+                .eq(OrderBase::getId, itemOrderNo).one();
+        // 提取对应的子信息
+        OrderInformation oi = orderInformationService.lambdaQuery()
+                .eq(OrderInformation::getId, itemTableNameId).one();
+        // 为空不做处理
+        if (StringUtils.isNotEmpty(orderBase.getPgid())){
+            // 看 xzid 值 不为空取该值 为空时网络获取
+            if (oi != null){
+                // 获取YDID 表中不存在时从接口中获取
+                newDykh = getYdId(token, itemOrderNo, itemTableNameId, srcTabName, orderBase, oi);
+                // 修改 xzid 来自接口
+                upYdid(itemTableNameId, newDykh);
+                // 生成待同步表数据
+                getInformation(itemTableNameId, brand);
+
+                // 需要上传的订单数据表中处理状态同步为已处理
+                OutJiasmToGreeUploadnotifylist upn = getOutJiasmToGreeUploadnotifylist(item.getSynReqId());
+                outJiasmToGreeUploadnotifylistService.updateById(upn);
+            }
+        }
+    }
+
+    private void getInformation(String itemTableNameId, Brand brand) {
+        OrderPar orderPar = new OrderPar();
+        orderPar.setId(itemTableNameId);
+        ItfTblAssignXzydUpload rec = orderInformationNewMapper.getOrderInformationrepair(orderPar);
+        WebsitPP pp = publicService.WebsitToPP(rec.getWdno(), brand.getBrandId());
+        rec.setWdno(pp.getWdno());
+        itfTblAssignXzydUploadService.save(rec);
+    }
+
     private void upYdid(String itemTableNameId, String newDykh) {
         OrderPar orderPar = new OrderPar();
         orderPar.setId(itemTableNameId);
-        orderPar.setYdid(newDykh);
+        orderPar.setXzid(newDykh);
         orderInformationNewMapper.upYdid(orderPar);
     }
 
     private String getYdId(Token token, String itemOrderNo, String itemTableNameId, String srcTabName, OrderBase orderBase, OrderInformation oi) throws Exception {
         String newDykh;
-        if (oi.getYdid()>0){
+        if (oi.getXzid()>0){
             // 表中获取
-            newDykh = String.valueOf(oi.getYdid());
+            newDykh = String.valueOf(oi.getXzid());
         } else {
             // 网络获取
             newDykh = getWebAcquire(token, itemOrderNo, itemTableNameId, srcTabName, orderBase);

src/main/java/com/zfire/jiasm/syncdata/upload/order/数据上传.txt

@@ -48,5 +48,10 @@ reason:
   annex 采集附件表
 
 阅读记录没做 ：
-itf_tbl_az_assign_xzyd_upload
-itf_tbl_assign_xzyd_upload
+itf_tbl_az_assign_xzyd_upload   下载时查看有无保存
+itf_tbl_assign_xzyd_upload
+
+
+itf_gree_to_fa_syn_rule 定时同步
+SELECT * FROM itf_gree_to_fa_download_task where need_download=1 order by id; 批量执行一次
+

src/main/java/com/zfire/jiasm/syncdata/upload/settlement/SettlementInstallJY.java

@@ -15,7 +15,7 @@ public class SettlementInstallJY {
     @Autowired
     private OLDSystemUtil oldSystemTask;
 
-    @Scheduled(fixedDelay = 1 * 10 * 1000)
+    @Scheduled(fixedDelayString = "${installjy}")
     private void process() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         log.info("开始家用空调数据同步: \uF0B7{}",sdf.format(new Date()));

src/main/java/com/zfire/jiasm/syncdata/upload/settlement/SettlementInstallRepair.java

@@ -0,0 +1,32 @@
+package com.zfire.jiasm.syncdata.upload.settlement;
+
+import com.zfire.jiasm.syncdata.utils.OLDSystemUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Slf4j
+@Component
+public class SettlementInstallRepair {
+    @Autowired
+    private OLDSystemUtil oldSystemTask;
+
+    @Scheduled(fixedDelayString = "${repairjs}")
+    private void process() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        log.info("开始维修结算数据同步: \uF0B7{}",sdf.format(new Date()));
+
+        oldSystemTask.process("维修", "itf_tblwxjsjykt", "tblWxjsJykt", new Object[] { "itf_tblwxjsjykt", "tblWxjsJykt",
+                        new String[] { "itf_tblwxjsfjjykt", "itf_tblwxjswxxmjykt", "itf_tblwxjsxxyyjykt",
+                                "itf_tblwxjspjmxjykt" },
+                        new String[] { "tblWxjsFjJykt", "tblWxjsWxxmJykt", "tblWxjsXxyyJykt", "tblWxjsPjmxJykt" }, "", "", "" },
+                new Object[] { "itf_tblwxjsjykt", "tblWxjsJykt", new String[] {}, new String[] {}, "", "", "" }, false,
+                4, "id");
+
+        log.info("维修结算数据同步结束: \uF0B7{}",sdf.format(new Date()));
+    }
+}

src/main/java/com/zfire/jiasm/syncdata/upload/settlement/SettlementInstallSH.java

@@ -15,7 +15,7 @@ public class SettlementInstallSH {
     @Autowired
     private OLDSystemUtil oldSystemTask;
 
-    @Scheduled(fixedDelay = 1 * 10 * 1000)
+    @Scheduled(fixedDelayString = "${installsh}")
     private void process() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         log.info("开始生活电器数据同步: \uF0B7{}",sdf.format(new Date()));

src/main/java/com/zfire/jiasm/syncdata/upload/settlement/SettlementInstallSY.java

@@ -15,7 +15,7 @@ public class SettlementInstallSY {
     @Autowired
     private OLDSystemUtil oldSystemTask;
 
-    @Scheduled(fixedDelay = 1 * 10 * 1000)
+    @Scheduled(fixedDelayString = "${installsy}")
     private void process() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         log.info("开始商用空调数据同步: \uF0B7{}",sdf.format(new Date()));

src/main/java/com/zfire/jiasm/syncdata/utils/OLDSystemUtil.java

@@ -8,6 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Component
@@ -19,6 +22,8 @@ public class OLDSystemUtil {
 	private String installTopicName;
 	@Value("${repaireTopicName}")
 	private String repaireTopicName;
+	@Value("${finishlag}")
+	private String finishlag;
 	@Autowired
 	private TokenCenter tokenCenter;
 	@Autowired
@@ -34,6 +39,11 @@ public class OLDSystemUtil {
 		try {
 			Token token = tokenCenter.getCurrentToken();
 			for (Map<String, Object> row : result) {
+				// 1120 完工数据写入时间与同步时间滞后5分钟  60 * 1000
+				if (checkTime(row, requestTable)) {
+					continue;
+				}
+
 				int status = (Integer) row.get("status");
 				String aTableDataName;
 				String aTableDataJsonName;
@@ -76,6 +86,24 @@ public class OLDSystemUtil {
 
 	}
 
+	private boolean checkTime(Map<String, Object> row,String requestTable) throws ParseException {
+		DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+		if (!"itf_installItem".equals(requestTable)){
+			return false;
+		}
+
+		if ((Integer) row.get("stat") == 1120){
+			Date synReqTime = df.parse(df.format((Date) row.get("syn_req_time")));
+			Date currentD = df.parse(df.format(new Date()));
+			long time = (currentD.getTime() - synReqTime.getTime()) / (60 * 1000);
+			if (time <Integer.valueOf(finishlag)){
+				return true;
+			}
+		}
+		return false;
+	}
+
 	private void processATask(Map<String, Object> row, Token token, String requestTable, String requestJsonName,
 			String name, String aTableDataName, String aTableDataJsonName, String[] tableDatasAry,
 			String[] tableDatasJsonName, String otherJsons, boolean isInstall, int type, String idColName,

src/main/resources/bootstrap-dev.properties

@@ -120,11 +120,11 @@ clientid=guangfoserver
 otherurl=https://api-sms-pre-test.gree.com:9635/api/sso
 
 ######################## 自建工单短信发送配置 ##############################
-SMSSelf_accountSID=8a216da880d67afb01814728462d130f
+SMSSelf_accountSID=8a216da880d67afb01814728462d130f_error
 SMSSelf_authToken=efe907d67dda4abd8e1351757b649682
 SMSSelf_softVersion=2013-12-26
 SMSSelf_baseURL=https://app.cloopen.com:8883
-SMSSelf_appId=8a216da880d67afb0181472847271316
+SMSSelf_appId=8a216da880d67afb0181472847271316_error
 SMSSelf_smsType=0
 SMSSelf_templateId=1196771
 SMSSelf_startTime=07:00
@@ -139,3 +139,18 @@ repaireTopicName=WxDtoTopic
 
 ########################  派工短信发送  ###########################
 repaireMessageDispatchTopicName=messageTopic
+
+######################## 完工结算滞后时间单位分 ########################
+finishlag=5
+
+######################## 同步定时任务时间隔 ########################
+#安装家用空调
+installjy=10000
+#安装商用空调
+installsy=10000
+#安装生活电器
+installsh=10000
+#维修结算
+repairjs=10000
+#维修工单数据预生成
+repairone=5000

src/main/resources/bootstrap-prd.properties

@@ -105,4 +105,19 @@ FAILURE_EXE_COUNT=10
 ######################## 完工评价短信发送到格力总部 ###########################
 installTopicName=azdatacollection
 repaireTopicName=WxDtoTopic
-repaireMessageFinishTopicName=messageHuifangTopic
+repaireMessageFinishTopicName=messageHuifangTopic
+
+######################## 完工结算滞后时间单位分 ########################
+finishlag=5
+
+######################## 同步定时任务时间隔 ########################
+#安装家用空调
+installjy=10000
+#安装商用空调
+installsy=10000
+#安装生活电器
+installsh=10000
+#维修结算
+repairjs=10000
+#维修工单数据预生成
+repairone=5000

src/main/resources/bootstrap-test.properties

@@ -115,11 +115,11 @@ clientid=guangfoserver
 otherurl=https://api-sms-pre-test.gree.com:9635/api/sso
 
 ######################## 自建工单短信发送配置 ##############################
-SMSSelf_accountSID=8a216da880d67afb01814728462d130f
+SMSSelf_accountSID=8a216da880d67afb01814728462d130f_error
 SMSSelf_authToken=efe907d67dda4abd8e1351757b649682
 SMSSelf_softVersion=2013-12-26
 SMSSelf_baseURL=https://app.cloopen.com:8883
-SMSSelf_appId=8a216da880d67afb0181472847271316
+SMSSelf_appId=8a216da880d67afb0181472847271316_error
 SMSSelf_smsType=0
 SMSSelf_templateId=1196771
 SMSSelf_startTime=07:00
@@ -128,4 +128,24 @@ FAILURE_EXE_COUNT=10
 ######################## 完工评价短信发送到格力总部 ###########################
 installTopicName=azdatacollection
 repaireTopicName=WxDtoTopic
-repaireMessageFinishTopicName=messageHuifangTopic
+repaireMessageFinishTopicName=messageHuifangTopic
+
+######################## 完工结算滞后时间单位分 ########################
+finishlag=5
+
+
+
+
+
+
+######################## 同步定时任务时间隔 ########################
+#安装家用空调
+installjy=10000
+#安装商用空调
+installsy=10000
+#安装生活电器
+installsh=10000
+#维修结算
+repairjs=10000
+#维修工单数据预生成
+repairone=5000

src/main/resources/mapper/AZGDFYQDDownloadMapper.xml

@@ -14,8 +14,8 @@
                  left join itf_tbl_az_assign_lc_ls_download b on b.syn_req_id = #{request.mainSynReqId}
                  left join websit c on c.websit_id in
                                        (select websit_id from customer_information_websit
-                                        where brand_id = #{request.brandId} and ref_websit_id in
-                                                             (select cjwdno from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.mainSynReqId}))
+                                        where ref_websit_id in
+                                               (select cjwdno from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.mainSynReqId}))
 
         where a.syn_req_id = #{request.synReqId}
     </select>

src/main/resources/mapper/AZGDFkMxDownloadMapper.xml

@@ -9,8 +9,8 @@
         from itf_tbl_az_assign_fkmx_download a
                  left join websit b on b.websit_id in
                                        (select websit_id from websit_order_sign
-                                        where brand_id = #{request.brandId} and brand_websit_id in
-                                                             (select wdno from itf_tbl_az_assign_fkmx_download where syn_req_id = #{request.synReqId}))
+                                        where brand_websit_id in
+                                               (select wdno from itf_tbl_az_assign_fkmx_download where syn_req_id = #{request.synReqId}))
         where syn_req_id = #{request.synReqId}
     </select>
 

src/main/resources/mapper/AZGDLcLsDownloadMapper.xml

@@ -40,27 +40,27 @@
                  left join sys_dict g on g.dict_type='SERVICE_CATEGORY' and g.dict_value='家电售后'
                  left join websit h on h.websit_id in
                                        (select websit_id from websit_order_sign
-                                        where brand_id = #{request.brandId} and brand_websit_id in
-                                                             (select azwdno from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.synReqId}))
+                                        where brand_websit_id in
+                                              (select azwdno from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.synReqId}))
                  left join websit i on i.websit_id in
                                        (select websit_id from websit_order_sign
-                                        where brand_id = #{request.brandId} and brand_websit_id in
-                                                             (select jspgwdno from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.synReqId}))
+                                        where  brand_websit_id in
+                                              (select jspgwdno from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.synReqId}))
                  left join websit j on j.websit_id in
                                        (select websit_id from customer_information_websit
-                                        where brand_id = #{request.brandId} and ref_websit_id in
-                                                             (select cjwdno from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.synReqId}))
+                                        where ref_websit_id in
+                                             (select cjwdno from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.synReqId}))
                  left join websit l on l.websit_id in
                                        (select websit_id from customer_information_websit
-                                        where brand_id = #{request.brandId} and ref_websit_id in
+                                        where ref_websit_id in
                                                              (select zjczwd from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.synReqId}))
                  left join websit n on n.websit_id in
                                        (select websit_id from customer_information_websit
-                                        where brand_id = #{request.brandId} and ref_websit_id in
+                                        where ref_websit_id in
                                                              (select xsdwno from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.synReqId}))
                  left join websit o on o.websit_id in
                                        (select websit_id from customer_information_websit
-                                        where brand_id = #{request.brandId} and ref_websit_id in
+                                        where ref_websit_id in
                                                              (select xsdwxtbh from itf_tbl_az_assign_lc_ls_download where syn_req_id = #{request.synReqId}))
         where a.syn_req_id = #{request.synReqId}
     </select>

src/main/resources/mapper/DetailOrderInstallMapper.xml

@@ -30,7 +30,7 @@
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
@@ -65,7 +65,7 @@
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                          (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                          (select brand_websit_number from websit_order_sign where websit_id in
                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
@@ -101,7 +101,7 @@
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                          (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                          (select brand_websit_number from websit_order_sign where websit_id in
                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
@@ -136,7 +136,7 @@
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
@@ -171,7 +171,7 @@
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
@@ -206,7 +206,7 @@
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0

src/main/resources/mapper/DetailOrderRepairMapper.xml

@@ -25,17 +25,17 @@
         from order_repair_detail a
                  left join brand_websit b on b.brand_id = #{request.brandId} and b.brand_websit_number in
                            (select brand_websit_number from websit_order_sign
-                                   where brand_id = #{request.brandId} and websit_id =a.settle_websit_id)
+                                   where websit_id =a.settle_websit_id)
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
                  left join order_base d on d.id=a.order_base_id
                  left join order_repair_operating_log e on e.order_base_id=a.order_base_id
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
                            (select brand_websit_number from websit_order_sign
-                                   where brand_id = #{request.brandId} and websit_id in
+                                   where websit_id in
                                          (select install_websit_id from order_base where id = #{request.orderNo}))
                  left join brand_websit g on g.brand_id = #{request.brandId} and g.brand_websit_number in
                            (select brand_websit_number from websit_order_sign
-                                   where brand_id = #{request.brandId} and websit_id in
+                                   where websit_id in
                                          (select websit_id from order_base where id = #{request.orderNo}))
                  left join sys_dict_ref h on h.dict_code=a.main_id and h.brand_id = #{request.brandId} and h.dict_type='MAIN_TYPE'
             left join order_product i on i.order_base_id = a.order_base_id and i.id = a.repair_product_id

src/main/resources/mapper/GDOrderBaseMapper.xml

@@ -44,26 +44,26 @@
             left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
             left join worker_brand_account d on d.worker_id = a.worker_id and d.websit_id = a.rece_websit_id and d.del=0
             left join brand_websit e on e.brand_id = #{request.brandId} and e.brand_websit_number in
-                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                 (select brand_websit_number from websit_order_sign where websit_id in
                                  (select websit_id from order_base where id = #{request.orderNo}))
             left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                 (select brand_websit_number from websit_order_sign where websit_id in
                                  (select rece_websit_id from order_base where id = #{request.orderNo}))
             left join brand_websit g on g.brand_id = #{request.brandId} and g.brand_websit_number in
-                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                 (select brand_websit_number from websit_order_sign where websit_id in
                                  (select rece_websit_id from order_base where id = #{request.orderNo}))
            left join brand_websit h on h.brand_id = #{request.brandId} and h.brand_websit_number in
-                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                 (select brand_websit_number from websit_order_sign where websit_id in
                                  (select websit_id from order_base where id = #{request.orderNo}))
            left join brand_websit i on i.brand_id = #{request.brandId} and i.brand_websit_number in
-                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                 (select brand_websit_number from websit_order_sign where websit_id in
                                  (select websit_id from order_base where id = #{request.orderNo}))
            left join order_install j on j.order_base_id=a.id and a.id = #{request.orderNo}
            left join brand_websit k on k.brand_id = #{request.brandId} and k.brand_websit_number in
-                 (select ref_websit_id from customer_information_websit where brand_id = #{request.brandId} and websit_id in
+                 (select ref_websit_id from customer_information_websit where websit_id in
                                  (select sale_websit_id from order_base where id = #{request.orderNo}))
-           left join order_state_contrast l on l.order_state=a.last_order_status and l.state_type=10 and l.brand_id = #{request.brandId}
-           left join order_state_contrast m on m.order_state=a.order_status and m.state_type=10 and m.brand_id = #{request.brandId}
+           left join order_state_contrast_upload l on l.order_state=a.last_order_status and l.state_type=10 and l.brand_id = #{request.brandId}
+           left join order_state_contrast_upload m on m.order_state=a.order_status and m.state_type=10 and m.brand_id = #{request.brandId}
         where a.id = #{request.orderNo}
     </select>
 
@@ -98,23 +98,23 @@
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = 1 and c.dict_type='MAIN_TYPE'
                  left join worker_brand_account d on d.worker_id = a.worker_id and d.websit_id = a.rece_websit_id and d.del=0
                  left join brand_websit e on e.brand_id = #{request.brandId} and e.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select websit_id from order_base where id = #{request.orderNo}))
                  left join brand_websit g on g.brand_id = #{request.brandId} and g.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select rece_websit_id from order_base where id = #{request.orderNo}))
                  left join brand_websit h on h.brand_id = #{request.brandId} and h.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select websit_id from order_base where id = #{request.orderNo}))
                  left join brand_websit i on i.brand_id = #{request.brandId} and i.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select websit_id from order_base where id = #{request.orderNo}))
-                 left join order_state_contrast m on m.order_state=a.order_status and m.state_type=60 and m.brand_id = #{request.brandId}
+                 left join order_state_contrast_upload m on m.order_state=a.order_status and m.state_type=60 and m.brand_id = #{request.brandId}
                  left join brand_websit n on n.brand_id = #{request.brandId} and n.brand_websit_number in
-                           (select ref_websit_id from customer_information_websit where brand_id = #{request.brandId} and websit_id in
+                           (select ref_websit_id from customer_information_websit where websit_id in
                                    (select sale_websit_id from order_base where id  = #{request.orderNo}))
-                 left join order_state_contrast o on o.order_state=a.last_order_status and o.state_type=60 and o.brand_id = #{request.brandId}
-                 left join order_state_contrast p on p.order_state=a.order_status and p.state_type=60 and p.brand_id = #{request.brandId}
+                 left join order_state_contrast_upload o on o.order_state=a.last_order_status and o.state_type=60 and o.brand_id = #{request.brandId}
+                 left join order_state_contrast_upload p on p.order_state=a.order_status and p.state_type=60 and p.brand_id = #{request.brandId}
                  left join order_repair q on q.order_base_id=a.id
         where a.id = #{request.orderNo}
     </select>
@@ -125,7 +125,7 @@
                e.brand_websit_number as fjwd
         from order_base a
                  left join brand_websit e on e.brand_id = #{request.brandId} and e.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select websit_id from order_base where id = #{request.orderNo}))
         where a.id = #{request.orderNo}
     </select>
@@ -134,7 +134,7 @@
         select a.id as worker_order_no, 2 as azorwx,now() as crdt,a.pgid as fjid,e.brand_websit_number as fjwd
         from order_base a
                  left join brand_websit e on e.brand_id = #{request.brandId} and e.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                     (select websit_id from order_base where id = #{request.orderNo}))
         where a.id = #{request.orderNo}
     </select>
@@ -145,7 +145,7 @@
                e.brand_websit_number as fjwd
         from order_base a
                  left join brand_websit e on e.brand_id = #{request.brandId} and e.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select websit_id from order_base where id = #{request.orderNo}))
         where a.id = #{request.orderNo}
     </select>
@@ -191,26 +191,26 @@
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
                  left join worker_brand_account d on d.worker_id = a.worker_id and d.websit_id = a.rece_websit_id and d.del=0
                  left join brand_websit e on e.brand_id = #{request.brandId} and e.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select websit_id from order_base where id = #{request.orderNo}))
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select rece_websit_id from order_base where id = #{request.orderNo}))
                  left join brand_websit g on g.brand_id = #{request.brandId} and g.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select rece_websit_id from order_base where id = #{request.orderNo}))
                  left join brand_websit h on h.brand_id = #{request.brandId} and h.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select create_sys from order_base where id = #{request.orderNo}))
                  left join brand_websit i on i.brand_id = #{request.brandId} and i.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select websit_id from order_base where id = #{request.orderNo}))
                  left join order_install j on j.order_base_id=a.id and a.id = #{request.orderNo}
                  left join brand_websit k on k.brand_id = #{request.brandId} and k.brand_websit_number in
-                           (select ref_websit_id from customer_information_websit where brand_id = #{request.brandId} and websit_id in
+                           (select ref_websit_id from customer_information_websit where websit_id in
                                    (select sale_websit_id from order_base where id = #{request.orderNo}))
-                 left join order_state_contrast l on l.order_state=a.last_order_status and l.state_type=10 and l.brand_id = #{request.brandId}
-                 left join order_state_contrast m on m.order_state=a.order_status and m.state_type=10 and m.brand_id = #{request.brandId}
+                 left join order_state_contrast_upload l on l.order_state=a.last_order_status and l.state_type=10 and l.brand_id = #{request.brandId}
+                 left join order_state_contrast_upload m on m.order_state=a.order_status and m.state_type=10 and m.brand_id = #{request.brandId}
         where a.id = #{request.orderNo}
     </select>
 

src/main/resources/mapper/GetOrderProductMapper.xml

@@ -19,10 +19,10 @@
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join product f on f.jxid = a.product_id
                  left join brand_websit g on g.brand_id = #{request.brandId} and g.brand_websit_number in
-                           (select ref_websit_id from customer_information_websit where brand_id = #{request.brandId} and websit_id in
+                           (select ref_websit_id from customer_information_websit where websit_id in
                                    (select sale_websit from order_product where id = #{request.id}))
                  left join brand_websit h on h.brand_id = #{request.brandId} and h.brand_websit_number in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                           (select brand_websit_number from websit_order_sign where websit_id in
                                    (select rece_websit_id from order_base where id = #{request.orderNo}))
                  left join repair_bug i on i.bug_id=a.fault_reason
         where a.id = #{request.id}
@@ -41,7 +41,7 @@
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join product f on f.jxid = a.product_id
                  left join brand_websit h on h.brand_id = #{request.brandId} and h.brand_websit_number in
-                       (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                       (select brand_websit_number from websit_order_sign where websit_id in
                                 (select rece_websit_id from order_base where id = #{request.orderNo}))
         where a.id = #{request.id}
     </select>

src/main/resources/mapper/OrderInformationNewMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.zfire.jiasm.syncdata.dao.mapper.OrderInformationNewMapper">
 
     <select id="getOrderInformation" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblAzAssignXzydUpload">
-        select a.order_base_id as worker_order_no,a.id as fa_order_install_information_id,a.out_id as id,
+        select a.order_base_id as worker_order_no,a.auto_id as fa_order_install_information_id,a.out_id as id,
                a.create_by,a.create_time as created_date,a.update_by as last_modified_by,
                a.update_time as last_modified_date,'' as xzid,a.create_by as czren,a.create_by as czrenmc,
                a.create_time as czsj,a.websit_id as wdno,a.read_status as cshu,a.remark as xzyq,
@@ -11,11 +11,23 @@
                a.read_name as ydren,a.read_name as ydrmc,'' as ydwd,'' as ydwdmc,b.pgguid,b.pgid
         from order_information a
                  left join order_base b on b.id=a.order_base_id
-        where a.pid = #{request.id}
+        where a.id = #{request.id}
+    </select>
+
+    <select id="getOrderInformationrepair" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignXzydUpload">
+        select a.order_base_id as worker_order_no,a.auto_id as fa_order_repair_information_id,
+               a.xzid,a.create_by,a.create_time as created_date,a.update_by as last_modified_by,
+               a.update_time as last_modified_date,b.pgid,a.create_by as czren,a.create_time as czsj,
+               a.websit_id as wdno,a.read_status as cshu,a.remark as xzyq,a.ask_category_id as xzyqlb,
+               a.read_status as ydbz,a.read_time as ydsj,a.read_name as ydren,a.read_name as ydrmc,
+               '' as ydwd,'' as ydwdmc
+        from order_information a
+                 left join order_base b on b.id=a.order_base_id
+        where a.id = #{request.id}
     </select>
 
     <update id="upYdid" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar">
-        update order_information set ydid = #{request.ydid}
+        update order_information set xzid = #{request.xzid}
         where id = #{request.id}
     </update>
 

src/main/resources/mapper/RepairDownloadMapper.xml

@@ -33,19 +33,19 @@
                  left join sys_dict f on f.dict_type='SERVICE_CATEGORY' and f.dict_value='家电售后'
                  left join websit g on g.websit_id in
                                        (select websit_id from websit_order_sign
-                                        where brand_id = #{request.brandId} and brand_websit_id in
+                                        where brand_websit_id in
                                                          (select if((wxwdno='' or wxwdno is null),IFNULL(xjwdno,''),wxwdno) from itf_tbl_assign_download where syn_req_id = #{request.synReqId}))
                  left join websit h on h.websit_id in
                                        (select websit_id from websit_order_sign
-                                        where brand_id = #{request.brandId} and brand_websit_id in
+                                        where brand_websit_id in
                                                          (select xjwdno from itf_tbl_assign_download where syn_req_id = #{request.synReqId}))
                  left join websit j on j.websit_id in
                                        (select websit_id from websit_order_sign
-                                        where brand_id = #{request.brandId} and brand_websit_id in
+                                        where brand_websit_id in
                                                          (select cjwdno from itf_tbl_assign_download where syn_req_id = #{request.synReqId}))
                  left join websit k on k.websit_id in
                                        (select websit_id from customer_information_websit
-                                        where brand_id = #{request.brandId} and ref_websit_id in
+                                        where ref_websit_id in
                                                          (select xswdno from itf_tbl_assign_download where syn_req_id = #{request.synReqId}))
         where a.syn_req_id = #{request.synReqId}
     </select>
@@ -66,18 +66,18 @@
                a.wcsj as over_time,IFNULL(a.zjczsj,a.last_modified_date) as last_operator_time,
                IFNULL(a.last_modified_date,a.zjczsj) as update_time,a.yhsx as user_attr,a.yhsxid as user_attr_id,
                a.fjhm,a.gdhao as file_no,a.zxhao as seat_no,a.xjwdsj as rece_time,a.yhqwsmsj as appointment_time,
-               a.yhqwsmsj as expect_start_time,a.qwsmjssj as expect_end_time,a.fjhm,a.wxcount as out_wxcount,
+               a.yhqwsmsj as expect_start_time,a.qwsmjssj as expect_end_time,a.fjhm,a.wxcount as out_wxcount
         from itf_tbl_assign_download a
                  left join itf_tbl_wangdian_wxg_download b on b.wxgid=a.wxrenid and b.wdno=a.wxwdno
                  left join websit k on k.websit_id in
                                        (select websit_id from customer_information_websit
-                                        where brand_id = #{request.brandId} and ref_websit_id in
+                                        where ref_websit_id in
                                                          (select xswdno from itf_tbl_assign_download where syn_req_id = #{request.synReqId}))
         where a.syn_req_id = #{request.synReqId}
     </select>
 
     <select id="getOrderBaseStatus" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.OrderBase">
-        select c.order_state as order_status,d.order_state as last_order_status,
+        select c.order_state as order_status,d.order_state as last_order_status
         from itf_tbl_assign_download a
                  left join order_state_contrast c on c.brand_order_state=a.stat and c.state_type=60 and c.brand_id = #{request.brandId}
                  left join order_state_contrast d on d.brand_order_state=a.qystat and d.state_type=60 and d.brand_id = #{request.brandId}

src/main/resources/mapper/RepairLogMapper.xml

@@ -30,7 +30,7 @@
         from order_repair_operating_log a
                  left join brand_websit b on b.brand_id = 1 and b.brand_websit_number in
                       (select brand_websit_number from websit_order_sign
-                              where brand_id = 1 and websit_id in
+                              where websit_id in
                                     (select websit_id from order_repair_operating_log where id = #{request.id}))
         where a.order_base_id = #{request.orderNo} and a.id = #{request.id}
     </select>

src/main/resources/mapper/RepairMxDownloadMapper.xml

@@ -11,11 +11,11 @@
         from itf_tbl_assign_mx_download a
                 left join websit b on b.websit_id in
                           (select websit_id from customer_information_websit
-                                  where brand_id = #{request.brandId} and ref_websit_id in
+                                  where ref_websit_id in
                                         (select xsdw from itf_tbl_assign_mx_download where syn_req_id = #{request.synReqId}))
                 left join websit c on c.websit_id in
                           (select websit_id from customer_information_websit
-                                  where brand_id = #{request.brandId} and ref_websit_id in
+                                  where ref_websit_id in
                                         (select fwdw from itf_tbl_assign_mx_download where syn_req_id = #{request.synReqId}))
         where syn_req_id = #{request.synReqId}
     </select>