add

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

@@ -2005,6 +2005,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                          ItfTblAzWgmxJyktUpload mxup, OrderInstallDetail detail) {
         WebsitSH websitSH = new WebsitSH();
 
+        setnwjtm(orderBase,mxup);
+
         setJysWdno(orderBase, mxup);
         mxup.setCjren(orderBase.getCreateBy());
         mxup.setCjrmc(orderBase.getCreateName());
@@ -2044,30 +2046,30 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
         mxup.setSjcjjwdu(mxup.getSjcjjd()+","+ mxup.getSjcjwd());
 
-        // 网点维修工ID单独处理
-        // 先找出网点编号对应的品牌商网点编号
-        // 先从售后网点查
-        websitSH = publicService.ptshwdToshshwd(detail.getWebsitId(), orderBase.getMainId());
-        if (StringUtils.isEmpty(websitSH.getWdId())){
-            websitSH = publicService.ptxswdToshxswd(detail.getWebsitId(), orderBase.getMainId());
-        }
-
-        ItfTblWangdianWxgDownload wxg = itfTblWangdianWxgDownloadService.lambdaQuery()
-                .eq(ItfTblWangdianWxgDownload::getSfzen,mxup.getAzrenid())
-                .eq(ItfTblWangdianWxgDownload::getWdno,websitSH.getWdId())
-                .last("limit 1")
-                .one();
+    }
 
-        if (wxg !=null){
-            mxup.setAzrenid(wxg.getWxgid());
+    public void setnwjtm(OrderBase orderBase,ItfTblAzWgmxJyktUpload mxup) {
+        List<OrderInstallDetailCode> codes = orderInstallDetailCodeService.lambdaQuery()
+                .eq(OrderInstallDetailCode::getOrderDetailId,orderBase.getId())
+                .in(OrderInstallDetailCode::getType,"1","2").list();
+        if (CollectionUtils.isNotEmpty(codes)){
+            for (OrderInstallDetailCode item:codes){
+                if (item.getType().equals("1") && StringUtils.isNotEmpty(item.getCode())){
+                    mxup.setNjtm(item.getCode());
+                }
+                if (item.getType().equals("2") && StringUtils.isNotEmpty(item.getCode())){
+                    mxup.setWjtm(item.getCode());
+                }
+            }
         }
-
     }
 
     public void setParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                          ItfTblAzWgmxJyktUpload mxup, Brand brand) {
         WebsitSH websitSH = new WebsitSH();
 
+        setnwjtm(orderBase,mxup);
+
         mxup.setCjren(orderBase.getCreateBy());
         mxup.setCjrmc(orderBase.getCreateName());