yaozhixue 2 years ago
parent
commit
782930c833

BIN
1690723330350026754.jpeg


+ 0 - 2
src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusinessApi.java

@@ -49,8 +49,6 @@ public class RepairBusinessApi {
     // 1:工单落入本地表 TL_SynDataFrom_tbl_assign_batch
     @Scheduled(fixedDelayString = "${repairin}")
     public void inputOrder() {
-
-
         if (repairinc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }

+ 6 - 4
src/main/java/com/zfire/jiasm/syncdata/service/impl/AddRepairBusinessServiceImpl.java

@@ -398,7 +398,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         // log.info("respone:{}", JSONObject.toJSONString(respone));
         if (respone.getCode()==200){
             // 同步更新状态
-            synStatus(item, addmx, ups, pjups, orderAppeal, oanew, faGreeSms, oilist, ydups, fkmxups, orols, us, order);
+            synStatus(item, ups, pjups, orderAppeal, oanew, faGreeSms, oilist, ydups, fkmxups, orols, us, order);
             return Boolean.TRUE;
         } else {
             String msg = publicService.getErrormessage(respone);
@@ -417,7 +417,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
 
 
-    private void synStatus(ItfTblAssignDownload item, List<OrderProduct> addmx, List<ItfTblAssignMxDownload> ups,
+    private void synStatus(ItfTblAssignDownload item, List<ItfTblAssignMxDownload> ups,
                            List<ItfTblAssignSatisfactionDownload> pjups, List<OrderAppeal> orderAppeal,
                            List<OrderAppraise> oanew, List<FaGreeSms> faGreeSms, List<OrderInformation> oilist,
                            List<ItfTblAssignXzydDownload> ydups, List<ItfTblAssignFkmxDownload> fkmxups,List<OrderRepairOperatingLog> orols,
@@ -426,9 +426,12 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         upItfTblAssignDownloadStatus(item, order);
 
         // 处理维修单明细表
-        if (addmx.size()>0){
+        /*if (addmx.size()>0){
             orderProductService.saveBatch(addmx);
             addmx.clear();
+        }*/
+
+        if (ups.size()>0){
             itfTblAssignMxDownloadService.updateBatchById(ups);
             ups.clear();
         }
@@ -2081,7 +2084,6 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
     private void generateFkmxApi(ItfTblAssignDownload item, List<ItfTblAssignFkmxDownload> fkmxups,
                                  List<OrderRepairOperatingLog> orols, OrderBase order) {
         List<ItfTblAssignFkmxDownload> fkmxRec = new ArrayList<>();
-        List<ItfTblAssignFkmxDownload> ups = new ArrayList<>();
 
         fkmxRec = itfTblAssignFkmxDownloadService.lambdaQuery()
                 .eq(ItfTblAssignFkmxDownload::getDownloadTaskNo, item.getDownloadTaskNo())

+ 1 - 1
src/main/resources/bootstrap-dev.properties

@@ -291,7 +291,7 @@ installdownc=FALSE
 installinc=FALSE
 #维修工单下载、入本地表
 repairdownc=FALSE
-repairinc=FALSE
+repairinc=TRUE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE

+ 1 - 1
src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=test
+spring.profiles.active=dev
 spring.application.name=jiasm-syncdata
 spring.main.allow-bean-definition-overriding=true
 # 修改线程池的拒绝策略