add

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

@@ -31,6 +31,7 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Slf4j
@@ -1041,7 +1042,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
      *   若插入的数据为采访集状态 检查是否已产生了1120完工请求的数据
      *      若产生过完工数据再次生成一条完工数据
      */
-    Boolean checkInstallitem(String cjOrWg,String taskno,OrderInstallDetail detail,ItfTblAzAssignLcLsUpload lcls,OutJiasmToGreeUploadTaskList ojtutl){
+    Boolean checkInstallitem(String cjOrWg,String taskno,OrderInstallDetail detail,ItfTblAzAssignLcLsUpload lcls,
+                             OutJiasmToGreeUploadTaskList ojtutl){
         int itemStatus = 1;
         int itemStat   = 1100;
         int itemSyjd   = 1301;
@@ -2079,11 +2081,15 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         // 提取安装师傅的账号信息
         mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
 
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
         mxup.setStat(cjstat);
         if (cjstat.equals("1120")){
             if (orderBase.getOverTime()!=null){
+                log.info("完成时间处理a：{}",sdf.format(orderBase.getOverTime()));
                 mxup.setWcsj(orderBase.getOverTime());
             } else {
+                log.info("完成时间处理b：{}",sdf.format(mxup.getLastModifiedDate()));
                 mxup.setWcsj(mxup.getLastModifiedDate());
             }
         }
@@ -2106,19 +2112,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             mxup.setSjcjwd(orderBase.getLng().substring(0,12));
         }
         mxup.setSjcjjwdu(mxup.getSjcjjd()+","+ mxup.getSjcjwd());
-
-        // 网点维修工ID单独处理
-
-        ItfTblWangdianWxgDownload wxg = itfTblWangdianWxgDownloadService.lambdaQuery()
-                .eq(ItfTblWangdianWxgDownload::getSfzen,mxup.getAzrenid())
-                .eq(ItfTblWangdianWxgDownload::getWdno,mxup.getCzwd())
-                .last("limit 1")
-                .one();
-
-        if (wxg !=null){
-            mxup.setAzrenid(wxg.getWxgid());
-        }
-
     }
 
     public void setOtherParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
@@ -2164,24 +2157,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             mxup.setSjcjwd(orderBase.getLng().substring(0,12));
         }
         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 setSyParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
@@ -2299,15 +2274,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         if (StringUtils.isEmpty(websitSH.getWdId())){
             websitSH = publicService.ptxswdToshxswd(lcls.getXsdwno(), 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());
-        }
     }