From f65ab2769358c73ec7eefd0b74be6a6f6c817d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sat, 24 Feb 2024 23:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/project/ProProjectApplyMapper.xml       | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml b/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml
index 652bb0e..1042fe9 100644
--- a/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml
+++ b/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml
@@ -8,6 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="projId"    column="proj_id"    />
+        <result property="projName"    column="proj_name"    />
+        <result property="parProjName"    column="par_proj_name"    />
         <result property="applyType"    column="apply_type"    />
         <result property="applyStatus"    column="apply_status"    />
         <result property="applyReason"    column="apply_reason"    />
@@ -50,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProProjectApplyVo">
-        select id, dept_id, proj_id, apply_type, apply_status, apply_reason, apply_files, apply_user, use_time, is_del, create_by, create_time, update_by, update_time, remark from pro_project_apply
+        select id, dept_id, proj_id, proj_name, par_proj_name, apply_type, apply_status, apply_reason, apply_files, apply_user, use_time, is_del, create_by, create_time, update_by, update_time, remark from pro_project_apply
     </sql>
 
     <select id="selectProProjectApplyList" parameterType="ProProjectApply" resultMap="ProProjectApplyResult">
@@ -58,6 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="projId != null "> and proj_id = #{projId}</if>
+            <if test="projName != null  and projName != ''"> and proj_name like concat('%', #{projName}, '%')</if>
+            <if test="parProjName != null  and parProjName != ''"> and par_proj_name like concat('%', #{parProjName}, '%')</if>
             <if test="applyType != null  and applyType != ''"> and apply_type = #{applyType}</if>
             <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
             <if test="applyUser != null "> and apply_user = #{applyUser}</if>
@@ -67,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectProProjectApplyById" parameterType="Long" resultMap="ProProjectApplyProProjectApplyDetailResult">
-        select a.id, a.dept_id, a.proj_id, a.apply_type, a.apply_status, a.apply_reason, a.apply_files, a.apply_user, a.use_time, a.is_del, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
+        select a.id, a.dept_id, a.proj_id, a.proj_name, a.par_proj_name, a.apply_type, a.apply_status, a.apply_reason, a.apply_files, a.apply_user, a.use_time, a.is_del, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
  b.id as sub_id, b.apply_id as sub_apply_id, b.super_type_id as sub_super_type_id, b.super_type_name as sub_super_type_name, b.type_id as sub_type_id, b.type_name as sub_type_name, b.assets_id as sub_assets_id, b.assets_name as sub_assets_name, b.assets_unit as sub_assets_unit, b.number as sub_number, b.use_time as sub_use_time, b.use_reason as sub_use_reason, b.price as sub_price, b.total_price as sub_total_price, b.is_del as sub_is_del, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from pro_project_apply a
         left join pro_project_apply_detail b on b.apply_id = a.id
@@ -80,6 +84,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">id,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="projId != null">proj_id,</if>
+            <if test="projName != null">proj_name,</if>
+            <if test="parProjName != null">par_proj_name,</if>
             <if test="applyType != null">apply_type,</if>
             <if test="applyStatus != null">apply_status,</if>
             <if test="applyReason != null">apply_reason,</if>
@@ -97,6 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">#{id},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="projId != null">#{projId},</if>
+            <if test="projName != null">#{projName},</if>
+            <if test="parProjName != null">#{parProjName},</if>
             <if test="applyType != null">#{applyType},</if>
             <if test="applyStatus != null">#{applyStatus},</if>
             <if test="applyReason != null">#{applyReason},</if>
@@ -117,6 +125,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="projId != null">proj_id = #{projId},</if>
+            <if test="projName != null">proj_name = #{projName},</if>
+            <if test="parProjName != null">par_proj_name = #{parProjName},</if>
             <if test="applyType != null">apply_type = #{applyType},</if>
             <if test="applyStatus != null">apply_status = #{applyStatus},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>