yaozhixue hace 1 año
padre
commit
3d0fd78f44

+ 3 - 3
src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusinessApi.java

@@ -85,9 +85,9 @@ public class InstallBusinessApi {
                 .orderByAsc(ItfTblAzAssignLcLsDownload::getSynReqId)
                 .list();
 
-        /*// 测试使用
-        lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
-                .eq(ItfTblAzAssignLcLsDownload::getSynReqId,224381L)
+        // 测试使用
+        /*lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignLcLsDownload::getSynReqId,225717L)
                 .list();*/
 
         if (lcls.size()<1){

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

@@ -1691,7 +1691,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
     private void revertFun(OrderBase old, ItfTblAzAssignLcLsDownload item, OrderBase upInfo) {
         // 提取网点师傅ID
-        WebsitWorker ww = publicService.getOrderWebsitWorker(old.getWorkerId(),old.getWebsitId());
+        WebsitWorker ww = publicService.getOrderWebsitWorker(upInfo.getWorkerId(),upInfo.getWebsitId());
         if (ww !=null ){
             upInfo.setWorkerId(ww.getWebsitWorkerId());
         }

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

@@ -1876,7 +1876,7 @@ public class PublicServiceImpl implements PublicService {
         // 提取现有数据
         List<Product> oldSysProduct = productService.lambdaQuery()
                 .eq(Product::getProductBrandId, brand.getBrandId()).list();
-        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(oldSysProduct)){
+        if (CollectionUtils.isNotEmpty(oldSysProduct)){
             oldSysProduct.stream().forEach(event->{
                 if (StringUtils.isNotEmpty(event.getJxid())){
                     productMap.put(event.getJxid(), event.getProductId());

+ 2 - 2
src/main/resources/bootstrap-prdt.properties

@@ -337,7 +337,7 @@ fsswxgc=FALSE
 gzxwxgc=FALSE
 gzswxgc=FALSE
 gfwwwc=FALSE
-createworkerc=TRUE
+createworkerc=FALSE
 #类别大类、小类、系列、机型
 lbdlc=FALSE
 lbxlc=FALSE
@@ -414,7 +414,7 @@ hsgdcjtmc=FALSE
 #工单数据向上同步
 datauploadc=FALSE
 #安装、维修工单入本地表
-installinc=FALSE
+installinc=TRUE
 repairinc=FALSE
 smsinselfc=FALSE
 #完工评价短信格力总部发送,自建工单联通发送,查看评价短信回复信息,自建完工评价短信联通发送,派服务人员格力发送