From 3326b8c5a5b9a2133729e4cce8298cb549995f45 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 六月 2025 16:33:10 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 14 +++++++++-----
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java | 6 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java | 7 +++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 9 ++++++---
4 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
index 99ce37a..f12073d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
@@ -198,6 +198,13 @@
/**
* 棰勬敮閲戦
*/
+ @ApiModelProperty("绋庡墠鎬婚噾棰�")
+ @Excel(name = "绋庡墠鎬婚噾棰�")
+ private Double allAmount;
+
+ /**
+ * 棰勬敮閲戦
+ */
@ApiModelProperty("棰勬敮閲戦")
@Excel(name = "棰勬敮閲戦")
private Double prepaidamount;
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 9f7531c..0f5631a 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
@@ -1,6 +1,7 @@
package com.ruoyi.project.service.impl;
import java.math.BigDecimal;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
@@ -349,11 +350,10 @@
taxMoneyVO.setTaxTime(new Date());
}
taxMoneyVO.setFirstDay(firstDay);
+ // 鑾峰彇璇ヨ韩浠借瘉鍙峰湪鏈湀鐨勬墍鏈夎褰�
taxMoneyVO.setFundID(serviceFunddetail.getFundid());
taxMoneyVO.setIDCard(serviceFunddetail.getIdcardno());
if (serviceFunddetail.getXh() != null) {
-// taxMoneyVO.setXh(serviceFunddetail.getXh());
- //杩欎釜搴忓彿锛屾湁鍙兘鏄箣鍓嶇増绋庣殑搴忓彿锛屽湪杩欓噷涓嶈兘鍐嶇敤浜�
serviceFunddetail.setXh(null);
taxMoneyVO.setXh(maxXH);
xhMap.put(serviceFunddetail.getIdcardno(), maxXH);
@@ -362,6 +362,7 @@
xhMap.put(serviceFunddetail.getIdcardno(), maxXH);
}
//鏌ュ嚭绋庡墠銆佺◣銆佺◣鍚庣殑鎬婚锛堜笉鍖呭惈鏈锛�
+ logger.info("taxMoneyVO鍏ュ弬鐨勫�� 锛� {}", taxMoneyVO);
TaxMoneySumEO taxSum = serviceFunddetailMapper.getTaxSum(taxMoneyVO);
logger.info("鏌ヨ鐨則axSum鐨勫�� 锛� {}", taxSum);
if (ObjectUtils.isEmpty(taxSum)) {
@@ -383,9 +384,11 @@
taxSum.setTaxAmounts(taxAmounts.doubleValue());
taxSum.setTaxedAmounts(TaxedAmounts.doubleValue());
}
- continue;
}
}
+ //璁板綍涓�涓嬭繖涓◣鍓嶆�婚
+ serviceFunddetail.setAllAmount(taxSum.getAmounts());
+
if (serviceFunddetail.getXh() == null) {
serviceFunddetail.setXh(maxXH);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
index 5e51ccc..cbc1d52 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
@@ -15,10 +15,12 @@
import com.ruoyi.project.service.IServiceFunddetailService;
import com.ruoyi.project.service.IServiceFundtaxService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Comparator;
import java.util.List;
/**
@@ -176,6 +178,10 @@
serviceFund.setFundTaxId(fundTaxVO.getFundTaxId());
serviceFund.setDel_flag(0);
List<ServiceFund> serviceFunds = serviceFundService.selectServiceFundList(serviceFund);
+ if (CollectionUtils.isEmpty(serviceFunds)) {
+ //鏍规嵁id鎺掑簭锛堝崌搴忥級
+ serviceFunds.sort(Comparator.comparing(ServiceFund::getId));
+ }
for (ServiceFund serviceFund1 : serviceFunds) {
ServiceFunddetail serviceFunddetail = new ServiceFunddetail();
serviceFunddetail.setFundid(serviceFund1.getId());
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 0e5811e..6c4e22f 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -65,12 +65,14 @@
<result property="deptId" column="dept_id"/>
<result property="deptName" column="dept_name"/>
<result property="xh" column="xh"/>
+ <result property="allAmount" column="all_amount"/>
</resultMap>
<sql id="selectServiceFunddetailVo">
select ID,
fundID,
xh,
+ all_amount,
InfoId,
DonorNo,
dept_id,
@@ -150,6 +152,7 @@
<if test="fundid != null and fundid != '' ">and fundID = #{fundid}</if>
<if test="deptId != null ">and dept_id = #{deptId}</if>
<if test="deptName != null and deptName != '' ">and dept_name = #{deptName}</if>
+ <if test="allAmount != null ">and all_amount = #{allAmount}</if>
</where>
</select>
@@ -245,6 +248,7 @@
a.subjecttype,
a.dept_id,
a.dept_name,
+ a.all_amount,
a.subjecttypename
from service_funddetail a,
service_fund b
@@ -285,7 +289,7 @@
and a.del_flag != 1
and b.id != #{fundID}
and b.fundtaxtime
- < #{taxTime}
+ <= #{taxTime}
and b.fundtaxtime >= #{firstDay}
and b.del_flag != 1
and b.ApplyType in (1
@@ -312,9 +316,9 @@
and del_flag=0
</select>
- <select id="getListBySpStatBonus" statementType="CALLABLE"
- resultType="com.ruoyi.project.domain.SpStatBonus">
- call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR})
- </select>
+ <!-- <select id="getListBySpStatBonus" statementType="CALLABLE"-->
+ <!-- resultType="com.ruoyi.project.domain.SpStatBonus">-->
+ <!-- call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR})-->
+ <!-- </select>-->
</mapper>
--
Gitblit v1.9.3