From c2eb2288ac001b47490f2c28ff5839da8ecd5486 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 12 Feb 2025 22:37:01 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=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

---
 .../execution/dao/mapper/xml/ActRuExecutionMapper.xml    | 5 ++++-
 .../flow/service/execution/dto/ExecutionQuery.java       | 2 +-
 .../execution/impl/ActRuExecutionServiceImpl.java        | 1 +
 .../service/dao/mapper/xml/PmFormDataMapper.xml          | 9 +++------
 4 files changed, 9 insertions(+), 8 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 1fb475d8..54672c03 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
@@ -13,7 +13,10 @@
         <where>
             1=1
             <if test="query.search != null and query.search != ''">
-                and def.model_key LIKE '%${query.search}%'
+                and (def.name LIKE '%${query.search}%'  or  CAST(form_data AS CHAR) LIKE '%${query.search}%')
+            </if>
+            <if test="query.status != null and query.status != ''">
+                and exe.status = '${query.status}'
             </if>
             <if test="query.proc_inst_id != null and query.proc_inst_id != ''">
                 and exe.parent_id is null
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 616d35b8..6486037e 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
@@ -16,7 +16,7 @@ public class ExecutionQuery extends BaseQuery<ActRuExecution> {
 
 
     private String search;
-
+    private String status;
     private String proc_inst_id;
     private String child_id;
 
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 ef73d680..341728d0 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
@@ -56,6 +56,7 @@ public class ActRuExecutionServiceImpl extends ServiceImpl<ActRuExecutionMapper,
         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());
+        query.setStatus(StringUtils.isNotBlank(query.getStatus())?query.getStatus().trim():query.getStatus());
         List<Map> list = actRuExecutionMapper.pageGetAll(query, pageQuery);
         TableDataInfo<Map> 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 2aa8dfd0..4ab77cd2 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
@@ -114,6 +114,9 @@
         pm_form_data
             left join md_me_materialbase on pm_form_data.material_id = md_me_materialbase.material_id
         <where>
+            <if test="query.search != null and query.search != ''">
+                and  form_data  LIKE '%${query.search}%'
+            </if>
             <if test="query.form_type != null and query.form_type != ''">
                 and form_type = #{query.form_type}
             </if>
@@ -129,12 +132,6 @@
             <if test="query.end_time != null and query.end_time != ''">
                 and #{query.end_time} >= pm_form_data.create_time
             </if>
-            <if test="query.code != null and query.code != ''">
-                and code = #{query.code}
-            </if>
-            <if test="query.search != null and query.search != ''">
-                and code = #{query.search}
-            </if>
             <if test="query.status != null and query.status != ''">
                 and pm_form_data.status IN
                 <foreach collection="query.status" item="status" separator="," open="(" close=")">