yaozhixue hai 1 ano
pai
achega
4f3b2161e0

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

@@ -65,11 +65,11 @@ public class InstallDownloadServiceImpl implements InstallDownloadService {
         String downloadBatchNo = UUID.randomUUID().toString();
         // 按批次-获取数据
         JSONArray datas = getDownloadData(downloadBatchNo, ESInstallEnum.SALES_WEBSIT_NUMBER.getCode());
-        log.info("安装工单下载了{}条数据",datas.size());
 
         // 写销售单号-派工单号 方便日志查询
         if (datas.size()>0){
             putLogInfo(datas);
+            log.info("安装工单下载了{}条数据",datas.size());
         }
 
         try{

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

@@ -88,6 +88,10 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
             id = data.getId();
             datas = data.getData();
 
+            if (datas ==null){
+                return;
+            }
+
             log.info("从工单系统获取维修工单下载了{}条数据",datas.size());
 
             for (int i = 0; i < datas.size(); i++) {
@@ -162,6 +166,10 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
             id = data.getId();
             datas = data.getData();
 
+            if (datas ==null){
+                return;
+            }
+
             log.info("从工单系统获取安装工单下载了{}条数据",datas.size());
 
             try{
@@ -311,7 +319,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
         // 查看同一时间同一工单是否存在下载记录表 存在不再保存本次的同步数据
         if (insertInstallRecData(mainTableData.getJSONObject(0), downloadBatchNo, downloadTaskNo, salesWebsitNumber,id)) {
             parseInstallData(sheet, srcTabnameArray, srcTabColListArray, destTabNameArray, destTabColListArray, downloadTaskNo,
-                    false, downloadBatchNo);
+                    true, downloadBatchNo);
         }
     }
 

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

@@ -88,7 +88,9 @@ public class RepairDownloadServiceImpl implements RepairDownloadService {
             // 获取数据
             JSONArray datas = downloadData(downloadBatchNo, salesWebsitNumber);
 
-            log.info("维修工单下载了{}条数据",datas.size());
+            if (datas !=null){
+                log.info("维修工单下载了{}条数据",datas.size());
+            }
 
             for (int i = 0; i < datas.size(); i++) {
                 JSONObject sheet = datas.getJSONObject(i);