From 83431c821c7c28dc45edbb7ef9ac397b190b824f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Thu, 14 Sep 2023 18:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frJob/RecordToQueryServiceImpl.java       | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java
index 3d7a69bd..abbdaec4 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java
@@ -6,6 +6,7 @@ import com.dxhy.core.dao.frTask.RecordToQueryDao;
 import com.dxhy.core.enmu.KjkmTaxEnmu;
 import com.dxhy.core.entity.frJob.FpTaxAmount;
 import com.dxhy.core.entity.frJob.VoucherRecordQuery;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -40,13 +41,27 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
     @Override
     public void getDataForFr() {
         //清洗sap错误税率
-        boolean b = voucherRecordItemService.refreshTax();
-        if (!b){
+        boolean flag = voucherRecordItemService.refreshTax();
+        if (!flag){
             throw new RuntimeException("刷新sap传送数据税率失败");
         }
-
+        //开始插入主数据信息
+        boolean flag1 = this.insertJxDataToQuery();
+        if (flag1){
+            queryDetailDataService.insertJxDataToQueryDetail();
+        }
+        boolean flag2 = this.insertXxDataToQuery();
+        if (flag2){
+            queryDetailDataService.insertJxDataToQueryDetail();
+        }
+        boolean flag3 = this.insertZyDataToQuery();
+        if (flag3){
+            queryDetailDataService.insertZyDataToQueryDetail();
+        }
+        this.insertOutDataToQuery();
 
     }
+    @Async
     public boolean insertJxDataToQuery() {
 
         boolean flag = false;
@@ -82,7 +97,9 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
         return flag;
     }
 
-    public void insertXxDataToQuery() {
+    @Async
+    public boolean insertXxDataToQuery() {
+        boolean flag = false;
         //1.获取时间
         String[] time = getTime(XXZZS);
 
@@ -113,11 +130,14 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
             }
 
             //8.保存或更新
-            this.saveOrUpdateBatch(voucherRecordQuerys);
+            flag = this.saveOrUpdateBatch(voucherRecordQuerys);
         }
+        return flag;
     }
 
-    public void insertZyDataToQuery() {
+    @Async
+    public boolean insertZyDataToQuery() {
+        boolean flag = false;
         //1.获取时间
         String[] time = getTime(ZYYWSR);
 
@@ -142,8 +162,9 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
             }
 
             //6.保存或更新
-            this.saveOrUpdateBatch(voucherRecordQuerys);
+            flag = this.saveOrUpdateBatch(voucherRecordQuerys);
         }
+        return flag;
     }