add

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

@@ -2487,33 +2487,29 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
     private OrderInstall getOrderInstall(OrderBase orderBase, ItfTblAzAssignLcLsDownload item,List<ItfTblAzAssignFeeDownload>  fyqd) {
         OrderInstall orderInstall = new OrderInstall();
-        WebsitFWS websitFWS = new WebsitFWS();
 
-        if (CollectionUtils.isNotEmpty(fyqd)){
-            OrderPar request = new OrderPar();
-            request.setSynReqId(fyqd.get(0).getSynReqId());
-            request.setMainSynReqId(item.getSynReqId());
-
-            orderInstall = azGDFYQDDownloadMapper.getOrderFYQD(request);
-            // 创建网点信息
-            websitFWS = publicService.shxswdToptxswd(item.getCjwdno(),orderBase);
-            if (StringUtils.isNotEmpty(websitFWS.getWebsitId())){
-                orderInstall.setShopNo(websitFWS.getWebsitId());
-                orderInstall.setShopName(websitFWS.getWdmc());
-            } else {
-                websitFWS = publicService.shshwdToptshwd(item.getCjwdno(),orderBase);
-                orderInstall.setShopNo(websitFWS.getWebsitId());
-                orderInstall.setShopName(websitFWS.getWdmc());
-            }
+        OrderPar request = new OrderPar();
+        request.setSynReqId(fyqd.get(0).getSynReqId());
+        request.setMainSynReqId(item.getSynReqId());
 
-            // 工单号
-            orderInstall.setOrderBaseId(orderBase.getId());
-            // 创建人,创建时间
-            orderInstall.setCreateBy(orderBase.getCreateBy());
-            orderInstall.setCreateTime(orderBase.getCreateTime());
-            return orderInstall;
+        orderInstall = azGDFYQDDownloadMapper.getOrderFYQD(request);
+        if (StringUtils.isNotEmpty(item.getCjwdno())){
+            orderInstall.setShopNo(item.getCjwdno());
         }
-        return null;
+        // 工单号
+        orderInstall.setOrderBaseId(orderBase.getId());
+        // 创建人,创建时间
+        orderInstall.setCreateBy(orderBase.getCreateBy());
+        orderInstall.setCreateTime(orderBase.getCreateTime());
+
+        if (CollectionUtils.isNotEmpty(fyqd)){
+            orderInstall.setBracket(fyqd.get(0).getAjia());
+            orderInstall.setPipe(fyqd.get(0).getJcguan());
+            orderInstall.setSwithFlag(fyqd.get(0).getKqkg());
+            orderInstall.setHighAltitude(fyqd.get(0).getGkzy());
+            orderInstall.setHole(fyqd.get(0).getYccxqk());
+        }
+        return orderInstall;
     }
 
     @NotNull

src/main/resources/mapper/AZGDFYQDDownloadMapper.xml

@@ -5,14 +5,12 @@
     <select id="getOrderFYQD" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.OrderInstall">
         select b.gcbh as engin_no,b.gcmc as engin_name,b.qqlymc as shop_flag,
                b.orderitemid as shop_order_no,
-               b.orderphone as shop_order_phone,b.retailsign as shop_new_retail,a.ajia as bracket,
-               a.jcguan as pipe,a.kqkg as swith_flag,a.gkzy as high_altitude,a.yccxqk as hole,
+               b.orderphone as shop_order_phone,b.retailsign as shop_new_retail,
                b.extendfiled1 as extend_field1,b.extendfiled2 as extend_field2,b.extendfiled3 as extend_field3,
                b.extendfiled4 as extend_field4,b.extendfiled5 as extend_field5,b.organizationname as warehouse,
                b.organizationaddress as warehouse_address
-        from itf_tbl_az_assign_fee_download a
-                 left join itf_tbl_az_assign_lc_ls_download b on b.syn_req_id = #{request.mainSynReqId}
-        where a.syn_req_id = #{request.synReqId}
+        from itf_tbl_az_assign_lc_ls_download b
+        where  b.syn_req_id = #{request.mainSynReqId}
     </select>