diff --git a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml index d1c6bfc..4800cf7 100644 --- a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml @@ -1669,8 +1669,8 @@ c.PERIODEND, COUNT(h.HIDDEN_ID) HIDDEN_COUNT FROM - BUS_CHECKRECORD c - left join bus_hidden h on h.CHECKRECORD_ID = c.CHECKRECORD_ID and h.ISDELETE = '0' + vi_list_checkrecord_all c + left join vi_hidden_all h on h.CHECKRECORD_ID = c.CHECKRECORD_ID and h.LIST_TYPE = c.HIDDEN_RISKSTANDARD and h.ISDELETE = '0' WHERE c.FINISHED = 1 and (#{MONTH} >= DATE_FORMAT(c.PERIODSTART,'%Y-%m') and #{MONTH} <=DATE_FORMAT(c.PERIODEND,'%Y-%m')) diff --git a/src/main/resources/mybatis/datasource/check/CheckUserMapper.xml b/src/main/resources/mybatis/datasource/check/CheckUserMapper.xml index fc48089..f55da33 100644 --- a/src/main/resources/mybatis/datasource/check/CheckUserMapper.xml +++ b/src/main/resources/mybatis/datasource/check/CheckUserMapper.xml @@ -131,8 +131,8 @@ c.USER_ID, count( c.CHECKUSER_ID ) NUM FROM - bus_checkuser c - LEFT JOIN bus_checkrecord cr ON c.CHECKRECORD_ID = cr.CHECKRECORD_ID + vi_list_checkuser_all c + LEFT JOIN vi_list_checkrecord_all cr ON cr.CHECKRECORD_ID = c.CHECKRECORD_ID and cr.HIDDEN_RISKSTANDARD = c.HIDDEN_RISKSTANDARD WHERE cr.isdelete = '0' AND cr.FINISHED = '1' diff --git a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml index b54a70e..dafe111 100644 --- a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml +++ b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml @@ -1912,7 +1912,7 @@ count(1) NUM, f.USER_ID FROM - bus_listmanager f + vi_list_all f LEFT JOIN SYS_USER u ON u.USER_ID = f.USER_ID WHERE f.ISDELETE = '0' @@ -1967,6 +1967,7 @@