diff --git a/src/main/java/cokr/xit/adds/nims/dsuseMgtReceiptQuery.java b/src/main/java/cokr/xit/adds/nims/dsuseMgtReceiptQuery.java index a0c2c6c..5343ed0 100644 --- a/src/main/java/cokr/xit/adds/nims/dsuseMgtReceiptQuery.java +++ b/src/main/java/cokr/xit/adds/nims/dsuseMgtReceiptQuery.java @@ -21,28 +21,41 @@ public class dsuseMgtReceiptQuery extends QueryRequest{ private String schDateFrom; // 검색 일자 시작 private String schDateTo; // 검색 일자 종료 + //폐기관리 + private String dscdmngId; // 폐기관리 ID + private String deptCd; // 부서 코드 + private String userId; // 사용자 ID + private String prgrsSttsCd; // 진행 상태 코드 + private String bsshCd; // 마약류 취급자 식별 번호 + private String rndDtlRptCnt; // 수불 상세 보고 수 + private String hdrDe; // 취급 일자 + private String dsuseSeCd; // 폐기 구분 코드 + private String dsusePrvCd; // 폐기 사유 코드 + private String dsuseMthCd; // 폐기 방법 코드 + private String dsuseLoc; // 폐기 장소 + private String dsuseDe; // 폐기 일자 + private String stts; // 처리 상태 + private String usrRptIdNo; // 사용자 보고 식별 번호 + private String orgUsrRptIdNo; // 원 사용자 보고 식별 번호 + private String rptTyCd; // 보고 유형 코드 + private String useYn; // 사용 여부 + private String regDt; // 등록 일시 + private String rgtr; // 등록자 + private String mdfcnDt; // 수정 일시 + private String mdfr; // 수정자 - private String dscdmngId; - private String deptCd; - private String userId; - private String prgrsSttsCd; - private String bsshCd; - private String rndDtlRptCnt; - private String hdrDe; - private String dsuseSeCd; - private String dsusePrvCd; - private String dsuseMthCd; - private String dsuseLoc; - private String dsuseDe; - private String stts; - private String usrRptIdNo; - private String orgUsrRptIdNo; - private String rptTyCd; - private String useYn; - private String regDt; - private String rgtr; - private String mdfcnDt; - private String mdfr; + //저장소 정보 + private String bsshNm; // 업체명 + private String indutyNm; // 업종명 + private String hdntCd; // 의료업자 구분 + private String hdntNm; // 의료업자 구분명 + private String bizrno; // 사업자등록번호 + private String rprsntvNm; // 대표자 명 + private String chrgNm; // 담당자 명 + private String hptlNo; // 요양기관 기호 + private String joinYn; // 획원가입 여부 + private String bsshSttsNm; // 상태 + private String prmisnNo; // 허가 번호 public String getschDateOpt() { return ifEmpty(schDateOpt, () -> null); @@ -259,4 +272,102 @@ public class dsuseMgtReceiptQuery extends QueryRequest{ this.mdfr = mdfr; return self(); } + + public String getbsshNm() { + return ifEmpty(bsshNm, () -> null); + } + + public T setbsshNm(String bsshNm) { + this.bsshNm = bsshNm; + return self(); + } + + public String getindutyNm() { + return ifEmpty(indutyNm, () -> null); + } + + public T setindutyNm(String indutyNm) { + this.indutyNm = indutyNm; + return self(); + } + + public String gethdntCd() { + return ifEmpty(hdntCd, () -> null); + } + + public T sethdntCd(String hdntCd) { + this.hdntCd = hdntCd; + return self(); + } + public String gethdntNm() { + return ifEmpty(hdntNm, () -> null); + } + + public T sethdntNm(String hdntNm) { + this.hdntNm = hdntNm; + return self(); + } + + public String getbizrno() { + return ifEmpty(bizrno, () -> null); + } + + public T setbizrno(String bizrno) { + this.bizrno = bizrno; + return self(); + } + + public String getrprsntvNm() { + return ifEmpty(rprsntvNm, () -> null); + } + + public T setrprsntvNm(String rprsntvNm) { + this.rprsntvNm = rprsntvNm; + return self(); + } + + public String getchrgNm() { + return ifEmpty(chrgNm, () -> null); + } + + public T setchrgNm(String chrgNm) { + this.chrgNm = chrgNm; + return self(); + } + + public String gethptlNo() { + return ifEmpty(hptlNo, () -> null); + } + + public T sethptlNo(String hptlNo) { + this.hptlNo = hptlNo; + return self(); + } + + public String getjoinYn() { + return ifEmpty(joinYn, () -> null); + } + + public T setjoinYn(String joinYn) { + this.joinYn = joinYn; + return self(); + } + + public String getbsshSttsNm() { + return ifEmpty(bsshSttsNm, () -> null); + } + + public T setbsshSttsNm(String bsshSttsNm) { + this.bsshSttsNm = bsshSttsNm; + return self(); + } + + public String getprmisnNo() { + return ifEmpty(prmisnNo, () -> null); + } + + public T setprmisnNo(String prmisnNo) { + this.prmisnNo = prmisnNo; + return self(); + } } 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 beee00c..67fb566 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml @@ -9,33 +9,45 @@ SELECT - DSCDMNG_ID - , DEPT_CD - , USER_ID - , PRGRS_STTS_CD - , GET_CODE_NM("ADD511", PRGRS_STTS_CD) PRGRS_STTS_NM - , BSSH_CD - , RND_DTL_RPT_CNT - , HDR_DE - , DSUSE_SE_CD - , GET_CODE_NM("ADDS03", DSUSE_SE_CD) DSUSE_SE_NM - , DSUSE_PRV_CD - , GET_CODE_NM("ADDS04", DSUSE_PRV_CD) DSUSE_PRV_NM - , DSUSE_MTH_CD - , GET_CODE_NM("ADDS05", DSUSE_MTH_CD) DSUSE_MTH_NM - , DSUSE_LOC - , DSUSE_DE - , STTS - , USR_RPT_ID_NO - , ORG_USR_RPT_ID_NO - , RPT_TY_CD - , GET_CODE_NM("ADDS02", RPT_TY_CD) RPT_TY_NM - , USE_YN - , REG_DT - , RGTR - , MDFCN_DT - , MDFR - FROM TB_DSUSE_MGT + A.DSCDMNG_ID + , A.DEPT_CD + , A.USER_ID + , A.PRGRS_STTS_CD + , GET_CODE_NM("ADD511", A.PRGRS_STTS_CD) PRGRS_STTS_NM + , A.BSSH_CD + , A.RND_DTL_RPT_CNT + , A.HDR_DE + , A.DSUSE_SE_CD + , GET_CODE_NM("ADDS03", A.DSUSE_SE_CD) DSUSE_SE_NM + , A.DSUSE_PRV_CD + , GET_CODE_NM("ADDS04", A.DSUSE_PRV_CD) DSUSE_PRV_NM + , A.DSUSE_MTH_CD + , GET_CODE_NM("ADDS05", A.DSUSE_MTH_CD) DSUSE_MTH_NM + , A.DSUSE_LOC + , A.DSUSE_DE + , A.STTS + , A.USR_RPT_ID_NO + , A.ORG_USR_RPT_ID_NO + , A.RPT_TY_CD + , GET_CODE_NM("ADDS02", A.RPT_TY_CD) RPT_TY_NM + , A.USE_YN + , A.REG_DT + , A.RGTR + , A.MDFCN_DT + , A.MDFR + , B.BSSH_NM + , B.INDUTY_NM + , B.HDNT_CD + , B.HDNT_NM + , B.BIZRNO + , B.RPRSNTV_NM + , B.CHRG_NM + , B.HPTL_NO + , B.JOIN_YN + , B.BSSH_STTS_NM + , B.PRMISN_NO + FROM TB_DSUSE_MGT A + LEFT OUTER JOIN TB_BSSH_INFO B ON A.BSSH_CD = B.BSSH_CD + + +
+ + +
+
+ + +
- + - +
+
+ +
@@ -34,40 +50,77 @@
-
- - - -
- -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - +
+ + + +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/include/head.jsp b/src/main/webapp/WEB-INF/jsp/include/head.jsp index 87b2d91..660a74c 100644 --- a/src/main/webapp/WEB-INF/jsp/include/head.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/head.jsp @@ -28,13 +28,16 @@ " /> + + " class="template-customizer-core-css" /> "/> + " class="template-customizer-core-css" /> -