Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-system/src/main/java/com/zkqy/system/mapper/SysBpmNodeScriptMapper.java

@@ -2,6 +2,7 @@ package com.zkqy.system.mapper;
 
 import java.util.List;
 import com.zkqy.system.domain.SysBpmNodeScript;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 流程节点脚本Mapper接口
@@ -71,5 +72,5 @@ public interface SysBpmNodeScriptMapper
      * @param scriptKeys 唯一标识
      * @return
      */
-    List<SysBpmNodeScript> selectSysBpmNodeScriptByScriptKeys(List<String> scriptKeys);
+    List<SysBpmNodeScript> selectSysBpmNodeScriptByScriptKeys(@Param("scriptKeys") List<String> scriptKeys);
 }

zkqy-system/src/main/java/com/zkqy/system/service/impl/SysBpmNodeScriptServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zkqy.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import com.zkqy.common.utils.DateUtils;
 import com.zkqy.common.utils.SecurityUtils;

zkqy-system/src/main/resources/mapper/system/SysBpmNodeScriptMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scriptType != null "> and script_type = #{scriptType}</if>
             <if test="scriptDescription != null  and scriptDescription != ''"> and script_description = #{scriptDescription}</if>
             <if test="industryType != null"> and industry_type = #{industryType}</if>
-            <if test="tableName != null and tableName != ''"> and table_name = #{tableName}</if>
+            <if test="tableName != null and tableName != ''"> and table_name like concat('%', #{tableName}, '%')</if>
              order by create_time desc
     </select>
     
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSysBpmNodeScriptByScriptKeys"  resultMap="SysBpmNodeScriptResult">
         <include refid="selectSysBpmNodeScriptVo"/>
         where del_flag = '0' and script_key in
-        <foreach collection="list" item="scriptKey" open="(" close=")" separator=",">
+        <foreach collection="scriptKeys" item="scriptKey" open="(" close=")" separator=",">
             #{scriptKey}
         </foreach>
     </select>

zkqy-system/src/main/resources/sql/initialize_sys_tenant_menu.json

@@ -1081,7 +1081,7 @@
         "updateTime": null,
         "remark": null,
         "menuId": 4218,
-        "menuName": "管道流程",
+        "menuName": "管道执行",
         "parentName": null,
         "parentId": 4216,
         "orderNum": 1,

zkqy-ui/src/views/bpmprocess/scriptManage.vue

@@ -6,7 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="88px"
     >
       <el-form-item label="脚本编码" prop="scriptKey">
         <el-input
@@ -16,14 +16,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="脚本方法名称" prop="scriptFunctionName">
+      <!-- <el-form-item label="脚本方法名称" prop="scriptFunctionName">
         <el-input
           v-model="queryParams.scriptFunctionName"
           placeholder="请输入脚本方法名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="脚本名称" prop="scriptName">
         <el-input
           v-model="queryParams.scriptName"
@@ -32,6 +32,46 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="脚本类型" prop="scriptType">
+        <el-select
+            v-model="queryParams.scriptType"
+            placeholder="请选择脚本类型"
+            filterable
+            clearable 
+          >
+            <el-option
+              v-for="item in dict.type.bpm_script_type"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="行业类型:" prop="industryType">
+          <el-select
+            v-model="queryParams.industryType"
+            placeholder="请选择行业类型"
+            filterable
+            clearable 
+          >
+            <el-option
+              v-for="item in dict.type.industry_type"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="数据表" prop="tableName">
+        <el-input
+          v-model="queryParams.tableName"
+          placeholder="请输入数据表"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -331,6 +371,7 @@ export default {
         scriptFunctionCode: null,
         scriptType: null,
         industryType: null,
+        tableName:null,
         scriptDescription: null,
       },
       // 表单参数