Merge remote-tracking branch 'origin/master'

linwei

2024-02-20 e67a8a7477096a295d65afa1c366d2b59f8752fc

 src/main/java/org/springblade/modules/taskPlaceSelfCheck/mapper/TaskPlaceSelfCheckMapper.xml

@@ -173,7 +173,7 @@
        jpe.legal_person,
        jt.remark reasonFailure,
        jda.address_name
    FROM
        FROM
        jczz_task_place_self_check jtpr
        LEFT JOIN jczz_task jt ON jt.id = jtpr.task_id
        LEFT JOIN jczz_place jp ON jtpr.house_code = jp.house_code
@@ -182,8 +182,10 @@
        LEFT JOIN jczz_place_ext jpe ON jpe.place_id = jp.id
        LEFT JOIN blade_user bu ON bu.id = jtpr.create_user
        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jtpr.house_code
    WHERE
        jtpr.id = #{id}
        <where>
            <if test="palce.id != null ">and jtpr.id = #{palce.id}</if>
            <if test="palce.taskId != null ">and jtpr.task_id = #{palce.taskId}</if>
        </where>
    </select>

    <select id="selectTaskPlaceSelfCheckList"