From f96631a18968b87d9bac4122875be2c40edaf071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 4 Jul 2023 09:23:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/process/controller/SupvMonthStatisController.java    | 4 ++--
 .../com/njcn/process/service/impl/SupvPlanServiceImpl.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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<Object> statisticReport(@RequestParam("timeId") String timeId){
+    public HttpResult<Boolean> 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<SupvPlanMapper, SupvPlan> i
         LambdaQueryWrapper<SupvPlan> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         if(StrUtil.isNotBlank(supvPlanParam.getSupvOrgId())){
             List<String> deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getSupvOrgId()).getData();
-            lambdaQueryWrapper.in(SupvPlan::getSupvOrgId,deptIds);
+            lambdaQueryWrapper.in(SupvPlan::getSupvOrgId,deptIds).between(SupvPlan::getPlanSupvDate,supvPlanParam.getSearchBeginTime(),supvPlanParam.getSearchEndTime());
         }
         List<PvTerminalTreeVO> deptList = deptFeignClient.allDeptList().getData();
         Map<String,PvTerminalTreeVO> mapCode = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode, Function.identity()));