diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml index fdda63d..a6dc9cd 100644 --- a/src/main/resources/sqlmapper/mappers/fa/equip.xml +++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml @@ -181,43 +181,32 @@ B.CODENM, B.CODE2, A.* FROM ( - SELECT - * - FROM - H3_EQUIP_USE_STATE - WHERE - EU_YEAR = #{year} AND - EU_QUATER = #{quater} AND - EU_POLICE = #{police} + SELECT * + FROM H3_EQUIP_USE_STATE + WHERE EU_YEAR = (#{year}||'') + AND EU_QUATER = (#{quater}||'') + AND EU_POLICE = #{police} ) A RIGHT JOIN ( - SELECT - CODE2, CODENM - FROM - TCODE - WHERE - CODE1 = 'EQUI' AND - CODE_USE_YN = 'Y' - ORDER BY - CODE2 + SELECT CODE2, CODENM + FROM TCODE + WHERE CODE1 = 'EQUI' + AND CODE_USE_YN = 'Y' + ORDER BY CODE2 ) B ON A.EU_CODE = B.CODE2 - ORDER BY - B.CODE2 + ORDER BY B.CODE2 ]]> diff --git a/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp b/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp index aa222bd..dd8c431 100644 --- a/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp +++ b/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp @@ -62,11 +62,11 @@ - - _cnt" value=""> - - _check" value=""> - _state" value=""> + + _cnt" value=""> + + _check" value=""> + _state" value=""> diff --git a/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp b/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp index e131cdf..590a1c1 100644 --- a/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp +++ b/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp @@ -43,11 +43,11 @@ - - - - - + + + + +