From fa2695bf043380c85bbc8a1fb9327afda5102a3d Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Mon, 8 Dec 2025 17:07:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/push/service/impl/IwsCostPushServiceImpl.java | 6 +++--- .../settlement/controller/SltAgreementInfoController.java | 2 +- .../resources/mapper/material/push/IwsCostPushMapper.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java index 3822a8da..452fa1e6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java @@ -752,8 +752,8 @@ public class IwsCostPushServiceImpl implements IwsCostPushService { proIdsBean.setAgreementIds(proIdsBean.getAgreementIdsStr().split( ",")); proIdsBean.setType("1"); proIdsBean.setSettlementType(1); - // 获取租赁详情列表 - List rentalCostList = iwsCostPushMapper.getRentalCostList(proIdsBean); +// // 获取租赁详情列表 +// List rentalCostList = iwsCostPushMapper.getRentalCostList(proIdsBean); // 获取丢失详情列表 proIdsBean.setType("2"); @@ -766,7 +766,7 @@ public class IwsCostPushServiceImpl implements IwsCostPushService { // 获取报废详情列表 proIdsBean.setType("4"); List scrapCostList = iwsCostPushMapper.getBalanceCostList(proIdsBean); - list.addAll(rentalCostList); +// list.addAll(rentalCostList); list.addAll(lostCostList); list.addAll(repairCostList); list.addAll(scrapCostList); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java index 10bb2b8f..5a4d401f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java @@ -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()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml index af824e12..1058ab69 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml @@ -596,7 +596,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sad.slt_type = #{type} - and LEFT(saa.audit_time,7) = #{month} + and LEFT(saa.create_time,7) = #{month} and saa.settlement_type = #{settlementType}