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

结算

This commit is contained in:
hongchao 2025-12-08 17:07:38 +08:00
parent 9e9a455756
commit fa2695bf04
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java
View File

@ -752,8 +752,8 @@ public class IwsCostPushServiceImpl implements IwsCostPushService {
proIdsBean.setAgreementIds(proIdsBean.getAgreementIdsStr().split( ","));
proIdsBean.setType("1");
proIdsBean.setSettlementType(1);
// 获取租赁详情列表
List<IwsCostPushBean> rentalCostList = iwsCostPushMapper.getRentalCostList(proIdsBean);
// // 获取租赁详情列表
// List<IwsCostPushBean> rentalCostList = iwsCostPushMapper.getRentalCostList(proIdsBean);
// 获取丢失详情列表
proIdsBean.setType("2");
@ -766,7 +766,7 @@ public class IwsCostPushServiceImpl implements IwsCostPushService {
// 获取报废详情列表
proIdsBean.setType("4");
List<IwsCostPushBean> scrapCostList = iwsCostPushMapper.getBalanceCostList(proIdsBean);
list.addAll(rentalCostList);
// list.addAll(rentalCostList);
list.addAll(lostCostList);
list.addAll(repairCostList);
list.addAll(scrapCostList);

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

@ -2304,7 +2304,7 @@ public class SltAgreementInfoController extends BaseController {
}
@ApiOperation(value = "下载导出文件")
@PostMapping("/downloadExZip")
@PostMapping("/dlExZip")
public void downloadExportFile(@RequestBody SltAgreementInfo info, HttpServletResponse response) {
try {
ExportProgressManager.ExportProgress progress = exportProgressManager.getProgress(info.getTaskId());

2
bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
View File

@ -596,7 +596,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and sad.slt_type = #{type}
</if>
<if test="month != null and month != ''">
and LEFT(saa.audit_time,7) = #{month}
and LEFT(saa.create_time,7) = #{month}
</if>
<if test="settlementType != null">
and saa.settlement_type = #{settlementType}