Browse Source

fix:流程节点脚本增加行业分类

xuezizhuo 1 year ago
parent
commit
6e9cfa0f11

+ 13 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysBpmNodeScript.java

@@ -36,6 +36,9 @@ public class SysBpmNodeScript extends BaseEntity
     /** 脚本描述 */
     private String scriptDescription;
 
+    /** 行业分类 */
+    private String industryType;
+
     /** 删除标志(0:否;1:是) */
     private String delFlag;
 
@@ -107,7 +110,15 @@ public class SysBpmNodeScript extends BaseEntity
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
+    public String getIndustryType() {
+        return industryType;
+    }
+
+    public void setIndustryType(String industryType) {
+        this.industryType = industryType;
+    }
+
+    public String getDelFlag()
     {
         return delFlag;
     }
@@ -122,6 +133,7 @@ public class SysBpmNodeScript extends BaseEntity
             .append("scriptFunctionCode", getScriptFunctionCode())
             .append("scriptType", getScriptType())
             .append("scriptDescription", getScriptDescription())
+            .append("industryType",getIndustryType())
             .append("delFlag", getDelFlag())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())

+ 7 - 3
ruoyi-system/src/main/resources/mapper/system/SysBpmNodeScriptMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="scriptFunctionCode"    column="script_function_code"    />
         <result property="scriptType"    column="script_type"    />
         <result property="scriptDescription"    column="script_description"    />
+        <result property="industryType" column="industry_type"/>
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysBpmNodeScriptVo">
-        select id, script_key, script_function_name, script_name, script_function_code, script_type, script_description, del_flag, create_by, create_time, update_by, update_time from sys_bpm_node_script
+        select id, script_key, script_function_name, script_name, script_function_code, script_type, script_description, industry_type, del_flag, create_by, create_time, update_by, update_time from sys_bpm_node_script
     </sql>
 
     <select id="selectSysBpmNodeScriptList" parameterType="SysBpmNodeScript" resultMap="SysBpmNodeScriptResult">
@@ -32,6 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scriptFunctionCode != null  and scriptFunctionCode != ''"> and script_function_code = #{scriptFunctionCode}</if>
             <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>
+             order by create_time desc
     </select>
     
     <select id="selectSysBpmNodeScriptById" parameterType="Long" resultMap="SysBpmNodeScriptResult">
@@ -48,10 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scriptFunctionCode != null">script_function_code,</if>
             <if test="scriptType != null">script_type,</if>
             <if test="scriptDescription != null">script_description,</if>
+            <if test="industryType != null">industry_type,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
             del_flag
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -61,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scriptFunctionCode != null">#{scriptFunctionCode},</if>
             <if test="scriptType != null">#{scriptType},</if>
             <if test="scriptDescription != null">#{scriptDescription},</if>
+            <if test="industryType != null">#{industryType},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             '0'
@@ -76,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scriptFunctionCode != null">script_function_code = #{scriptFunctionCode},</if>
             <if test="scriptType != null">script_type = #{scriptType},</if>
             <if test="scriptDescription != null">script_description = #{scriptDescription},</if>
+            <if test="industryType != null">industry_type = #{industryType},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>