From 37583e5a378c8277be7ba52f75f8c6de0b2ac878 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Oct 2023 15:22:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E6=8E=A5=E5=8F=A3=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProcessESInitChangeController.java | 4 +++- .../enterprise/service/EnterpriseStandardPlanService.java | 3 ++- .../service/impl/EnterpriseStandardPlanServiceImpl.java | 4 +--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java index 6aa80a45..78acdcbd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java @@ -6,6 +6,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService; import com.jero.modules.laws.common.constant.FieldCommon; +import com.jero.modules.laws.enterprise.entity.dto.ESPlanQueryDTO; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import io.swagger.annotations.Api; @@ -147,8 +148,9 @@ public class ProcessESInitChangeController { @GetMapping(value = "/getESPList") public Result getESPList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + ESPlanQueryDTO esPlanQueryDTO, @RequestParam("projectType") String projectType, @RequestParam(name="revisionType", required = false) String revisionType) { - return Result.OK(espService.getESPList(pageNo, pageSize, projectType, revisionType)); + return Result.OK(espService.getESPList(pageNo, pageSize, esPlanQueryDTO, projectType, revisionType)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java index e4cc8d2e..115792b7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java @@ -51,9 +51,10 @@ public interface EnterpriseStandardPlanService extends IService getESPList(Integer pageNo, Integer pageSize, String projectType, String revisionType); + IPage getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType, String revisionType); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java index 5109b008..dad89ffb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java @@ -76,10 +76,8 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl getESPList(Integer pageNo, Integer pageSize, String projectType, String revisionType) { + public IPage getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType, String revisionType) { // 构建查询参数 - ESPlanQueryDTO esPlanQueryDTO = new ESPlanQueryDTO(); - if (!ESPProjectType.MERGE.getValue().equals(projectType)) { // 完成时间变更 未开始/进行中 // 工作中止 未开始/进行中