diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvMonthStatisController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvMonthStatisController.java index 12a938850..d8851ff66 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvMonthStatisController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvMonthStatisController.java @@ -48,11 +48,11 @@ public class SupvMonthStatisController extends BaseController { @PostMapping("statisticReport") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @ApiOperation("监督月报统计") - public HttpResult statisticReport(@RequestParam("timeId") String timeId){ + public HttpResult statisticReport(@RequestParam("timeId") String timeId){ String methodDescribe = getMethodDescribe("statisticReport"); LocalDate localDate = LocalDate.parse(timeId); iSupvReportMService.statisticSuperviseReport(localDate); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); } /** diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java index 88fcd614b..1fc6ea02d 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java @@ -110,7 +110,7 @@ public class SupvPlanServiceImpl extends ServiceImpl i LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); if(StrUtil.isNotBlank(supvPlanParam.getSupvOrgId())){ List deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getSupvOrgId()).getData(); - lambdaQueryWrapper.in(SupvPlan::getSupvOrgId,deptIds); + lambdaQueryWrapper.in(SupvPlan::getSupvOrgId,deptIds).between(SupvPlan::getPlanSupvDate,supvPlanParam.getSearchBeginTime(),supvPlanParam.getSearchEndTime()); } List deptList = deptFeignClient.allDeptList().getData(); Map mapCode = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode, Function.identity()));