Merge remote-tracking branch 'origin/master'

fuliqi

2025-01-20 9e28453dba6ecf93c6c2234ba38def7c41cf12f0

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

@@ -94,7 +94,8 @@
            TPURI.wechat as TPURI_wechat,
            TPURI.contact_address as TPURI_contact_address,
            TPURI.post_code as TPURI_post_code,
            TPURI.email as TPURI_email
            TPURI.email as TPURI_email,
            TPI.coding
        FROM
            t_project_info TPI
        LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0
@@ -102,6 +103,7 @@
        LEFT JOIN t_project_investment_policy_compliance TPIPC ON TPI.id = TPIPC.project_id and TPIPC.deleted = 0
        LEFT JOIN t_project_unit_registration_info TPURI ON TPI.id = TPURI.project_id and TPURI.deleted = 0
        LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
        LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit
        <where>
            TPI.deleted = 0
            <if test="query.projectName !=null and query.projectName!=''">
@@ -149,19 +151,36 @@
            <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
                and TPP.process_ins_id is not null
            </if>
            <if test="query.projectCategory == null">
                and TPI.used_status = 2
            </if>
            <if test="query.projectCategory == 3">
                and (TPI.project_status = 'working' or TPI.project_status = 'stop')
            </if>
            <if test="query.projectCategory == 6">
                <if test="query.role == 0">
                    and TPI.create_by = #{query.createBy}
                </if>
                <if test="query.role == 1">
                    and TPI.used_status = #{query.usedStatus}
                </if>
            </if>
            ${query.params.dataScope}
        </where>
        order by TPI.gmt_create
    </select>

    <select id="homeCount" resultType="com.ycl.domain.vo.ProjectVO">
    <select id="homeCount" parameterType="com.ycl.common.core.domain.BaseEntity" resultType="com.ycl.domain.vo.ProjectVO">
        SELECT TPI.*,TPIF.total_investment,TPP.process_ins_id as processId
        FROM t_project_info TPI
        LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0
        LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
        WHERE TPI.deleted = 0
        LEFT JOIN sys_dept d ON TPI.project_owner_unit = d.dept_id
        <where>
            TPI.deleted = 0
            ${params.dataScope}
        </where>

    </select>

    <select id="selectProjectDetailByIds" resultType="com.ycl.domain.vo.ProjectVO">