diff --git a/src/main/java/cokr/xit/adds/cmm/model/NimsApiRequest.java b/src/main/java/cokr/xit/adds/cmm/model/NimsApiRequest.java index 039cec3..57246db 100644 --- a/src/main/java/cokr/xit/adds/cmm/model/NimsApiRequest.java +++ b/src/main/java/cokr/xit/adds/cmm/model/NimsApiRequest.java @@ -79,6 +79,11 @@ public class NimsApiRequest { */ private String fg2 = "1"; + /** + * 대표자 + */ + private String rprsntvNm; + /** *
* DB 조회 skip 여부 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 38be294..1e0be99 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -106,9 +106,8 @@ spring: datasource: hikari: - #driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - driver-class-name: org.mariadb.jdbc.Driver - jdbc-url: jdbc:mariadb://211.119.124.9:4407/adds?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false + driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbc-url: jdbc:log4jdbc:mariadb://211.119.124.9:4407/adds?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false username: addsweb password: addsweb1234 auto-commit: false diff --git a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml index ebe6691..90d4747 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml @@ -9,6 +9,7 @@ SELECT A.DSCDMNG_ID /* 폐기관리 ID */ , A.DEPT_CD /* 부서 코드 */ + , td.DEPT_NM /* 부서명 */ , A.USER_ID /* 사용자 ID */ , A.PRGRS_STTS_CD /* 진행상태 코드 */ , GET_CODE_NM("ADDS11", A.PRGRS_STTS_CD) PRGRS_STTS_NM /* 진행상태 */ @@ -44,6 +45,7 @@ , B.HPTL_NO /* 요양기관 번호 */ , B.PRMISN_NO /* 허가번호 */ FROM TB_DSUSE_MGT A + JOIN tb_dept td ON A.dept_cd = td.dept_cd LEFT OUTER JOIN TB_BSSH_INFO B ON A.BSSH_CD = B.BSSH_CD WHERE A.USE_YN = "Y" diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp index eb19821..ad6206d 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp @@ -187,7 +187,7 @@ let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML] : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); - let noMore = (totalSize == ${infoPrefix}List.length); + let noMore = (${infoPrefix}List.length >= totalSize); let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); $("#tbody--${pageName}").html(trs.join()); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgt-info.jsp index e3890a1..609c7be 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgt-info.jsp @@ -311,7 +311,7 @@ let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML] : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); - let noMore = (totalSize == ${infoPrefix}List.length); + let noMore = (${infoPrefix}List.length >= totalSize); let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp index a3a5d3c..a4549c5 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp @@ -86,6 +86,7 @@No. +관할관청 취급일자 관리번호 업체명 @@ -104,6 +105,7 @@{ROW_NUM} +{DEPT_NM} {HDR_DE} {DSCDMNG_ID} {BSSH_NM} @@ -419,7 +421,7 @@ let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML] : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); - let noMore = (totalSize == ${infoPrefix}List.length); + let noMore = (${infoPrefix}List.length >= totalSize); let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp index 9af8cf2..f56a899 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp @@ -89,6 +89,7 @@No. +관할관청 폐기관리번호 처리상태 업체명 @@ -107,6 +108,7 @@{ROW_NUM} +{DEPT_NM} {DSCDMNG_ID} {PRGRS_STTS_NM} {BSSH_NM} @@ -397,7 +399,7 @@ let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML] : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); - let noMore = (totalSize == ${infoPrefix}List.length); + let noMore = (${infoPrefix}List.length >= totalSize); let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp index b6dea03..b881728 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp @@ -84,6 +84,7 @@No. +관할관청 폐기관리번호 처리상태 업체명 @@ -101,6 +102,7 @@{ROW_NUM} +{DEPT_NM} {DSCDMNG_ID} {PRGRS_STTS_NM} {BSSH_NM} @@ -352,7 +354,7 @@ let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML] : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); - let noMore = (totalSize == ${infoPrefix}List.length); + let noMore = (${infoPrefix}List.length >= totalSize); let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp index 8d06468..1ab1f42 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp @@ -30,7 +30,7 @@제품코드 -제품명 +제품명 유통단위 낱개단위 마약/향정구분 @@ -321,7 +321,7 @@ let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").innerHTML] : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); - let noMore = (totalSize == ${infoPrefix}List.length); + let noMore = (${infoPrefix}List.length >= totalSize); let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); $("#tbody--${pageName}").html(trs.join());