Merge remote-tracking branch 'origin/master'

马宇豪

2024-06-19 6d8304c25e9b732172de6f1597075612aa2950de

Merge remote-tracking branch 'origin/master'

 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java

@@ -13,4 +13,6 @@
    List<TbBaseCheckTaskMapper> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO);



    TbBaseCheckTask getBaseCheckTaskByTaskId(String taskId);



    List<TbBaseCheckTask> listTbBaseCheckTask();

}


 src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java

@@ -115,7 +115,7 @@


    @Override

    public List<TbBaseCheckTask> listTbBaseCheckTask() {

        return scoreTbRepository.listTbBaseCheckTask();

        return taskTbRepository.listTbBaseCheckTask();

    }






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

@@ -40,5 +40,9 @@
        select * from tb_base_check_task
        where id = #{taskId}
    </select>

<!--    List<TbBaseCheckTask> listTbBaseCheckTask();-->
    <select id="listTbBaseCheckTask" resultMap="BaseResultMap">
        select * from tb_base_check_task
        where deleted = 0
    </select>
</mapper>