From cda5ded993e1d735cbe8fa76f6f988e89024afe0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 24 七月 2024 15:59:07 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 67 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 8 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index 559ef72..15aa554 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -276,17 +276,33 @@
if (CollectionUtils.isEmpty(serviceFunddetails)) {
throw new BaseException("绠楃◣鏉′欢涓虹┖锛岃妫�鏌ュ悗锛屽啀杩涜璁＄畻");
}
+ // 鐢ㄤ簬涓存椂淇濆瓨宸茬粡绠楀ソ鐨�"璐圭敤璇︽儏鏁版嵁"
+ List<ServiceFunddetail> temporarySave = new ArrayList<>();
+ // 鐢ㄤ簬璁板綍搴忓彿
+ Map<String, Long> xhMap = new HashMap<>();
+
+ // 鍏堝serviceFunddetails鎺掑簭
+ Comparator<ServiceFunddetail> customComparator = Comparator.comparing(obj -> {
+ if (ObjectUtils.isEmpty(obj.getTaxTime())) {
+ return 1; // 杩斿洖1琛ㄧず瀛楁涓虹┖鐨勫璞℃帓鍦ㄥ悗闈�
+ } else {
+ return 0; // 杩斿洖0琛ㄧず瀛楁涓嶄负绌虹殑瀵硅薄淇濇寔鍘熼『搴�
+ }
+ });
+ Collections.sort(serviceFunddetails, customComparator);
+
//杩欎釜鏄负浜嗚幏鍙杅und_tax_time
Long fundid = serviceFunddetails.get(0).getFundid();
log.info("绠楃◣鐨刦undid鐨勫�间负锛歿}", fundid);
ServiceFund serviceFund1 = serviceFundMapper.selectById(fundid);
log.info("fund琛ㄧ殑fundtextime鍊间负锛歿}", serviceFund1.getFundtaxtime());
-
- //鐢ㄤ簬涓存椂淇濆瓨宸茬粡绠楀ソ鐨�"璐圭敤璇︽儏鏁版嵁"
- List<ServiceFunddetail> temporarySave = new ArrayList<>();
//淇濆瓨鎬荤◣鍓嶉噾棰濓紙鐢ㄤ簬鏇存柊fund琛ㄩ噷鐨勶級
BigDecimal pretaxcost = BigDecimal.valueOf(0.00);
+ BigDecimal taxedcost = BigDecimal.valueOf(0.00);
for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
+ if (serviceFunddetail.getBeneficiaryname().equals("鍚村悍鏉�")) {
+ System.out.println(serviceFunddetail);
+ }
if (StringUtils.isEmpty(serviceFunddetail.getIdcardno())) {
logger.info("serviceFunddetail鏁版嵁鍏ュ弬 锛� {}", serviceFunddetail);
//濡傛灉韬唤璇佸彿涓虹┖锛屽氨涓嶇敤鏌ヤ簡锛屽彲鑳芥槸鍖婚櫌鐨勮褰�
@@ -297,6 +313,7 @@
}
//鍏徃鐨勭敵璇烽噾棰濅篃瑕佸姞杩涘幓
pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail.getAmount()));
+ taxedcost = taxedcost.add(BigDecimal.valueOf(serviceFunddetail.getTaxedamount()));
serviceFunddetail.setTaxamount(0.0);
logger.info("serviceFunddetail鏇存柊鍚庣殑鏁版嵁 锛� {}", serviceFunddetail);
@@ -307,8 +324,24 @@
//鑾峰彇褰撴湀鐨勭涓�澶�
Date firstDay = Date.from(LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).atStartOfDay(ZoneId.systemDefault()).toInstant());
-// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// String firstDatStr = dateFormat.format(firstDay);
+ //鑾峰彇鍒板綋鍓嶄汉鐨勬湰鏈堢畻绋庡簭鍙锋渶澶у��
+ TaxMoneyByItemEO taxMoneyByItemEO = new TaxMoneyByItemEO();
+ taxMoneyByItemEO.setFirstDay(firstDay);
+ taxMoneyByItemEO.setIDCard(serviceFunddetail.getIdcardno());
+ taxMoneyByItemEO.setTaxTime(new Date());
+ //鏍规嵁鏉′欢鑾峰彇琛ㄤ腑璇ユ潯鏁版嵁鐨勨�濆簭鍙封�滄渶澶у��
+ Long maxXH = serviceFunddetailMapper.getMaxXH(taxMoneyByItemEO);
+ if (maxXH == null) {
+ maxXH = 1L;
+ } else {
+ maxXH = maxXH + 1;
+ }
+ //搴忓彿Map涓庢暟鎹簱琛ㄩ噷鐨剎h鍚屾椂涓嶄负绌猴紝閭ｅ氨浠ap閲岀殑涓哄噯
+ if (ObjectUtils.isNotEmpty(xhMap)) {
+ Long xhValue = xhMap.get(serviceFunddetail.getIdcardno());
+ if (xhValue != null) maxXH = xhValue + 1;
+ }
+
TaxMoneyByItemEO taxMoneyVO = new TaxMoneyByItemEO();
if (serviceFund1.getFundtaxtime() != null) {
taxMoneyVO.setTaxTime(serviceFund1.getFundtaxtime());
@@ -318,6 +351,12 @@
taxMoneyVO.setFirstDay(firstDay);
taxMoneyVO.setFundID(serviceFunddetail.getFundid());
taxMoneyVO.setIDCard(serviceFunddetail.getIdcardno());
+ if (serviceFunddetail.getXh() != null) {
+ taxMoneyVO.setXh(serviceFunddetail.getXh());
+ } else {
+ taxMoneyVO.setXh(maxXH);
+ xhMap.put(serviceFunddetail.getIdcardno(), maxXH);
+ }
//鏌ュ嚭绋庡墠銆佺◣銆佺◣鍚庣殑鎬婚锛堜笉鍖呭惈鏈锛�
TaxMoneySumEO taxSum = serviceFunddetailMapper.getTaxSum(taxMoneyVO);
logger.info("鏌ヨ鐨則axSum鐨勫�� 锛� {}", taxSum);
@@ -342,6 +381,9 @@
}
continue;
}
+ }
+ if (serviceFunddetail.getXh() == null) {
+ serviceFunddetail.setXh(maxXH);
}
if (StringUtils.isEmpty(serviceFunddetail.getServicesscopename()) || !serviceFunddetail.getServicesscopename().contains("绋庡悗")) {
@@ -371,9 +413,11 @@
logger.info("鎵撳嵃绋庡墠serviceFunddetail3鏁版嵁 :{}", serviceFunddetail3);
// 灏嗚鏉℃暟鎹洿鏂�
+
boolean b = this.updateById(serviceFunddetail3);
pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail.getAmount()));
- // 鎶婅鏁版嵁锛屾斁鍒颁复鏃剁殑闆嗗悎涓�
+ taxedcost = taxedcost.add(BigDecimal.valueOf(serviceFunddetail.getTaxedamount()));
+// // 鎶婅鏁版嵁锛屾斁鍒颁复鏃剁殑闆嗗悎涓�
temporarySave.add(serviceFunddetail3);
} else if (serviceFunddetail.getServicesscopename().contains("绋庡悗")) {
logger.info("璁＄畻绋庡悗淇℃伅寮�濮嬶細{}", serviceFunddetail);
@@ -400,15 +444,22 @@
serviceFunddetail3.setTaxTime(serviceFund1.getFundtaxtime());
}
logger.info("鎵撳嵃serviceFunddetail3:{}", serviceFunddetail3);
+ //鑾峰彇鍒板綋鍓嶄汉鐨勬湰鏈堢畻绋庡簭鍙锋渶澶у��
+ TaxMoneyByItemEO byItemEO = new TaxMoneyByItemEO();
+ byItemEO.setFirstDay(firstDay);
+ byItemEO.setIDCard(serviceFunddetail.getIdcardno());
+ byItemEO.setTaxTime(new Date());
// 灏嗚鏉℃暟鎹洿鏂�
updateById(serviceFunddetail3);
pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail3.getAmount()));
- // 鎶婅鏁版嵁锛屾斁鍒颁复鏃剁殑闆嗗悎涓�
+ taxedcost = taxedcost.add(BigDecimal.valueOf(serviceFunddetail3.getTaxedamount()));
+// // 鎶婅鏁版嵁锛屾斁鍒颁复鏃剁殑闆嗗悎涓�
temporarySave.add(serviceFunddetail3);
}
}
ServiceFund serviceFund = new ServiceFund();
serviceFund.setPretaxcost(pretaxcost.doubleValue());
+ serviceFund.setTaxedcost(taxedcost.doubleValue());
serviceFund.setId(serviceFunddetails.get(0).getFundid());
if (ObjectUtils.isEmpty(serviceFund1.getFundtaxtime())) {
serviceFund.setFundtaxtime(new Date());
@@ -480,6 +531,6 @@
@Override
public List<SpStatBonus> getListBySpStatBonus(SpStatBonusReq spStatBonusReq) {
- return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPauserno(), spStatBonusReq.getPabonustype());
+ return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPausername(), spStatBonusReq.getPabonustype());
}
}
--
Gitblit v1.9.3