From 5ca027513f9bb7b5a5a8a4eae1cc5dc2ec96a42e Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Mon, 1 Jul 2024 20:31:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=9B=91=E7=9D=A3=E8=AE=A1=E5=88=92=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 4cc1b2a2f..370641951 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
@@ -259,7 +259,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.getPlanOrgId()).getData();
-            lambdaQueryWrapper.in(SupvPlan::getSupvOrgId, deptIds)
+            lambdaQueryWrapper.in(SupvPlan::getPlanOrgId, deptIds)
                     .between(SupvPlan::getPlanSupvDate, DateUtil.parse(supvPlanParam.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN),DateUtil.parse(supvPlanParam.getSearchEndTime(), DatePattern.NORM_DATE_PATTERN))
                     .eq(StrUtil.isNotBlank(supvPlanParam.getSupvType()),SupvPlan::getSupvType,supvPlanParam.getSupvType());
         }
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java
index b052ab9ad..a535e3f57 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java
@@ -178,7 +178,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
 
         //评估报告月前统计
         List<ProcessPublicDTO> processPublicYearDTOAppraisalS = this.baseMapper.statisticPlanReportYear(firstYearDay, endYearDay, mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(), null, null);
-        List<ProcessPublicDTO> processPublicDTOAppraisalListM = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null);
+        List<ProcessPublicDTO> processPublicDTOAppraisalListM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null);
         List<ProcessPublicDTO> processPublicDTOAppraisalAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null);
         //评估报告问题数量
         List<ProcessPublicDTO> processPublicDTOAppraisalGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null);