Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序增加租戶

This commit is contained in:
zhangyue 2026-07-31 12:20:43 +08:00
parent e0205ee03c
commit a182acff73
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java
View File

@ -251,6 +251,11 @@ public class IotCommonP2ServiceImpl {
todayDataCounts = nowDay.getDayOfMonth(); todayDataCounts = nowDay.getDayOfMonth();
yesterDataCounts = todayDataCounts; yesterDataCounts = todayDataCounts;
int lastDayOfMonth = yesterMonth.with(TemporalAdjusters.lastDayOfMonth()).getDayOfMonth();
if(todayDataCounts < lastDayOfMonth) {//查询的日期大于上个月的总天数时，不需要截取
String newTimes = yesterMonth.format(monthdtf); String newTimes = yesterMonth.format(monthdtf);
voSurvIntegrateParam.setStartTime(newTimes); voSurvIntegrateParam.setStartTime(newTimes);
voSurvIntegrateParam.setEndTime(newTimes); voSurvIntegrateParam.setEndTime(newTimes);
@ -278,6 +283,7 @@ public class IotCommonP2ServiceImpl {
} }
timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts, yesterData.getIndexs().size())); timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts, yesterData.getIndexs().size()));
} }
}
} else if (IotConstants.year_months.equals(screenSummaryVo.getSummrayMode())){//检查是否是本年 } else if (IotConstants.year_months.equals(screenSummaryVo.getSummrayMode())){//检查是否是本年
if(nowDay.format(yeardtf).equals(startTime)){//如果查询是本年，再查询一次去年，拼接为12个月 if(nowDay.format(yeardtf).equals(startTime)){//如果查询是本年，再查询一次去年，拼接为12个月
LocalDateTime yesterYear = nowDay.minusYears(1); LocalDateTime yesterYear = nowDay.minusYears(1);