bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

费用结算报表

This commit is contained in:
syruan 2025-08-22 13:50:18 +08:00
parent 7ad03dbdd0
commit 1a1febf736
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
View File

@ -122,6 +122,20 @@ public class SltAgreementInfoController extends BaseController {
unitNames.add(info.getUnitName()); unitNames.add(info.getUnitName());
projectNames.add(info.getProjectName()); projectNames.add(info.getProjectName());
SltInfoVo vo = sltAgreementInfoService.getSltInfo(info); SltInfoVo vo = sltAgreementInfoService.getSltInfo(info);
if (vo == null) {
vo = new SltInfoVo();
vo.setLeaseCost(BigDecimal.ZERO);
vo.setRepairCost(BigDecimal.ZERO);
vo.setScrapCost(BigDecimal.ZERO);
vo.setLoseCost(BigDecimal.ZERO);
vo.setReductionCost(BigDecimal.ZERO);
vo.setLeaseList(Collections.emptyList());
vo.setRepairList(Collections.emptyList());
vo.setScrapList(Collections.emptyList());
vo.setLoseList(Collections.emptyList());
vo.setReductionList(Collections.emptyList());
vo.setRelations(Collections.emptyList());
}
dataList.add(vo); dataList.add(vo);
if (info.getAgreementId() != null) { if (info.getAgreementId() != null) {
agreementId = info.getAgreementId(); agreementId = info.getAgreementId();

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java
View File

@ -131,15 +131,17 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
List<SltAgreementInfo> scrapList = getScrapList(info); List<SltAgreementInfo> scrapList = getScrapList(info);
//丢失费用列表 //丢失费用列表
List<SltAgreementInfo> loseList = getLoseList(info); List<SltAgreementInfo> loseList = getLoseList(info);
//费用减免列表
List<SltAgreementReduce> reductionList = getReductionList(info);
if (CollectionUtils.isEmpty(leaseList) && CollectionUtils.isEmpty(repairList) if (CollectionUtils.isEmpty(leaseList) && CollectionUtils.isEmpty(repairList)
&& CollectionUtils.isEmpty(scrapList) && CollectionUtils.isEmpty(loseList)) && CollectionUtils.isEmpty(scrapList) && CollectionUtils.isEmpty(loseList)
&& CollectionUtils.isEmpty(reductionList))
{ {
return null; return null;
} }
//费用减免列表
List<SltAgreementReduce> reductionList = getReductionList(info);
sltInfoVo.setLeaseList(leaseList); sltInfoVo.setLeaseList(leaseList);
sltInfoVo.setRepairList(repairList); sltInfoVo.setRepairList(repairList);
sltInfoVo.setScrapList(scrapList); sltInfoVo.setScrapList(scrapList);

4
bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
View File

@ -811,6 +811,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId != null and projectId != ''"> <if test="projectId != null and projectId != ''">
and bp.pro_id = #{projectId} and bp.pro_id = #{projectId}
</if> </if>
<if test="startTime != null and endTime != null">
and saa.create_time between #{startTime} and #{endTime}
</if>
<choose> <choose>
<when test="sltStatus == '1'.toString()"> <when test="sltStatus == '1'.toString()">
and saa.status = '1' and saa.status = '1'