Merge branch 'lc20240816'

结算代码提交
2024-08-16 14:24:38 +08:00 · 2024-08-16 14:23:52 +08:00
1 changed files with 2 additions and 2 deletions
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
@ -452,10 +452,10 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
    }

    private List<SltAgreementInfo> getLeaseJobListMonth(AgreementInfo agreementInfo) {
-        if (StringUtils.isBlank(agreementInfo.getEndTime())) {
+   /*     if (StringUtils.isBlank(agreementInfo.getEndTime())) {
            String lastMonthYearMonth = DateTimeHelper.getLastMonthYearMonth();
            agreementInfo.setEndTime(lastMonthYearMonth);
-        }
+        }*/
        List<SltAgreementInfo> monthCosts = calMonthlyMapper.getMonthCosts(agreementInfo);
        int num = 0;
        for (SltAgreementInfo monthCost : monthCosts) {
Author	SHA1	Message	Date
liang.chao	12a953ea90	Merge branch 'lc20240816'	2024-08-16 14:24:38 +08:00
liang.chao	012ae95238	结算代码提交	2024-08-16 14:23:52 +08:00