Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.监督计划调整

Browse Source
This commit is contained in:
cdf
2024-07-01 20:31:09 +08:00
parent 87c60206f0
commit 5ca027513f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
View File

@@ -259,7 +259,7 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
LambdaQueryWrapper<SupvPlan> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SupvPlan> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if (StrUtil.isNotBlank(supvPlanParam.getSupvOrgId())) { if (StrUtil.isNotBlank(supvPlanParam.getSupvOrgId())) {
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getPlanOrgId()).getData(); 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)) .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()); .eq(StrUtil.isNotBlank(supvPlanParam.getSupvType()),SupvPlan::getSupvType,supvPlanParam.getSupvType());
} }

2
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java
View File

@@ -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> 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> 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); List<ProcessPublicDTO> processPublicDTOAppraisalGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null);