下面阶段查询bug

xiangpei

2025-02-24 4894ff5d3dded33b4d50c5cba7c3659f340ae9a7

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

@@ -74,6 +74,7 @@
            TPIF.county_fiscal_investment as TPIF_county_fiscal_investment,TPIF.county_special_fund_investment as TPIF_county_special_fund_investment,
            TPIF.domestic_loan_total as TPIF_domestic_loan_total,TPIF.bank_loan as TPIF_bank_loan,TPIF.foreign_investment_total as TPIF_foreign_investment_total,
            TPIF.enterprise_self_raised_total as TPIF_enterprise_self_raised_total,TPIF.other_investment_total as TPIF_other_investment_total,
            TPIF.dept_bond as TPIF_dept_bond,TPIF.national_debt as TPID_national_debt,
            TPII.be_cross_region as TPII_be_cross_region,TPII.construction_location as TPII_construction_location,
            TPII.detailed_address as TPII_detailed_address,TPII.be_compensation_project as TPII_be_compensation_project,TPII.compensation_reason as TPII_compensation_reason,
            TPII.planned_start_date as TPII_planned_start_date,TPII.expected_completion_date as TPII_expected_completion_date,
@@ -131,17 +132,14 @@
            <if test="query.projectStatus !=null and query.projectStatus!=''">
                and TPI.project_status = #{query.projectStatus}
            </if>
            <if test="query.projectPhase !=null and query.projectPhase!=''">
            <if test="query.projectPhase !=null and query.projectPhase!='' and query.projectPhase!=6 and query.projectPhase!=5">
                and TPI.project_phase = #{query.projectPhase}
            </if>
<!--            <if test=" assignmentStatus !=null and assignmentStatus!=''">-->
<!--                and TPI.project_phase = #{projectPhase}-->
<!--            </if>-->
            <if test="query.projectPhase != null and query.projectPhase != 5 ">
                and TPI.used_status = 2
            </if>
            <if test="query.fundType !=null and query.fundType!=''">
                and TPI.fund_type = #{query.fundType}
            </if>
            <if test="query.projectPhase !=null and query.projectPhase!=''">
                and TPI.project_phase = #{query.projectPhase}
            </if>
            <if test="query.investType !=null and query.investType!=''">
                and TPI.invest_type = #{query.investType}
@@ -152,28 +150,22 @@
            <if test="query.projectStartTime !=null and query.projectEndTime !=null">
                and TPI.create_project_time between #{query.projectStartTime} and #{query.projectEndTime}
            </if>
            <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'reserve'">
                and TPP.process_ins_id is null
            </if>
            <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
                and TPP.process_ins_id is not null
            </if>
            <if test="query.projectCategory != 6">
                and TPI.used_status = 2
            </if>
            <if test="query.projectCategory == 3">
<!--            <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'reserve'">-->
<!--                and TPP.process_ins_id is null-->
<!--            </if>-->
<!--            <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">-->
<!--                and TPP.process_ins_id is not null-->
<!--            </if>-->
            <if test="query.projectPhase == 3">
                and (TPI.project_status = 'working' or TPI.project_status = 'stop')
            </if>
            <if test="query.projectCategory == 6">
<!--                <if test="query.role == 0">-->
<!--                    and TPI.used_status != 2-->
<!--                </if>-->
                <if test="query.role == 1">
            <if test="query.projectPhase == null">
                <if test="query.role != null and query.role == 1">
                    and TPI.used_status = 1 and  FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
                </if>
            </if>
            <!-- 业主数据权限 -->
            <if test="query.role == 0">
            <if test="query.role != null and query.role == 0">
                ${query.params.dataScope}
            </if>
        </where>
@@ -205,6 +197,8 @@
        TPIF.county_investment_total,TPIF.county_budget_investment,TPIF.county_fiscal_investment,
        TPIF.county_special_fund_investment,TPIF.domestic_loan_total,TPIF.bank_loan,TPIF.foreign_investment_total,TPIF.enterprise_self_raised_total,TPIF.other_investment_total,TPIF.gmt_create,
        TPIF.create_by,TPIF.gmt_update,TPIF.update_by,
        TPIF.dept_bond,
        TPIF.national_debt,
        TPII.id,TPII.project_id,TPII.be_cross_region,TPII.construction_location,TPII.detailed_address,TPII.be_compensation_project,TPII.compensation_reason,TPII.planned_start_date,
        TPII.expected_completion_date,TPII.national_industry_classification,TPII.industry_classification,TPII.project_nature,TPII.project_attribute,
        TPII.use_earth,TPII.content_scale,TPII.code,TPII.gmt_create,TPII.create_by,TPII.gmt_update, TPII.update_by,
@@ -239,7 +233,7 @@
        <id column="id" property="id"/>
    </resultMap>
    <select id="checkProjectNameAndIdIsUnique" resultMap="pInfo">
        select p.id from t_project_info p where  p.project_name =#{name} and p.id != #{id}
        select p.id from t_project_info p where  p.project_name =#{name} and p.id != #{id} and p.deleted = 0
        <if test="code !=null and code !=''">
            and p.project_code =#{code}
        </if>