Merge remote-tracking branch 'origin/master'

16639036659

2024-07-17 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d

 src/main/resources/mybatis/tr/TbSpecialCheckScoreAndDangerLogMapper.xml

@@ -154,9 +154,6 @@
            <if test="checkDate != null">
                check_date = #{checkDate},
            </if>
            <if test="resultStatus != null">
                result_status = #{resultStatus},
            </if>
            <if test="reportStatus != null">
                report_status = #{reportStatus},
            </if>
@@ -206,4 +203,10 @@
        select * from tb_special_check_score_and_danger_log
        where deleted = 0 and id = #{id}
    </select>
<!--    List<TbSpecialCheckScoreAndDangerLog> listScoreAndDangerLogReportList();-->
    <select id="listScoreAndDangerLogReportList" resultMap="BaseResultMap">
        select * from tb_special_check_score_and_danger_log
        where deleted = 0 and report_status = 1
    </select>

</mapper>