|
@@ -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);
|