Jelajahi Sumber

pms 瑞恒 瑞都 日报 折线图 不传递时间区间 返回 []

zhangcl 4 hari lalu
induk
melakukan
d3c3eeb643

+ 3 - 3
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrddailyreport/IotRdDailyReportServiceImpl.java

@@ -1548,9 +1548,9 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
     public List<IotRdDailyReportPolylineVO> polylineStatistics(IotRdDailyReportPageReqVO pageReqVO) {
         List<IotRdDailyReportPolylineVO> result = new ArrayList<>();
         // 查询折线趋势图必须 传递时间参数
-        if (ObjUtil.isEmpty(pageReqVO.getCreateTime())) {
+        /* if (ObjUtil.isEmpty(pageReqVO.getCreateTime())) {
             throw exception(IOT_DAILY_REPORT_TIME_NOT_EXISTS);
-        }
+        } */
         Set<Long> ids = new HashSet<>();
         if (Objects.nonNull(pageReqVO.getDeptId())) {
             ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
@@ -1770,7 +1770,7 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
         // 新增:日期字符串集合
         List<String> dateRangeList = new ArrayList<>();
 
-        if (createTimes.length >= 2) {
+        if (ObjUtil.isNotEmpty(createTimes) && createTimes.length >= 2) {
             LocalDate startDate = createTimes[0].toLocalDate();
             LocalDate endDate = createTimes[1].toLocalDate();
             // 生成从起始日期到结束日期的所有日期

+ 1 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrhdailyreport/IotRhDailyReportServiceImpl.java

@@ -1156,7 +1156,7 @@ public class IotRhDailyReportServiceImpl implements IotRhDailyReportService {
         // 新增:日期字符串集合
         List<String> dateRangeList = new ArrayList<>();
 
-        if (createTimes.length >= 2) {
+        if (ObjUtil.isNotEmpty(createTimes) && createTimes.length >= 2) {
             LocalDate startDate = createTimes[0].toLocalDate();
             LocalDate endDate = createTimes[1].toLocalDate();
             // 生成从起始日期到结束日期的所有日期