提交健康指数筛选

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TdInfoQueryController.java

@@ -186,6 +186,10 @@ public class TdInfoQueryController extends BaseController {
         {
         	 throw new Exception("请选择开始时间和结束时间");
         }
+        Page<FanHealthIndex> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
+        if(DateUtils.dateParse(dto.getStartDate()).after(DateUtils.dateParse(dto.getEndDate()))){
+            return ResponseHelper.buildResponse(resultPage);
+        }
         ReginParams reginParams = getSelectedOrgInfo();
         String userId = reginParams.getUserModel().getUserId();
         StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
@@ -211,6 +215,9 @@ public class TdInfoQueryController extends BaseController {
             	Long startTs = pvHealthIndexMapper.getTsByRecDateGT("fan_health_index_data", startDate+" 00:00:00", "Asc ");
                 dto.setStartDateTs(startTs);
             }
+            if(dto.getStartDateTs()==null){
+                return ResponseHelper.buildResponse(resultPage);
+            }
         }
         if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
             String dateNowShortStr = DateUtils.getDateNowShortStr();
@@ -238,8 +245,10 @@ public class TdInfoQueryController extends BaseController {
                 dto.setEndDateTs(endTs);
                 dto.setTableName("fan_health_index_data");
             }
+            if(dto.getEndDateTs()==null){
+                return ResponseHelper.buildResponse(resultPage);
+            }
         }
-        Page<FanHealthIndex> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
         dto.setCurrent((dto.getCurrent() - 1) * dto.getSize());
         if (CharSequenceUtil.isNotEmpty(dto.getSortsString())) {
             ObjectMapper objectMapper = new ObjectMapper();
@@ -265,7 +274,7 @@ public class TdInfoQueryController extends BaseController {
             String orderColumn = convert(split[0]) + " " + replace;
             dto.setSortOne(orderColumn);
         }
-        if(dto.getEndDateTs()==null&&dto.getStartDateTs()==null) 
+        if(dto.getEndDateTs()==null&&dto.getStartDateTs()==null)
         {
         	 return ResponseHelper.buildResponse(resultPage);
         }
@@ -307,6 +316,10 @@ public class TdInfoQueryController extends BaseController {
         {
         	 throw new Exception("请选择开始时间和结束时间");
         }
+        Page<PvHealthIndex> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
+        if(DateUtils.dateParse(dto.getStartDate()).after(DateUtils.dateParse(dto.getEndDate()))){
+            return ResponseHelper.buildResponse(resultPage);
+        }
         ReginParams reginParams = getSelectedOrgInfo();
         String userId = reginParams.getUserModel().getUserId();
         StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
@@ -333,6 +346,9 @@ public class TdInfoQueryController extends BaseController {
             	Long startTs = pvHealthIndexMapper.getTsByRecDateGT("pv_health_index_data", startDate+" 00:00:00", "Asc ");
                 dto.setStartDateTs(startTs);
             }
+            if(dto.getStartDateTs()==null){
+                return ResponseHelper.buildResponse(resultPage);
+            }
         }
         if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
             String dateNowShortStr = DateUtils.getDateNowShortStr();
@@ -360,6 +376,9 @@ public class TdInfoQueryController extends BaseController {
                 dto.setEndDateTs(endTs);
                 dto.setTableName("pv_health_index_data");
             }
+            if(dto.getEndDateTs()==null){
+                return ResponseHelper.buildResponse(resultPage);
+            }
         }
         if (CharSequenceUtil.isNotEmpty(dto.getSortsString())) {
             ObjectMapper objectMapper = new ObjectMapper();
@@ -370,7 +389,6 @@ public class TdInfoQueryController extends BaseController {
                 e.printStackTrace();
             }
         }
-        Page<PvHealthIndex> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
         dto.setCurrent((dto.getCurrent() - 1) * dto.getSize());
         List<Map<String, String>> orderWeight = dto.getSorts().stream().sorted(Comparator.comparing(t -> Integer.parseInt(t.get("orderWeight")))).collect(Collectors.toList());
         List<String> orderByList = new ArrayList<>();
@@ -387,7 +405,7 @@ public class TdInfoQueryController extends BaseController {
         }
         String join = String.join(",", orderByList);
         dto.setOrderColumns(join);
-        if(dto.getEndDateTs()==null&&dto.getStartDateTs()==null) 
+        if(dto.getEndDateTs()==null&&dto.getStartDateTs()==null)
         {
         	 return ResponseHelper.buildResponse(resultPage);
         }