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

Merge branch 'lc20240816'

This commit is contained in:
liang.chao 2024-08-16 14:24:38 +08:00
parent f98f52a118 012ae95238
commit 12a953ea90
1 changed files with 2 additions and 2 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/material/service/impl/SltAgreementInfoServiceImpl.java
View File

@ -452,10 +452,10 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
} }
private List<SltAgreementInfo> getLeaseJobListMonth(AgreementInfo agreementInfo) { private List<SltAgreementInfo> getLeaseJobListMonth(AgreementInfo agreementInfo) {
if (StringUtils.isBlank(agreementInfo.getEndTime())) { /* if (StringUtils.isBlank(agreementInfo.getEndTime())) {
String lastMonthYearMonth = DateTimeHelper.getLastMonthYearMonth(); String lastMonthYearMonth = DateTimeHelper.getLastMonthYearMonth();
agreementInfo.setEndTime(lastMonthYearMonth); agreementInfo.setEndTime(lastMonthYearMonth);
} }*/
List<SltAgreementInfo> monthCosts = calMonthlyMapper.getMonthCosts(agreementInfo); List<SltAgreementInfo> monthCosts = calMonthlyMapper.getMonthCosts(agreementInfo);
int num = 0; int num = 0;
for (SltAgreementInfo monthCost : monthCosts) { for (SltAgreementInfo monthCost : monthCosts) {