From 47d330d27fb88e85a40e64e5423f73b0b29c088e Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期一, 17 三月 2025 17:03:22 +0800 Subject: [PATCH] 修改 --- signature/src/main/resources/mapper/sign/SignatureItemMapper.xml | 70 +++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 28 deletions(-) diff --git a/signature/src/main/resources/mapper/sign/SignatureItemMapper.xml b/signature/src/main/resources/mapper/sign/SignatureItemMapper.xml index 4523301..a2d0970 100644 --- a/signature/src/main/resources/mapper/sign/SignatureItemMapper.xml +++ b/signature/src/main/resources/mapper/sign/SignatureItemMapper.xml @@ -13,24 +13,26 @@ <result property="deptName" column="item_dept_name"/> <result property="originateTime" column="originate_time"/> <result property="initiaiUserId" column="initiai_user_id"/> - <result property="initiaiUserName" column="initiaiUserid"/> + <result property="initiaiUserName" column="initiai_user_name"/> <result property="itemFile" column="item_file"/> <result property="itemStatus" column="item_status"/> <result property="delFlag" column="del_flag"/> - <collection property="signatureFlows" javaType="java.util.List" resultMap="signatureItemRep"/> +<!-- <collection property="signatureFlows" javaType="java.util.List" resultMap="signatureItemRep"/>--> </resultMap> <resultMap id="signatureItemRep" type="com.gkhy.sign.dto.rep.SignatureFlowRep"> <result property="itemId" column="item_id"/> <result property="userId" column="user_id"/> - <result property="userName" column="userName"/> + <result property="userName" column="user_name"/> <result property="deptId" column="dept_id"/> + <result property="deptName" column="dept_name"/> <result property="signUserId" column="sign_user_id"/> <result property="signUserName" column="sign_user_name"/> <result property="signDeptId" column="sign_dept_id"/> <result property="signDeptName" column="sign_dept_name"/> <result property="signFile" column="sign_file"/> <result property="signStatus" column="sign_status"/> + <result property="sort" column="sort"/> </resultMap> <insert id="insertSignatureItem" parameterType="SignatureItem" useGeneratedKeys="true" keyProperty="id"> INSERT INTO `signature`.`signature_item` @@ -40,7 +42,7 @@ <if test="templateId != null">template_id,</if> <if test="deptId != null">dept_id,</if> <if test="originateTime != null">originate_time,</if> - <if test="initialUserId != null">initiai_user_id,</if> + <if test="initiaiUserId != null">initiai_user_id,</if> <if test="filePath != null and filePath != ''">file_path,</if> <if test="status != null">status,</if> <if test="delFlag != null">del_flag,</if> @@ -55,7 +57,7 @@ <if test="templateId != null">#{templateId},</if> <if test="deptId != null">#{deptId},</if> <if test="originateTime != null">#{originateTime},</if> - <if test="initialUserId != null">#{initialUserId},</if> + <if test="initiaiUserId != null">#{initiaiUserId},</if> <if test="filePath != null and filePath != ''">#{filePath},</if> <if test="status != null">#{status},</if> <if test="delFlag != null">#{delFlag},</if> @@ -65,15 +67,33 @@ <if test="updateTime != null">#{updateTime},</if> </trim> </insert> + <update id="updateByItemId"> + update signature_item + <trim prefix="SET" suffixOverrides=","> + <if test="itemName != null and itemName != ''">item_name = #{itemName},</if> + <if test="templateId != null">template_id = #{templateId},</if> + <if test="deptId != null">dept_id = #{deptId},</if> + <if test="originateTime != null">originate_time = #{originateTime},</if> + <if test="initiaiUserId != null">initiai_user_id = #{initiaiUserId},</if> + <if test="filePath != null and filePath != ''">file_path = #{filePath},</if> + <if test="status != null"> status = #{status},</if> + <if test="delFlag != null">del_flag = #{delFlag},</if> + <if test="createBy != null and createBy != ''"> create_by = #{createBy},</if> + <if test="createTime != null">create_time = #{createTime},</if> + <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> + <if test="updateTime != null">update_time = #{updateTime},</if> + </trim> + where id = #{id} + </update> <delete id="deleteItemByIds"> - update signature_item set del_flag = 2 where id in - <foreach item="id" collection="array" open="(" separator="," close=")"> - #{id} - </foreach> + update signature_item set del_flag = 2 where id = #{ids} </delete> - <select id="getItemList" resultMap="signatureItemRep"> + + +<!-- LEFT JOIN signature_flow sf ON si.id = sf.item_id--> + <select id="getItemList" resultMap="itemVo"> SELECT si.id, si.item_name, @@ -82,37 +102,31 @@ si.dept_id as itme_dept_id, sd.dept_name as item_dept_name, si.originate_time, - su.user_name AS initiai_user_name, + su.nick_name AS initiai_user_name, si.initiai_user_id, st.file_path as item_file, si.`status` as item_status, - si.del_flag, - sf.item_id, - sf.user_id, - sf.user_name, - sf.dept_id, - sf.dept_name, - sf.sign_user_id, - sf.sign_user_name, - sf.sign_dept_id, - sf.sign_dept_name, - sf.file_path as sign_file, - sf.status as sign_status + si.del_flag FROM signature_item si LEFT JOIN signature_template st ON si.template_id = st.id LEFT JOIN signature_type sty ON st.type_id = sty.id LEFT JOIN sys_dept sd ON si.dept_id = sd.dept_id LEFT JOIN sys_user su ON si.initiai_user_id = su.user_id - LEFT JOIN signature_flow sf ON si.id = sf.item_id <where> + si.del_flag = 0 + <if test="userId != null"> + AND si.id IN ( + SELECT DISTINCT si.id + FROM signature_item si + LEFT JOIN signature_flow sf ON si.id = sf.item_id + WHERE sf.sign_user_id = #{userId} + ) + </if> <if test="status != null"> and si.status = #{status} </if> - <if test="userId != null"> - and sf.user_id = #{userId} - </if> </where> - ORDER BY si.id + ORDER BY si.create_time desc </select> </mapper> \ No newline at end of file -- Gitblit v1.9.2