diff --git a/src/main/resources/sqlmapper/mappers/report/report.xml b/src/main/resources/sqlmapper/mappers/report/report.xml index cd46f82..d26c546 100644 --- a/src/main/resources/sqlmapper/mappers/report/report.xml +++ b/src/main/resources/sqlmapper/mappers/report/report.xml @@ -101,11 +101,11 @@ - + SELECT currval('rpt_info_in_seq') as inSeq - + - + - '99' - ]]> + IN_STATE_CODE <> '99' + - AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'3') - ]]> - + AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'2') - ]]> + - - AND IN_AGENCY_CODE = #{userPlace} - ]]> + - AND IN_PLACE_CODE = #{userPlace} - ]]> + - ORDER BY ${orderCol} ${orderAsc} - ]]> - + ) ALL_LIST ) WHERE - RNUM > #{firstIndex} AND - RNUM <= #{firstIndex} + #{recordCountPerPage} - ]]> + RNUM > #{firstIndex} + AND + RNUM <= #{firstIndex} + #{recordCountPerPage} + @@ -961,10 +1064,10 @@ AND IN_USERID IN (#{userid}, '''' || #{usegrade} || '''') - + - AND IN_INFODATE >= #{dateStart}::date + AND IN_INFODATE >= #{dateStart}::date AND IN_INFODATE <= #{dateEnd}::date @@ -984,7 +1087,7 @@ inner join Rpt_Category CAT4 on CAT4.type = 4 and cat4.code = a.IN_CATEGORY4 diff --git a/src/main/webapp/WEB-INF/jsp/report/myList.jsp b/src/main/webapp/WEB-INF/jsp/report/myList.jsp index e19fb07..cacd405 100644 --- a/src/main/webapp/WEB-INF/jsp/report/myList.jsp +++ b/src/main/webapp/WEB-INF/jsp/report/myList.jsp @@ -161,7 +161,6 @@