Merge remote-tracking branch 'origin/master'

fuliqi

2025-01-20 9e28453dba6ecf93c6c2234ba38def7c41cf12f0

 business/src/main/resources/mapper/ProjectProcessMapper.xml

@@ -37,7 +37,8 @@
        <result column="gmt_update_time" property="gmtUpdateTime" />
        <result column="update_by" property="updateBy" />
        <result column="create_by" property="createBy" />
        <result column="flowable_process_id" property="flowableProcessId" />
        <result column="process_def_id" property="processDefId" />
        <result column="process_ins_id" property="processInsId" />
<!--        <association property="id" column=""-->
    </resultMap>

@@ -47,7 +48,7 @@
    <select id="getById" resultMap="BaseResultMap">
        SELECT
            TPP.project_id,
            TPP.flowable_process_id,
            TPP.process_def_id,
            TPP.id
        FROM
            t_project_process TPP
@@ -59,10 +60,12 @@
    <select id="getPage" resultMap="BaseResultMap">
        SELECT
            PI.*,
            TPP.flowable_process_id
            TPP.process_def_id,
            TPP.process_ins_id
        FROM
            t_project_info PI
                LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0 AND PI.deleted = 0
                LEFT JOIN sys_dept d ON d.dept_id = PI.project_owner_unit
        <where>
            <if test="query.projectName != null and query.projectName != ''">
                AND PI.project_name like concat('%', #{query.projectName}, '%')
@@ -70,8 +73,18 @@
            <if test="query.projectCode != null and query.projectCode != ''">
                AND PI.project_code like concat('%', #{query.projectCode}, '%')
            </if>
            ${query.params.dataScope}
        </where>

    </select>


    <select id="getProjectInfo" parameterType="string" resultType="com.ycl.domain.entity.ProjectInfo">
        SELECT
               PI.id, PI.project_name
        FROM
             t_project_process PP
                 INNER JOIN t_project_info PI ON PP.project_id = PI.id AND PI.deleted = 0 AND PP.process_ins_id = #{processInsId}
    </select>

</mapper>