add

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

@@ -88,24 +88,24 @@ public class InstallBusinessApi {
 
         log.info("安装工单落本地表开始处理: \uF0B7{}",sdf.format(new Date()));
 
-        lclslist = lcls.stream().map(ItfTblAzAssignLcLsDownload::getPgguid).collect(Collectors.toList());
+        /* lclslist = lcls.stream().map(ItfTblAzAssignLcLsDownload::getPgguid).collect(Collectors.toList());
         // 提取已有的订单数据
         orderBasesRecs = orderBaseService.lambdaQuery()
                 .select(OrderBase::getPgguid)
                 .in(OrderBase::getPgguid,lclslist).list();
-        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgguid).collect(Collectors.toList());
+        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgguid).collect(Collectors.toList());*/
 
         // 按任务号download_task_no，按单来处理
         for (ItfTblAzAssignLcLsDownload item: lcls) {
+            OrderBase oldorder = orderBaseService.lambdaQuery()
+                    .eq(OrderBase::getPgguid,item.getPgguid()).last("limit 1").one();
             try{
-                if (orderBaselist.contains(item.getPgguid())){
+                if (oldorder !=null){
                     // 修改 TL_SynDataFrom_tbl_az_assign_lc_ls_batch
                     addInstallBusiness.updateOrderApi(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item,Boolean.FALSE);
                 } else {
                     // 新增 TL_SynDataFrom_tbl_az_assign_lc_ls_batch
-                    if (addInstallBusiness.addOrderApi(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item,Boolean.TRUE)){
-                        orderBaselist.add(item.getPgguid());
-                    }
+                    addInstallBusiness.addOrderApi(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item,Boolean.TRUE);
                 }
             } catch (Exception ex) {
                 ex.printStackTrace();

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

@@ -88,24 +88,24 @@ public class InstallBusinessApiT {
 
         log.info("安装工单落本地表开始处理: \uF0B7{}",sdf.format(new Date()));
 
-        lclslist = lcls.stream().map(ItfTblAzAssignLcLsDownload::getPgguid).collect(Collectors.toList());
+        /*lclslist = lcls.stream().map(ItfTblAzAssignLcLsDownload::getPgguid).collect(Collectors.toList());
         // 提取已有的订单数据
         orderBasesRecs = orderBaseService.lambdaQuery()
                 .select(OrderBase::getPgguid)
                 .in(OrderBase::getPgguid,lclslist).list();
-        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgguid).collect(Collectors.toList());
+        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgguid).collect(Collectors.toList());*/
 
         // 按任务号download_task_no，按单来处理
         for (ItfTblAzAssignLcLsDownload item: lcls) {
+            OrderBase oldorder = orderBaseService.lambdaQuery()
+                    .eq(OrderBase::getPgguid,item.getPgguid()).last("limit 1").one();
             try{
-                if (orderBaselist.contains(item.getPgguid())){
+                if (oldorder !=null){
                     // 修改 TL_SynDataFrom_tbl_az_assign_lc_ls_batch
                     addInstallBusiness.updateOrderApi(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item,Boolean.FALSE);
                 } else {
                     // 新增 TL_SynDataFrom_tbl_az_assign_lc_ls_batch
-                    if (addInstallBusiness.addOrderApi(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item,Boolean.TRUE)){
-                        orderBaselist.add(item.getPgguid());
-                    }
+                    addInstallBusiness.addOrderApi(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item,Boolean.TRUE);
                 }
             } catch (Exception ex) {
                 ex.printStackTrace();

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

@@ -91,29 +91,29 @@ public class RepairBusinessApi {
             return;
         }
 
-        pgids = repairRec.stream().map(ItfTblAssignDownload::getPgid).collect(Collectors.toList());
+        /*pgids = repairRec.stream().map(ItfTblAssignDownload::getPgid).collect(Collectors.toList());
 
         // 提取已有的订单数据
         orderBasesRecs = orderBaseService.lambdaQuery()
                 .select(OrderBase::getPgid)
                 .in(OrderBase::getPgid,pgids).list();
-        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgid).collect(Collectors.toList());
+        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgid).collect(Collectors.toList());*/
 
         log.info("维修工单落本地表开始处理: \uF0B7{}",sdf.format(new Date()));
 
         // 按任务号download_task_no，按单来处理
         for (ItfTblAssignDownload item: repairRec){
+            OrderBase oldorder = orderBaseService.lambdaQuery()
+                    .eq(OrderBase::getPgid,item.getPgid()).last("limit 1").one();
             try{
-                if (orderBaselist.contains(String.valueOf(item.getPgid()))){
+                if (oldorder !=null){
                     // 修改
                     addRepairBusinessService.updateRepairOrderApi(brand, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, item,
                             sysDictRefDLMapXq, sysDictRefXLMapXq,Boolean.FALSE);
                 } else {
                     // 新增 TL_SynDataFrom_tbl_assign_batch
-                    if (addRepairBusinessService.addRapairOrderApi(brand, item, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap,
-                            sysDictRefDLMapXq, sysDictRefXLMapXq,Boolean.TRUE)){
-                        orderBaselist.add(String.valueOf(item.getPgid()));
-                    }
+                    addRepairBusinessService.addRapairOrderApi(brand, item, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap,
+                            sysDictRefDLMapXq, sysDictRefXLMapXq,Boolean.TRUE);
                 }
             }catch (Exception ex) {
                 ex.printStackTrace();

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

@@ -91,29 +91,29 @@ public class RepairBusinessApiT {
             return;
         }
 
-        pgids = repairRec.stream().map(ItfTblAssignDownload::getPgid).collect(Collectors.toList());
+        /*pgids = repairRec.stream().map(ItfTblAssignDownload::getPgid).collect(Collectors.toList());
 
         // 提取已有的订单数据
         orderBasesRecs = orderBaseService.lambdaQuery()
                 .select(OrderBase::getPgid)
                 .in(OrderBase::getPgid,pgids).list();
-        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgid).collect(Collectors.toList());
+        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgid).collect(Collectors.toList());*/
 
         log.info("维修工单落本地表开始处理: \uF0B7{}",sdf.format(new Date()));
 
         // 按任务号download_task_no，按单来处理
         for (ItfTblAssignDownload item: repairRec){
+            OrderBase oldorder = orderBaseService.lambdaQuery()
+                    .eq(OrderBase::getPgid,item.getPgid()).last("limit 1").one();
             try{
-                if (orderBaselist.contains(String.valueOf(item.getPgid()))){
+                if (oldorder !=null){
                     // 修改
                     addRepairBusinessService.updateRepairOrderApi(brand, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, item,
                             sysDictRefDLMapXq, sysDictRefXLMapXq,Boolean.FALSE);
                 } else {
                     // 新增 TL_SynDataFrom_tbl_assign_batch
-                    if (addRepairBusinessService.addRapairOrderApi(brand, item, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap,
-                            sysDictRefDLMapXq, sysDictRefXLMapXq,Boolean.TRUE)){
-                        orderBaselist.add(String.valueOf(item.getPgid()));
-                    }
+                    addRepairBusinessService.addRapairOrderApi(brand, item, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap,
+                            sysDictRefDLMapXq, sysDictRefXLMapXq,Boolean.TRUE);
                 }
             }catch (Exception ex) {
                 ex.printStackTrace();

src/main/resources/bootstrap-dev.properties

@@ -405,7 +405,7 @@ hsgdcjtmc=FALSE
 datauploadc=FALSE
 #安装、维修工单入本地表
 installinc=FALSE
-repairinc=TRUE
+repairinc=FALSE
 #完工评价短信格力总部发送，自建工单联通发送，查看评价短信回复信息，自建完工评价短信联通发送，派服务人员格力发送
 wgmsgsendc=FALSE
 zjgdmsgsendc=FALSE