表结构重构

ruoyi-system/src/main/java/com/ruoyi/business/domain/BizDevice.java

@@ -124,4 +124,7 @@ public class BizDevice extends BaseEntity
     /** 设备类型(1:化验室，2：连续检测) */
     @Excel(name = "设备类型(1:化验室，2：连续检测)")
     private String type;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private Integer delFlag;
 }

ruoyi-system/src/main/resources/mapper/business/BizDeviceMapper.xml

@@ -34,19 +34,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceLatitude"    column="device_latitude"    />
         <result property="deviceAddress"    column="device_address"    />
         <result property="type"    column="type"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectBizDeviceVo">
-        select device_id, device_no, device_name, device_sn, device_model, device_maker, device_works, device_maintainer, device_tel, device_type, device_status, assay_status, assay_time, repair_time, repair_by, create_by, create_time, update_by, update_time, fault_code, device_xujie_jieguo, device_xujie_baojing, device_province, device_city, device_area, device_longitude, device_latitude, device_address, type from biz_device
+        select device_id, device_no, device_name, device_sn, device_model, device_maker, device_works, device_maintainer, device_tel, device_type, device_status, assay_status, assay_time, repair_time, repair_by, create_by, create_time, update_by, update_time, fault_code, device_xujie_jieguo, device_xujie_baojing, device_province, device_city, device_area, device_longitude, device_latitude, device_address, type, del_flag, remark from biz_device
     </sql>
 
     <select id="selectBizDeviceList" parameterType="BizDevice" resultMap="BizDeviceResult">
         <include refid="selectBizDeviceVo"/>
         <where>
             1 = 1
-            <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
+            <if test="deviceNo != null  and deviceNo != ''"> and device_no like concat('%', #{deviceNo}, '%')</if>
             <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
-            <if test="deviceSn != null  and deviceSn != ''"> and device_sn = #{deviceSn}</if>
+            <if test="deviceSn != null  and deviceSn != ''"> and device_sn like concat('%', #{deviceSn}, '%')</if>
             <if test="deviceModel != null  and deviceModel != ''"> and device_model = #{deviceModel}</if>
             <if test="deviceMaker != null  and deviceMaker != ''"> and device_maker = #{deviceMaker}</if>
             <if test="deviceWorks != null "> and device_works = #{deviceWorks}</if>
@@ -69,12 +71,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceAddress != null  and deviceAddress != ''"> and device_address = #{deviceAddress}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
         </where>
-            order by device_id desc
+        and del_flag = 0 order by device_id desc
     </select>
     
     <select id="selectBizDeviceByDeviceId" parameterType="Long" resultMap="BizDeviceResult">
         <include refid="selectBizDeviceVo"/>
-        where device_id = #{deviceId}
+        where device_id = #{deviceId} and del_flag = 0
     </select>
         
     <insert id="insertBizDevice" parameterType="BizDevice">
@@ -109,6 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceLatitude != null">device_latitude,</if>
             <if test="deviceAddress != null">device_address,</if>
             <if test="type != null">type,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceId != null">#{deviceId},</if>
@@ -140,6 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceLatitude != null">#{deviceLatitude},</if>
             <if test="deviceAddress != null">#{deviceAddress},</if>
             <if test="type != null">#{type},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -174,6 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceLatitude != null">device_latitude = #{deviceLatitude},</if>
             <if test="deviceAddress != null">device_address = #{deviceAddress},</if>
             <if test="type != null">type = #{type},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where device_id = #{deviceId}
     </update>

ruoyi-system/src/main/resources/mapper/business/TAssayItemExtraMapper.xml

@@ -1,100 +1,103 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.mapper.TAssayItemExtraMapper">
-    
-    <resultMap type="TAssayItemExtra" id="TAssayItemExtraResult">
-        <result property="id"    column="id"    />
-        <result property="itemId"    column="item_id"    />
-        <result property="type"    column="type"    />
-        <result property="relativeId"    column="relative_id"    />
-        <result property="amount"    column="amount"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="revision"    column="revision"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTAssayItemExtraVo">
-        select id, item_id, type, relative_id, amount, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_assay_item_extra
-    </sql>
-
-    <select id="selectTAssayItemExtraList" parameterType="TAssayItemExtra" resultMap="TAssayItemExtraResult">
-        <include refid="selectTAssayItemExtraVo"/>
-        <where>  
-            <if test="itemId != null "> and item_id = #{itemId}</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="relativeId != null "> and relative_id = #{relativeId}</if>
-            <if test="amount != null "> and amount = #{amount}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-    </select>
-    
-    <select id="selectTAssayItemExtraById" parameterType="Long" resultMap="TAssayItemExtraResult">
-        <include refid="selectTAssayItemExtraVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTAssayItemExtra" parameterType="TAssayItemExtra" useGeneratedKeys="true" keyProperty="id">
-        insert into t_assay_item_extra
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="itemId != null">item_id,</if>
-            <if test="type != null">type,</if>
-            <if test="relativeId != null">relative_id,</if>
-            <if test="amount != null">amount,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="revision != null">revision,</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>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="itemId != null">#{itemId},</if>
-            <if test="type != null">#{type},</if>
-            <if test="relativeId != null">#{relativeId},</if>
-            <if test="amount != null">#{amount},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="revision != null">#{revision},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTAssayItemExtra" parameterType="TAssayItemExtra">
-        update t_assay_item_extra
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="itemId != null">item_id = #{itemId},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="relativeId != null">relative_id = #{relativeId},</if>
-            <if test="amount != null">amount = #{amount},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="revision != null">revision = #{revision},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTAssayItemExtraById" parameterType="Long">
-        delete from t_assay_item_extra where id = #{id}
-    </delete>
-
-    <delete id="deleteTAssayItemExtraByIds" parameterType="String">
-        delete from t_assay_item_extra where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.TAssayItemExtraMapper">
+    
+    <resultMap type="TAssayItemExtra" id="TAssayItemExtraResult">
+        <result property="id"    column="id"    />
+        <result property="itemId"    column="item_id"    />
+        <result property="type"    column="type"    />
+        <result property="relativeId"    column="relative_id"    />
+        <result property="amount"    column="amount"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTAssayItemExtraVo">
+        select id, item_id, type, relative_id, amount, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_assay_item_extra
+    </sql>
+
+    <select id="selectTAssayItemExtraList" parameterType="TAssayItemExtra" resultMap="TAssayItemExtraResult">
+        <include refid="selectTAssayItemExtraVo"/>
+        <where>
+            1 = 1
+            <if test="itemId != null "> and item_id = #{itemId}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="relativeId != null "> and relative_id = #{relativeId}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTAssayItemExtraById" parameterType="Long" resultMap="TAssayItemExtraResult">
+        <include refid="selectTAssayItemExtraVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertTAssayItemExtra" parameterType="TAssayItemExtra" useGeneratedKeys="true" keyProperty="id">
+        insert into t_assay_item_extra
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="itemId != null">item_id,</if>
+            <if test="type != null">type,</if>
+            <if test="relativeId != null">relative_id,</if>
+            <if test="amount != null">amount,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</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>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="itemId != null">#{itemId},</if>
+            <if test="type != null">#{type},</if>
+            <if test="relativeId != null">#{relativeId},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTAssayItemExtra" parameterType="TAssayItemExtra">
+        update t_assay_item_extra
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="itemId != null">item_id = #{itemId},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="relativeId != null">relative_id = #{relativeId},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTAssayItemExtraById" parameterType="Long">
+        update t_assay_item_extra set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTAssayItemExtraByIds" parameterType="String">
+        update t_assay_item_extra set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

ruoyi-system/src/main/resources/mapper/business/TAssayItemMapper.xml

@@ -1,90 +1,93 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.mapper.TAssayItemMapper">
-    
-    <resultMap type="TAssayItem" id="TAssayItemResult">
-        <result property="id"    column="id"    />
-        <result property="code"    column="code"    />
-        <result property="name"    column="name"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="revision"    column="revision"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTAssayItemVo">
-        select id, code, name, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_assay_item
-    </sql>
-
-    <select id="selectTAssayItemList" parameterType="TAssayItem" resultMap="TAssayItemResult">
-        <include refid="selectTAssayItemVo"/>
-        <where>  
-            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-    </select>
-    
-    <select id="selectTAssayItemById" parameterType="Long" resultMap="TAssayItemResult">
-        <include refid="selectTAssayItemVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTAssayItem" parameterType="TAssayItem" useGeneratedKeys="true" keyProperty="id">
-        insert into t_assay_item
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="code != null">code,</if>
-            <if test="name != null">name,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="revision != null">revision,</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>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="code != null">#{code},</if>
-            <if test="name != null">#{name},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="revision != null">#{revision},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTAssayItem" parameterType="TAssayItem">
-        update t_assay_item
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="code != null">code = #{code},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="revision != null">revision = #{revision},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTAssayItemById" parameterType="Long">
-        delete from t_assay_item where id = #{id}
-    </delete>
-
-    <delete id="deleteTAssayItemByIds" parameterType="String">
-        delete from t_assay_item where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.TAssayItemMapper">
+    
+    <resultMap type="TAssayItem" id="TAssayItemResult">
+        <result property="id"    column="id"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTAssayItemVo">
+        select id, code, name, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_assay_item
+    </sql>
+
+    <select id="selectTAssayItemList" parameterType="TAssayItem" resultMap="TAssayItemResult">
+        <include refid="selectTAssayItemVo"/>
+        <where>
+            1 = 1
+            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTAssayItemById" parameterType="Long" resultMap="TAssayItemResult">
+        <include refid="selectTAssayItemVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertTAssayItem" parameterType="TAssayItem" useGeneratedKeys="true" keyProperty="id">
+        insert into t_assay_item
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="code != null">code,</if>
+            <if test="name != null">name,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</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>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="code != null">#{code},</if>
+            <if test="name != null">#{name},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTAssayItem" parameterType="TAssayItem">
+        update t_assay_item
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="code != null">code = #{code},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTAssayItemById" parameterType="Long">
+        update t_assay_item set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTAssayItemByIds" parameterType="String">
+        update t_assay_item set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

ruoyi-system/src/main/resources/mapper/business/TAssayWorkflowItemMapper.xml

@@ -1,95 +1,98 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.mapper.TAssayWorkflowItemMapper">
-    
-    <resultMap type="TAssayWorkflowItem" id="TAssayWorkflowItemResult">
-        <result property="id"    column="id"    />
-        <result property="workflowId"    column="workflow_id"    />
-        <result property="positionId"    column="position_id"    />
-        <result property="itemId"    column="item_id"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="revision"    column="revision"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTAssayWorkflowItemVo">
-        select id, workflow_id, position_id, item_id, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_assay_workflow_item
-    </sql>
-
-    <select id="selectTAssayWorkflowItemList" parameterType="TAssayWorkflowItem" resultMap="TAssayWorkflowItemResult">
-        <include refid="selectTAssayWorkflowItemVo"/>
-        <where>  
-            <if test="workflowId != null "> and workflow_id = #{workflowId}</if>
-            <if test="positionId != null "> and position_id = #{positionId}</if>
-            <if test="itemId != null "> and item_id = #{itemId}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-    </select>
-    
-    <select id="selectTAssayWorkflowItemById" parameterType="Long" resultMap="TAssayWorkflowItemResult">
-        <include refid="selectTAssayWorkflowItemVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTAssayWorkflowItem" parameterType="TAssayWorkflowItem" useGeneratedKeys="true" keyProperty="id">
-        insert into t_assay_workflow_item
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="workflowId != null">workflow_id,</if>
-            <if test="positionId != null">position_id,</if>
-            <if test="itemId != null">item_id,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="revision != null">revision,</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>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="workflowId != null">#{workflowId},</if>
-            <if test="positionId != null">#{positionId},</if>
-            <if test="itemId != null">#{itemId},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="revision != null">#{revision},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTAssayWorkflowItem" parameterType="TAssayWorkflowItem">
-        update t_assay_workflow_item
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="workflowId != null">workflow_id = #{workflowId},</if>
-            <if test="positionId != null">position_id = #{positionId},</if>
-            <if test="itemId != null">item_id = #{itemId},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="revision != null">revision = #{revision},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTAssayWorkflowItemById" parameterType="Long">
-        delete from t_assay_workflow_item where id = #{id}
-    </delete>
-
-    <delete id="deleteTAssayWorkflowItemByIds" parameterType="String">
-        delete from t_assay_workflow_item where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.TAssayWorkflowItemMapper">
+    
+    <resultMap type="TAssayWorkflowItem" id="TAssayWorkflowItemResult">
+        <result property="id"    column="id"    />
+        <result property="workflowId"    column="workflow_id"    />
+        <result property="positionId"    column="position_id"    />
+        <result property="itemId"    column="item_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTAssayWorkflowItemVo">
+        select id, workflow_id, position_id, item_id, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_assay_workflow_item
+    </sql>
+
+    <select id="selectTAssayWorkflowItemList" parameterType="TAssayWorkflowItem" resultMap="TAssayWorkflowItemResult">
+        <include refid="selectTAssayWorkflowItemVo"/>
+        <where>
+            1 = 1
+            <if test="workflowId != null "> and workflow_id = #{workflowId}</if>
+            <if test="positionId != null "> and position_id = #{positionId}</if>
+            <if test="itemId != null "> and item_id = #{itemId}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTAssayWorkflowItemById" parameterType="Long" resultMap="TAssayWorkflowItemResult">
+        <include refid="selectTAssayWorkflowItemVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertTAssayWorkflowItem" parameterType="TAssayWorkflowItem" useGeneratedKeys="true" keyProperty="id">
+        insert into t_assay_workflow_item
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="workflowId != null">workflow_id,</if>
+            <if test="positionId != null">position_id,</if>
+            <if test="itemId != null">item_id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</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>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="workflowId != null">#{workflowId},</if>
+            <if test="positionId != null">#{positionId},</if>
+            <if test="itemId != null">#{itemId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTAssayWorkflowItem" parameterType="TAssayWorkflowItem">
+        update t_assay_workflow_item
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="workflowId != null">workflow_id = #{workflowId},</if>
+            <if test="positionId != null">position_id = #{positionId},</if>
+            <if test="itemId != null">item_id = #{itemId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTAssayWorkflowItemById" parameterType="Long">
+        update t_assay_workflow_item set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTAssayWorkflowItemByIds" parameterType="String">
+        update t_assay_workflow_item set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

ruoyi-system/src/main/resources/mapper/business/TAssayWorkflowMapper.xml

@@ -1,105 +1,108 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.mapper.TAssayWorkflowMapper">
-    
-    <resultMap type="TAssayWorkflow" id="TAssayWorkflowResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="code"    column="code"    />
-        <result property="organizationId"    column="organization_id"    />
-        <result property="deviceId"    column="device_id"    />
-        <result property="totalSteps"    column="total_steps"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="revision"    column="revision"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTAssayWorkflowVo">
-        select id, name, code, organization_id, device_id, total_steps, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_assay_workflow
-    </sql>
-
-    <select id="selectTAssayWorkflowList" parameterType="TAssayWorkflow" resultMap="TAssayWorkflowResult">
-        <include refid="selectTAssayWorkflowVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
-            <if test="organizationId != null "> and organization_id = #{organizationId}</if>
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
-            <if test="totalSteps != null "> and total_steps = #{totalSteps}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-    </select>
-    
-    <select id="selectTAssayWorkflowById" parameterType="Long" resultMap="TAssayWorkflowResult">
-        <include refid="selectTAssayWorkflowVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTAssayWorkflow" parameterType="TAssayWorkflow" useGeneratedKeys="true" keyProperty="id">
-        insert into t_assay_workflow
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="code != null">code,</if>
-            <if test="organizationId != null">organization_id,</if>
-            <if test="deviceId != null">device_id,</if>
-            <if test="totalSteps != null">total_steps,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="revision != null">revision,</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>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">#{name},</if>
-            <if test="code != null">#{code},</if>
-            <if test="organizationId != null">#{organizationId},</if>
-            <if test="deviceId != null">#{deviceId},</if>
-            <if test="totalSteps != null">#{totalSteps},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="revision != null">#{revision},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTAssayWorkflow" parameterType="TAssayWorkflow">
-        update t_assay_workflow
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
-            <if test="code != null">code = #{code},</if>
-            <if test="organizationId != null">organization_id = #{organizationId},</if>
-            <if test="deviceId != null">device_id = #{deviceId},</if>
-            <if test="totalSteps != null">total_steps = #{totalSteps},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="revision != null">revision = #{revision},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTAssayWorkflowById" parameterType="Long">
-        delete from t_assay_workflow where id = #{id}
-    </delete>
-
-    <delete id="deleteTAssayWorkflowByIds" parameterType="String">
-        delete from t_assay_workflow where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.TAssayWorkflowMapper">
+    
+    <resultMap type="TAssayWorkflow" id="TAssayWorkflowResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="code"    column="code"    />
+        <result property="organizationId"    column="organization_id"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="totalSteps"    column="total_steps"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTAssayWorkflowVo">
+        select id, name, code, organization_id, device_id, total_steps, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_assay_workflow
+    </sql>
+
+    <select id="selectTAssayWorkflowList" parameterType="TAssayWorkflow" resultMap="TAssayWorkflowResult">
+        <include refid="selectTAssayWorkflowVo"/>
+        <where>
+            1 = 1
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
+            <if test="organizationId != null "> and organization_id = #{organizationId}</if>
+            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="totalSteps != null "> and total_steps = #{totalSteps}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTAssayWorkflowById" parameterType="Long" resultMap="TAssayWorkflowResult">
+        <include refid="selectTAssayWorkflowVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertTAssayWorkflow" parameterType="TAssayWorkflow" useGeneratedKeys="true" keyProperty="id">
+        insert into t_assay_workflow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="code != null">code,</if>
+            <if test="organizationId != null">organization_id,</if>
+            <if test="deviceId != null">device_id,</if>
+            <if test="totalSteps != null">total_steps,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</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>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="code != null">#{code},</if>
+            <if test="organizationId != null">#{organizationId},</if>
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="totalSteps != null">#{totalSteps},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTAssayWorkflow" parameterType="TAssayWorkflow">
+        update t_assay_workflow
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="organizationId != null">organization_id = #{organizationId},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="totalSteps != null">total_steps = #{totalSteps},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTAssayWorkflowById" parameterType="Long">
+        update t_assay_workflow set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTAssayWorkflowByIds" parameterType="String">
+        update t_assay_workflow set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

ruoyi-system/src/main/resources/mapper/business/TMedicineMapper.xml

@@ -1,90 +1,93 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.mapper.TMedicineMapper">
-    
-    <resultMap type="TMedicine" id="TMedicineResult">
-        <result property="id"    column="id"    />
-        <result property="code"    column="code"    />
-        <result property="name"    column="name"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="revision"    column="revision"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTMedicineVo">
-        select id, code, name, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_medicine
-    </sql>
-
-    <select id="selectTMedicineList" parameterType="TMedicine" resultMap="TMedicineResult">
-        <include refid="selectTMedicineVo"/>
-        <where>  
-            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-    </select>
-    
-    <select id="selectTMedicineById" parameterType="Long" resultMap="TMedicineResult">
-        <include refid="selectTMedicineVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTMedicine" parameterType="TMedicine" useGeneratedKeys="true" keyProperty="id">
-        insert into t_medicine
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="code != null">code,</if>
-            <if test="name != null">name,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="revision != null">revision,</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>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="code != null">#{code},</if>
-            <if test="name != null">#{name},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="revision != null">#{revision},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTMedicine" parameterType="TMedicine">
-        update t_medicine
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="code != null">code = #{code},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="revision != null">revision = #{revision},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTMedicineById" parameterType="Long">
-        delete from t_medicine where id = #{id}
-    </delete>
-
-    <delete id="deleteTMedicineByIds" parameterType="String">
-        delete from t_medicine where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.TMedicineMapper">
+    
+    <resultMap type="TMedicine" id="TMedicineResult">
+        <result property="id"    column="id"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTMedicineVo">
+        select id, code, name, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_medicine
+    </sql>
+
+    <select id="selectTMedicineList" parameterType="TMedicine" resultMap="TMedicineResult">
+        <include refid="selectTMedicineVo"/>
+        <where>
+            1 = 1
+            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTMedicineById" parameterType="Long" resultMap="TMedicineResult">
+        <include refid="selectTMedicineVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertTMedicine" parameterType="TMedicine" useGeneratedKeys="true" keyProperty="id">
+        insert into t_medicine
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="code != null">code,</if>
+            <if test="name != null">name,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</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>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="code != null">#{code},</if>
+            <if test="name != null">#{name},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTMedicine" parameterType="TMedicine">
+        update t_medicine
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="code != null">code = #{code},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTMedicineById" parameterType="Long">
+        update t_medicine set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTMedicineByIds" parameterType="String">
+        update t_medicine set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

ruoyi-system/src/main/resources/mapper/business/TOrganizationMapper.xml

@@ -1,155 +1,158 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.mapper.TOrganizationMapper">
-    
-    <resultMap type="TOrganization" id="TOrganizationResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="code"    column="code"    />
-        <result property="type"    column="type"    />
-        <result property="provinceCode"    column="province_code"    />
-        <result property="cityCode"    column="city_code"    />
-        <result property="countryCode"    column="country_code"    />
-        <result property="concat"    column="concat"    />
-        <result property="phone"    column="phone"    />
-        <result property="status"    column="status"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="topId"    column="top_id"    />
-        <result property="sort"    column="sort"    />
-        <result property="address"    column="address"    />
-        <result property="longitude"    column="longitude"    />
-        <result property="latitude"    column="latitude"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="revision"    column="revision"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTOrganizationVo">
-        select id, name, code, type, province_code, city_code, country_code, concat, phone, status, parent_id, top_id, sort, address, longitude, latitude, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_organization
-    </sql>
-
-    <select id="selectTOrganizationList" parameterType="TOrganization" resultMap="TOrganizationResult">
-        <include refid="selectTOrganizationVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="provinceCode != null  and provinceCode != ''"> and province_code = #{provinceCode}</if>
-            <if test="cityCode != null  and cityCode != ''"> and city_code = #{cityCode}</if>
-            <if test="countryCode != null  and countryCode != ''"> and country_code = #{countryCode}</if>
-            <if test="concat != null  and concat != ''"> and concat = #{concat}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="parentId != null "> and parent_id = #{parentId}</if>
-            <if test="topId != null "> and top_id = #{topId}</if>
-            <if test="sort != null "> and sort = #{sort}</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
-            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-    </select>
-    
-    <select id="selectTOrganizationById" parameterType="Long" resultMap="TOrganizationResult">
-        <include refid="selectTOrganizationVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTOrganization" parameterType="TOrganization" useGeneratedKeys="true" keyProperty="id">
-        insert into t_organization
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="code != null">code,</if>
-            <if test="type != null">type,</if>
-            <if test="provinceCode != null">province_code,</if>
-            <if test="cityCode != null">city_code,</if>
-            <if test="countryCode != null">country_code,</if>
-            <if test="concat != null">concat,</if>
-            <if test="phone != null">phone,</if>
-            <if test="status != null">status,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="topId != null">top_id,</if>
-            <if test="sort != null">sort,</if>
-            <if test="address != null">address,</if>
-            <if test="longitude != null">longitude,</if>
-            <if test="latitude != null">latitude,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="revision != null">revision,</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>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">#{name},</if>
-            <if test="code != null">#{code},</if>
-            <if test="type != null">#{type},</if>
-            <if test="provinceCode != null">#{provinceCode},</if>
-            <if test="cityCode != null">#{cityCode},</if>
-            <if test="countryCode != null">#{countryCode},</if>
-            <if test="concat != null">#{concat},</if>
-            <if test="phone != null">#{phone},</if>
-            <if test="status != null">#{status},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="topId != null">#{topId},</if>
-            <if test="sort != null">#{sort},</if>
-            <if test="address != null">#{address},</if>
-            <if test="longitude != null">#{longitude},</if>
-            <if test="latitude != null">#{latitude},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="revision != null">#{revision},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTOrganization" parameterType="TOrganization">
-        update t_organization
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
-            <if test="code != null">code = #{code},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="provinceCode != null">province_code = #{provinceCode},</if>
-            <if test="cityCode != null">city_code = #{cityCode},</if>
-            <if test="countryCode != null">country_code = #{countryCode},</if>
-            <if test="concat != null">concat = #{concat},</if>
-            <if test="phone != null">phone = #{phone},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="topId != null">top_id = #{topId},</if>
-            <if test="sort != null">sort = #{sort},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="longitude != null">longitude = #{longitude},</if>
-            <if test="latitude != null">latitude = #{latitude},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="revision != null">revision = #{revision},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTOrganizationById" parameterType="Long">
-        delete from t_organization where id = #{id}
-    </delete>
-
-    <delete id="deleteTOrganizationByIds" parameterType="String">
-        delete from t_organization where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.TOrganizationMapper">
+    
+    <resultMap type="TOrganization" id="TOrganizationResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="code"    column="code"    />
+        <result property="type"    column="type"    />
+        <result property="provinceCode"    column="province_code"    />
+        <result property="cityCode"    column="city_code"    />
+        <result property="countryCode"    column="country_code"    />
+        <result property="concat"    column="concat"    />
+        <result property="phone"    column="phone"    />
+        <result property="status"    column="status"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="topId"    column="top_id"    />
+        <result property="sort"    column="sort"    />
+        <result property="address"    column="address"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTOrganizationVo">
+        select id, name, code, type, province_code, city_code, country_code, concat, phone, status, parent_id, top_id, sort, address, longitude, latitude, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_organization
+    </sql>
+
+    <select id="selectTOrganizationList" parameterType="TOrganization" resultMap="TOrganizationResult">
+        <include refid="selectTOrganizationVo"/>
+        <where>
+            1 = 1
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="provinceCode != null  and provinceCode != ''"> and province_code = #{provinceCode}</if>
+            <if test="cityCode != null  and cityCode != ''"> and city_code = #{cityCode}</if>
+            <if test="countryCode != null  and countryCode != ''"> and country_code = #{countryCode}</if>
+            <if test="concat != null  and concat != ''"> and concat = #{concat}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="parentId != null "> and parent_id = #{parentId}</if>
+            <if test="topId != null "> and top_id = #{topId}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
+            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTOrganizationById" parameterType="Long" resultMap="TOrganizationResult">
+        <include refid="selectTOrganizationVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertTOrganization" parameterType="TOrganization" useGeneratedKeys="true" keyProperty="id">
+        insert into t_organization
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="code != null">code,</if>
+            <if test="type != null">type,</if>
+            <if test="provinceCode != null">province_code,</if>
+            <if test="cityCode != null">city_code,</if>
+            <if test="countryCode != null">country_code,</if>
+            <if test="concat != null">concat,</if>
+            <if test="phone != null">phone,</if>
+            <if test="status != null">status,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="topId != null">top_id,</if>
+            <if test="sort != null">sort,</if>
+            <if test="address != null">address,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</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>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="code != null">#{code},</if>
+            <if test="type != null">#{type},</if>
+            <if test="provinceCode != null">#{provinceCode},</if>
+            <if test="cityCode != null">#{cityCode},</if>
+            <if test="countryCode != null">#{countryCode},</if>
+            <if test="concat != null">#{concat},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="status != null">#{status},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="topId != null">#{topId},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="address != null">#{address},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTOrganization" parameterType="TOrganization">
+        update t_organization
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="provinceCode != null">province_code = #{provinceCode},</if>
+            <if test="cityCode != null">city_code = #{cityCode},</if>
+            <if test="countryCode != null">country_code = #{countryCode},</if>
+            <if test="concat != null">concat = #{concat},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="topId != null">top_id = #{topId},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTOrganizationById" parameterType="Long">
+        update t_organization set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTOrganizationByIds" parameterType="String">
+        update t_organization set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

ruoyi-system/src/main/resources/mapper/business/TPositionMapper.xml

@@ -1,100 +1,103 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.mapper.TPositionMapper">
-    
-    <resultMap type="TPosition" id="TPositionResult">
-        <result property="id"    column="id"    />
-        <result property="organizationId"    column="organization_id"    />
-        <result property="deviceId"    column="device_id"    />
-        <result property="code"    column="code"    />
-        <result property="name"    column="name"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="revision"    column="revision"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTPositionVo">
-        select id, organization_id, device_id, code, name, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_position
-    </sql>
-
-    <select id="selectTPositionList" parameterType="TPosition" resultMap="TPositionResult">
-        <include refid="selectTPositionVo"/>
-        <where>  
-            <if test="organizationId != null "> and organization_id = #{organizationId}</if>
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
-            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-    </select>
-    
-    <select id="selectTPositionById" parameterType="Long" resultMap="TPositionResult">
-        <include refid="selectTPositionVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTPosition" parameterType="TPosition" useGeneratedKeys="true" keyProperty="id">
-        insert into t_position
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="organizationId != null">organization_id,</if>
-            <if test="deviceId != null">device_id,</if>
-            <if test="code != null">code,</if>
-            <if test="name != null">name,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="revision != null">revision,</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>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="organizationId != null">#{organizationId},</if>
-            <if test="deviceId != null">#{deviceId},</if>
-            <if test="code != null">#{code},</if>
-            <if test="name != null">#{name},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="revision != null">#{revision},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTPosition" parameterType="TPosition">
-        update t_position
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="organizationId != null">organization_id = #{organizationId},</if>
-            <if test="deviceId != null">device_id = #{deviceId},</if>
-            <if test="code != null">code = #{code},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="revision != null">revision = #{revision},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTPositionById" parameterType="Long">
-        delete from t_position where id = #{id}
-    </delete>
-
-    <delete id="deleteTPositionByIds" parameterType="String">
-        delete from t_position where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.TPositionMapper">
+    
+    <resultMap type="TPosition" id="TPositionResult">
+        <result property="id"    column="id"    />
+        <result property="organizationId"    column="organization_id"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTPositionVo">
+        select id, organization_id, device_id, code, name, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_position
+    </sql>
+
+    <select id="selectTPositionList" parameterType="TPosition" resultMap="TPositionResult">
+        <include refid="selectTPositionVo"/>
+        <where>
+            1 = 1
+            <if test="organizationId != null "> and organization_id = #{organizationId}</if>
+            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTPositionById" parameterType="Long" resultMap="TPositionResult">
+        <include refid="selectTPositionVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertTPosition" parameterType="TPosition" useGeneratedKeys="true" keyProperty="id">
+        insert into t_position
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="organizationId != null">organization_id,</if>
+            <if test="deviceId != null">device_id,</if>
+            <if test="code != null">code,</if>
+            <if test="name != null">name,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</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>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="organizationId != null">#{organizationId},</if>
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="code != null">#{code},</if>
+            <if test="name != null">#{name},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPosition" parameterType="TPosition">
+        update t_position
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="organizationId != null">organization_id = #{organizationId},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTPositionById" parameterType="Long">
+        update t_position set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTPositionByIds" parameterType="String">
+        update t_position set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

ruoyi-system/src/main/resources/mapper/business/TQualityConfMapper.xml

@@ -1,120 +1,123 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.mapper.TQualityConfMapper">
-    
-    <resultMap type="TQualityConf" id="TQualityConfResult">
-        <result property="id"    column="id"    />
-        <result property="organizationId"    column="organization_id"    />
-        <result property="itemId"    column="item_id"    />
-        <result property="resultValue"    column="result_value"    />
-        <result property="floatRate"    column="float_rate"    />
-        <result property="highValue"    column="high_value"    />
-        <result property="lowValue"    column="low_value"    />
-        <result property="beginTime"    column="begin_time"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="revision"    column="revision"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTQualityConfVo">
-        select id, organization_id, item_id, result_value, float_rate, high_value, low_value, begin_time, end_time, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_quality_conf
-    </sql>
-
-    <select id="selectTQualityConfList" parameterType="TQualityConf" resultMap="TQualityConfResult">
-        <include refid="selectTQualityConfVo"/>
-        <where>  
-            <if test="organizationId != null "> and organization_id = #{organizationId}</if>
-            <if test="itemId != null "> and item_id = #{itemId}</if>
-            <if test="resultValue != null "> and result_value = #{resultValue}</if>
-            <if test="floatRate != null "> and float_rate = #{floatRate}</if>
-            <if test="highValue != null "> and high_value = #{highValue}</if>
-            <if test="lowValue != null "> and low_value = #{lowValue}</if>
-            <if test="beginTime != null "> and begin_time = #{beginTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-    </select>
-    
-    <select id="selectTQualityConfById" parameterType="Long" resultMap="TQualityConfResult">
-        <include refid="selectTQualityConfVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTQualityConf" parameterType="TQualityConf" useGeneratedKeys="true" keyProperty="id">
-        insert into t_quality_conf
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="organizationId != null">organization_id,</if>
-            <if test="itemId != null">item_id,</if>
-            <if test="resultValue != null">result_value,</if>
-            <if test="floatRate != null">float_rate,</if>
-            <if test="highValue != null">high_value,</if>
-            <if test="lowValue != null">low_value,</if>
-            <if test="beginTime != null">begin_time,</if>
-            <if test="endTime != null">end_time,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="revision != null">revision,</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>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="organizationId != null">#{organizationId},</if>
-            <if test="itemId != null">#{itemId},</if>
-            <if test="resultValue != null">#{resultValue},</if>
-            <if test="floatRate != null">#{floatRate},</if>
-            <if test="highValue != null">#{highValue},</if>
-            <if test="lowValue != null">#{lowValue},</if>
-            <if test="beginTime != null">#{beginTime},</if>
-            <if test="endTime != null">#{endTime},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="revision != null">#{revision},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTQualityConf" parameterType="TQualityConf">
-        update t_quality_conf
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="organizationId != null">organization_id = #{organizationId},</if>
-            <if test="itemId != null">item_id = #{itemId},</if>
-            <if test="resultValue != null">result_value = #{resultValue},</if>
-            <if test="floatRate != null">float_rate = #{floatRate},</if>
-            <if test="highValue != null">high_value = #{highValue},</if>
-            <if test="lowValue != null">low_value = #{lowValue},</if>
-            <if test="beginTime != null">begin_time = #{beginTime},</if>
-            <if test="endTime != null">end_time = #{endTime},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="revision != null">revision = #{revision},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTQualityConfById" parameterType="Long">
-        delete from t_quality_conf where id = #{id}
-    </delete>
-
-    <delete id="deleteTQualityConfByIds" parameterType="String">
-        delete from t_quality_conf where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.TQualityConfMapper">
+    
+    <resultMap type="TQualityConf" id="TQualityConfResult">
+        <result property="id"    column="id"    />
+        <result property="organizationId"    column="organization_id"    />
+        <result property="itemId"    column="item_id"    />
+        <result property="resultValue"    column="result_value"    />
+        <result property="floatRate"    column="float_rate"    />
+        <result property="highValue"    column="high_value"    />
+        <result property="lowValue"    column="low_value"    />
+        <result property="beginTime"    column="begin_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTQualityConfVo">
+        select id, organization_id, item_id, result_value, float_rate, high_value, low_value, begin_time, end_time, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_quality_conf
+    </sql>
+
+    <select id="selectTQualityConfList" parameterType="TQualityConf" resultMap="TQualityConfResult">
+        <include refid="selectTQualityConfVo"/>
+        <where>
+            1 = 1
+            <if test="organizationId != null "> and organization_id = #{organizationId}</if>
+            <if test="itemId != null "> and item_id = #{itemId}</if>
+            <if test="resultValue != null "> and result_value = #{resultValue}</if>
+            <if test="floatRate != null "> and float_rate = #{floatRate}</if>
+            <if test="highValue != null "> and high_value = #{highValue}</if>
+            <if test="lowValue != null "> and low_value = #{lowValue}</if>
+            <if test="beginTime != null "> and begin_time = #{beginTime}</if>
+            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTQualityConfById" parameterType="Long" resultMap="TQualityConfResult">
+        <include refid="selectTQualityConfVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertTQualityConf" parameterType="TQualityConf" useGeneratedKeys="true" keyProperty="id">
+        insert into t_quality_conf
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="organizationId != null">organization_id,</if>
+            <if test="itemId != null">item_id,</if>
+            <if test="resultValue != null">result_value,</if>
+            <if test="floatRate != null">float_rate,</if>
+            <if test="highValue != null">high_value,</if>
+            <if test="lowValue != null">low_value,</if>
+            <if test="beginTime != null">begin_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</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>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="organizationId != null">#{organizationId},</if>
+            <if test="itemId != null">#{itemId},</if>
+            <if test="resultValue != null">#{resultValue},</if>
+            <if test="floatRate != null">#{floatRate},</if>
+            <if test="highValue != null">#{highValue},</if>
+            <if test="lowValue != null">#{lowValue},</if>
+            <if test="beginTime != null">#{beginTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTQualityConf" parameterType="TQualityConf">
+        update t_quality_conf
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="organizationId != null">organization_id = #{organizationId},</if>
+            <if test="itemId != null">item_id = #{itemId},</if>
+            <if test="resultValue != null">result_value = #{resultValue},</if>
+            <if test="floatRate != null">float_rate = #{floatRate},</if>
+            <if test="highValue != null">high_value = #{highValue},</if>
+            <if test="lowValue != null">low_value = #{lowValue},</if>
+            <if test="beginTime != null">begin_time = #{beginTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTQualityConfById" parameterType="Long">
+        update t_quality_conf set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTQualityConfByIds" parameterType="String">
+        update t_quality_conf set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>