From 2754c94849593ad64294dc8da20f806f11e7d983 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 15:10:54 +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/QueryDetailDataService.java | 2 + .../frJob/QueryDetailDataServiceImpl.java | 3 +- .../frJob/RecordToQueryServiceImpl.java | 34 ++++++++- .../frJob/VoucherRecordItemService.java | 2 +- .../frJob/VoucherRecordItemServiceImpl.java | 76 +++++++------------ 5 files changed, 64 insertions(+), 53 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataService.java b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataService.java index 42891ecc..61a5c9b1 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataService.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataService.java @@ -16,4 +16,6 @@ public interface QueryDetailDataService extends IService voucherRecordQuerys = + recordToQueryDao.getDataFromRecordItems(time[0], time[1],JXZZS); + + if (voucherRecordQuerys != null && voucherRecordQuerys.size() > 0){ + //3.查询税率 + Map taxMap = KjkmTaxEnmu.getTaxMap(); + //4.清洗税率 + voucherRecordQuerys.forEach(v->{v.setSl(taxMap.get(v.getKjkmbh()));}); + + //5.报账单号去重 + List bzdhs + = voucherRecordQuerys.stream().map(VoucherRecordQuery::getBzdh) + .distinct().collect(Collectors.toList()); + + //6.根据报账单号获取发票税额 + List taxAmounts = recordToQueryDao.getTaxAmount(bzdhs); + if (taxAmounts != null && taxAmounts.size()>0){ + Map 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); + + } } @Override @@ -75,7 +101,7 @@ public class RecordToQueryServiceImpl extends ServiceImplv.setFpse(amountMap.get(v.getSl()+v.getBzdh())==null?"0":amountMap.get(v.getSl()+v.getBzdh()))); } //8.保存或更新 - this.saveOrUpdateBatch(voucherRecordQuerys); + boolean b = this.saveOrUpdateBatch(voucherRecordQuerys); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemService.java b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemService.java index a28c277f..01bcdeb9 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemService.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemService.java @@ -4,5 +4,5 @@ import java.text.ParseException; public interface VoucherRecordItemService { - void refreshTax(); + boolean refreshTax(); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java index 6c9548c0..9a3d1390 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java @@ -1,14 +1,12 @@ package com.dxhy.core.service.frJob; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dxhy.core.dao.frTask.QueryDetailDataDao; import com.dxhy.core.dao.frTask.VoucherRecordItemDao; import com.dxhy.core.enmu.KjkmTaxEnmu; import com.dxhy.core.entity.frJob.VoucherRecordItemEntity; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.text.ParseException; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -16,60 +14,44 @@ import java.util.List; import java.util.Map; @Service("voucherRecordItemService") +@Slf4j public class VoucherRecordItemServiceImpl extends ServiceImpl implements VoucherRecordItemService { - @Autowired + @Resource private VoucherRecordItemDao voucherRecordItemDao; - @Autowired - private QueryDetailDataDao queryDetailDataDao; - + @Resource + private QueryDetailDataService queryDetailDataService; private static final String JXZZS = "22210101"; private static final String XXZZS = "22210102"; @Override - public void refreshTax(){ - String[] jxTime = getTime(JXZZS); - //查询进项数据 - List jxVoucherRecordItems = voucherRecordItemDao.getByTime(jxTime[0], jxTime[1], JXZZS); - //税率枚举 - Map taxMap = KjkmTaxEnmu.getTaxMap(); - if (jxVoucherRecordItems != null && jxVoucherRecordItems.size() != 0){ - jxVoucherRecordItems.stream().forEach(e->e.setKbetr(taxMap.get(e.getRacct()))); - this.updateBatchById(jxVoucherRecordItems); - } - String[] xxTime = getTime(XXZZS); - //查询销项数据 - List xxVoucherRecordItems = voucherRecordItemDao.getByTime(xxTime[0], xxTime[1], XXZZS); - if (xxVoucherRecordItems != null && xxVoucherRecordItems.size() != 0){ - xxVoucherRecordItems.stream().forEach(e->e.setKbetr(taxMap.get(e.getRacct()))); - this.updateBatchById(xxVoucherRecordItems); - } - - } - - String[] getTime(String km){ - //1.获取增量数据开始时间 - Date beginTime = queryDetailDataDao.getBeginTime(km); - //2.第一次取原表时间 - if (beginTime == null){ - beginTime = queryDetailDataDao.getBeginTimefromRecord(); + public boolean refreshTax(){ + try { + String[] jxTime = queryDetailDataService.getTime(JXZZS); + //查询进项数据 + List jxVoucherRecordItems = voucherRecordItemDao.getByTime(jxTime[0], jxTime[1], JXZZS); + //税率枚举 + Map taxMap = KjkmTaxEnmu.getTaxMap(); + if (jxVoucherRecordItems != null && jxVoucherRecordItems.size() != 0){ + jxVoucherRecordItems.stream().forEach(e->e.setKbetr(taxMap.get(e.getRacct()))); + this.updateBatchById(jxVoucherRecordItems); + } + String[] xxTime = queryDetailDataService.getTime(XXZZS); + //查询销项数据 + List xxVoucherRecordItems = voucherRecordItemDao.getByTime(xxTime[0], xxTime[1], XXZZS); + if (xxVoucherRecordItems != null && xxVoucherRecordItems.size() != 0){ + xxVoucherRecordItems.stream().forEach(e->e.setKbetr(taxMap.get(e.getRacct()))); + this.updateBatchById(xxVoucherRecordItems); + } + }catch (Exception e){ + e.printStackTrace(); + log.error("税率刷新时错误信息为{}",e.getMessage()); + return false; } - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - //3.时间转换求结束日期 - Calendar calendar = Calendar.getInstance(); - calendar.setTime(beginTime); - calendar.add(Calendar.DAY_OF_MONTH,-1); - //4.开始时间减一天 - String begin = format.format(calendar.getTime()); - //5.结束时间为现在加一天 - calendar.setTime(new Date()); - calendar.add(Calendar.DAY_OF_MONTH,1); - String end = format.format(calendar.getTime()); - String[] time = {begin,end}; - return time; + return true; } }