From db5b90b0b4c8cc0fbe1dff3080eb01b943d67300 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Tue, 2 Dec 2025 09:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java | 4 ++-- .../sgzb/material/controller/SltAgreementInfoController.java | 2 +- .../sgzb/material/remind/service/CalcMonthlyServiceImp.java | 4 ++-- .../resources/mapper/material/PurchaseMacodeInfoMapper.xml | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 5919dbe..6978183 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -502,8 +502,8 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { String endTime = currentLocalDate.getDayOfMonth() > 20 - ? DateTimeHelper.getCurrentMonthCalEndDay(20) - : DateTimeHelper.getPreMonthCalStartDay(20); + ? DateTimeHelper.getCurrentMonthCalEndDay(21) + : DateTimeHelper.getPreMonthCalStartDay(21); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java index 4926ad2..9833049 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java @@ -946,7 +946,7 @@ public class SltAgreementInfoController extends BaseController { // calcMonthlyService.calcMonthInfo(1); // } else { // int calDay = Integer.parseInt(settlementJobDay); - calcMonthlyService.calcMonthInfo(20); + calcMonthlyService.calcMonthInfo(21); // } } catch (Exception e) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java index e6fe0ee..3646a6e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java @@ -44,8 +44,8 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { endTime = DateTimeHelper.getCurrentMonthFirstDay(); } else { month = DateTimeHelper.getCurrentMonth(); - startTime = DateTimeHelper.getPreMonthCalStartDay(20); - endTime = DateTimeHelper.getCurrentMonthCalEndDay(21); + startTime = DateTimeHelper.getPreMonthCalStartDay(day); + endTime = DateTimeHelper.getCurrentMonthCalEndDay(day); } CalMonthlyBean record = new CalMonthlyBean(); record.setMonth(month); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index d00953d..a70ca58 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -391,7 +391,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (mt.type_name like concat('%',#{dictName},'%') or - mt1.type_name like concat('%',#{dictName},'%')) + mt1.type_name like concat('%',#{dictName},'%') or + mm.ma_code like concat('%',#{dictName},'%')) order by status, pmi.id