From f1d434c200068204b57906e65e6d12eefac6dd9f Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Wed, 8 Jan 2025 20:11:04 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=8D=95=E6=8D=AE=E5=9B=9E=E4=BC=A0?= =?UTF-8?q?=EF=BC=8C=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/xml/ActRuExecutionMapper.xml | 6 +++++- .../flow/service/execution/dto/ExecutionQuery.java | 1 + .../execution/impl/ActRuExecutionServiceImpl.java | 3 +++ .../service/dao/mapper/xml/PmFormDataMapper.xml | 12 ++++++++++++ .../form_data/service/dto/FormDataQuery.java | 5 ++++- 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml index 2950b1e4..1fb475d8 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml @@ -11,13 +11,17 @@ FROM act_ru_execution exe left join act_re_procdef def on exe.deployment_id = def.deployment_id - exe.parent_id is null + 1=1 and def.model_key LIKE '%${query.search}%' + and exe.parent_id is null and exe.proc_inst_id like '%${query.proc_inst_id}%' + + and exe.proc_inst_id like '%${query.child_id}%' + ORDER BY exe.create_time DESC diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java index 02963a8c..616d35b8 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java @@ -18,6 +18,7 @@ public class ExecutionQuery extends BaseQuery { private String search; private String proc_inst_id; + private String child_id; @Override public void paramMapping() { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java index 5139384e..ef73d680 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java @@ -53,6 +53,9 @@ public class ActRuExecutionServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + query.setChild_id(StringUtils.isNotBlank(query.getChild_id())?query.getChild_id().trim():query.getChild_id()); + query.setProc_inst_id(StringUtils.isNotBlank(query.getProc_inst_id())?query.getProc_inst_id().trim():query.getProc_inst_id()); + query.setSearch(StringUtils.isNotBlank(query.getSearch())?query.getSearch().trim():query.getSearch()); List list = actRuExecutionMapper.pageGetAll(query, pageQuery); TableDataInfo build = TableDataInfo.build(list); build.setTotalElements(page.getTotal()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml index 28c44c48..2aa8dfd0 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml @@ -120,6 +120,18 @@ and code = #{query.code} + + and md_me_materialbase.material_code like '%${query.mater}%' + + + and pm_form_data.create_time >= #{query.start_time} + + + and #{query.end_time} >= pm_form_data.create_time + + + and code = #{query.code} + and code = #{query.search} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java index 736730ad..f9f05ef3 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java @@ -14,12 +14,15 @@ import java.util.Map; */ @Data public class FormDataQuery extends BaseQuery { - private String form_type; private String code; private String search; private String parent_id; + private String mater; private String[] status; + private String start_time; + private String end_time; + private Map form_query; @Override