Parcourir la source

fix: 1.风险监督分页条件-服务周期只限定包的开始时间;2.导出监察报告时间筛选也只限定包的开始时间

lixuesong il y a 1 jour
Parent
commit
639ec904ec

+ 2 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1238,7 +1238,7 @@ public class WmSupervisionManager {
     LocalDate[] period = query.getPeriod();
     if (ArrayUtil.isNotEmpty(period) && period.length == 2) {
         queryWrapper.ge(WmScorePackage::getStartTime, period[0]);
-        queryWrapper.le(WmScorePackage::getEndTime, period[1]);
+        queryWrapper.le(WmScorePackage::getStartTime, period[1]);
     }
 
     // 获取当前企业当季度的包
@@ -2112,7 +2112,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
 
     if (ArrayUtil.isNotEmpty(period)) {
       queryWrapper.ge(WmScorePackage::getStartTime, period[0]);
-      queryWrapper.le(WmScorePackage::getEndTime, period[1]);
+      queryWrapper.le(WmScorePackage::getStartTime, period[1]);
     }
 
     List<WmScorePackage> pkgs = packageService.list(queryWrapper);