From 0a2c2fb96c07689be0fb3ba03ec61d36da594aac 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 16:02:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/frJob/RecordToQueryService.java   |  9 +---
 .../frJob/RecordToQueryServiceImpl.java       | 44 ++++---------------
 2 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryService.java b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryService.java
index 34b82f79..e801fc44 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryService.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryService.java
@@ -5,13 +5,6 @@ import com.dxhy.core.entity.frJob.VoucherRecordQuery;
 
 public interface RecordToQueryService extends IService<VoucherRecordQuery>{
 
-    void insertJxDataToQuery();
-
-    void insertXxDataToQuery();
-
-    void insertZyDataToQuery();
-
-    void insertOutDataToQuery();
-
     void getDataForFr();
+
 }
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 ece41196..3d7a69bd 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
@@ -40,41 +40,16 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
     @Override
     public void getDataForFr() {
         //清洗sap错误税率
-        voucherRecordItemService.refreshTax();
-        //开始插入进项科目数据
-        //1.获取时间
-        String[] time = getTime(JXZZS);
-        //2.查询数据
-        List<VoucherRecordQuery> voucherRecordQuerys =
-                recordToQueryDao.getDataFromRecordItems(time[0], time[1],JXZZS);
-
-        if (voucherRecordQuerys != null && voucherRecordQuerys.size() > 0){
-            //3.查询税率
-            Map<String, String> taxMap = KjkmTaxEnmu.getTaxMap();
-            //4.清洗税率
-            voucherRecordQuerys.forEach(v->{v.setSl(taxMap.get(v.getKjkmbh()));});
-
-            //5.报账单号去重
-            List<String> bzdhs
-                    = voucherRecordQuerys.stream().map(VoucherRecordQuery::getBzdh)
-                    .distinct().collect(Collectors.toList());
-
-            //6.根据报账单号获取发票税额
-            List<FpTaxAmount> taxAmounts = recordToQueryDao.getTaxAmount(bzdhs);
-            if (taxAmounts != null && taxAmounts.size()>0){
-                Map<String, String> amountMap = taxAmounts.stream().collect(Collectors.toMap(FpTaxAmount::getKey, FpTaxAmount::getFpse));
-                //7.添加税率
-                voucherRecordQuerys.forEach(v->v.setFpse(amountMap.get(v.getSl()+v.getBzdh())==null?"0":amountMap.get(v.getSl()+v.getBzdh())));
-            }
-            //8.保存或更新
-            this.saveOrUpdateBatch(voucherRecordQuerys);
-
+        boolean b = voucherRecordItemService.refreshTax();
+        if (!b){
+            throw new RuntimeException("刷新sap传送数据税率失败");
         }
 
+
     }
-    @Override
-    public void insertJxDataToQuery() {
+    public boolean insertJxDataToQuery() {
 
+        boolean flag = false;
         //1.获取时间
         String[] time = getTime(JXZZS);
 
@@ -101,12 +76,12 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
                 voucherRecordQuerys.forEach(v->v.setFpse(amountMap.get(v.getSl()+v.getBzdh())==null?"0":amountMap.get(v.getSl()+v.getBzdh())));
             }
             //8.保存或更新
-            boolean b = this.saveOrUpdateBatch(voucherRecordQuerys);
+            flag = this.saveOrUpdateBatch(voucherRecordQuerys);
 
         }
+        return flag;
     }
 
-    @Override
     public void insertXxDataToQuery() {
         //1.获取时间
         String[] time = getTime(XXZZS);
@@ -142,7 +117,6 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
         }
     }
 
-    @Override
     public void insertZyDataToQuery() {
         //1.获取时间
         String[] time = getTime(ZYYWSR);
@@ -172,7 +146,7 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
         }
     }
 
-    @Override
+
     public void insertOutDataToQuery() {
         //获取时间
         String[] time = this.getTime(JXSZC);