bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复

This commit is contained in:
hongchao 2025-12-02 09:33:12 +08:00
parent 514e0f4fcc
commit db5b90b0b4
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -502,8 +502,8 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
String endTime = currentLocalDate.getDayOfMonth() > 20 String endTime = currentLocalDate.getDayOfMonth() > 20
? DateTimeHelper.getCurrentMonthCalEndDay(20) ? DateTimeHelper.getCurrentMonthCalEndDay(21)
: DateTimeHelper.getPreMonthCalStartDay(20); : DateTimeHelper.getPreMonthCalStartDay(21);

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

@ -946,7 +946,7 @@ public class SltAgreementInfoController extends BaseController {
// calcMonthlyService.calcMonthInfo(1); // calcMonthlyService.calcMonthInfo(1);
// } else { // } else {
// int calDay = Integer.parseInt(settlementJobDay); // int calDay = Integer.parseInt(settlementJobDay);
calcMonthlyService.calcMonthInfo(20); calcMonthlyService.calcMonthInfo(21);
// } // }
} catch (Exception e) { } catch (Exception e) {

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java
View File

@ -44,8 +44,8 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService {
endTime = DateTimeHelper.getCurrentMonthFirstDay(); endTime = DateTimeHelper.getCurrentMonthFirstDay();
} else { } else {
month = DateTimeHelper.getCurrentMonth(); month = DateTimeHelper.getCurrentMonth();
startTime = DateTimeHelper.getPreMonthCalStartDay(20); startTime = DateTimeHelper.getPreMonthCalStartDay(day);
endTime = DateTimeHelper.getCurrentMonthCalEndDay(21); endTime = DateTimeHelper.getCurrentMonthCalEndDay(day);
} }
CalMonthlyBean record = new CalMonthlyBean(); CalMonthlyBean record = new CalMonthlyBean();
record.setMonth(month); record.setMonth(month);

3
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
View File

@ -391,7 +391,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
<if test="dictName != null and dictName != ''"> <if test="dictName != null and dictName != ''">
and (mt.type_name like concat('%',#{dictName},'%') or 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},'%'))
</if> </if>
order by status, pmi.id order by status, pmi.id
</select> </select>