From 4daeea3ce65d70ca2745aea388918c248b282ec1 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Sun, 21 Jul 2024 00:26:08 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20Query=20DTO=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC=20=20=20=20=20=20=20=20=20=20=20=EB=AF=B8?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/adds/nims/DsuseMgtDetailQuery.java | 466 ------------------ .../cokr/xit/adds/nims/DsuseMgtDocQuery.java | 316 +----------- .../xit/adds/nims/DsuseMgtReceiptQuery.java | 296 ----------- .../adds/nims/dao/DsuseMgtDetailMapper.java | 3 +- .../xit/adds/nims/dao/DsuseMgtDocMapper.java | 3 +- .../adds/nims/dao/DsuseMgtReceiptMapper.java | 12 +- .../xit/adds/nims/dao/DsuseMgtRsltMapper.java | 3 +- .../nims/service/DsuseMgtReceiptService.java | 11 +- .../bean/DsuseMgtReceiptServiceBean.java | 9 +- .../xit/adds/nims/web/AddsNimsController.java | 7 +- .../mapper/adds/nims/dsuseMgtDoc-mapper.xml | 2 - .../WEB-INF/jsp/adds/nims/barcode-main.jsp | 300 ----------- .../jsp/adds/nims/dsuseMgtMapping-info.jsp | 2 - 13 files changed, 24 insertions(+), 1406 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/jsp/adds/nims/barcode-main.jsp diff --git a/src/main/java/cokr/xit/adds/nims/DsuseMgtDetailQuery.java b/src/main/java/cokr/xit/adds/nims/DsuseMgtDetailQuery.java index f26283c..fb83ed0 100644 --- a/src/main/java/cokr/xit/adds/nims/DsuseMgtDetailQuery.java +++ b/src/main/java/cokr/xit/adds/nims/DsuseMgtDetailQuery.java @@ -12,58 +12,6 @@ public class DsuseMgtDetailQuery extends QueryRequest{ //검색조건 private String schDscdmngId; // 검색 폐기관리 id - //폐기관리 - 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 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; // 허가 번호 - - private String dscdmngSn; // 폐기관리 순번 - private String prductCd; // 제품 코드 - private String prductNm; // 제품 명 - private String minDistbQy; // 최소 유통단위 수량 - private String minDistbUnit; // 최소 유통 단위 - private String minDistb; // 최소 유통 단위 및 수량 - private String pceQy; // 낱개단위 수량 - private String pceUnit; // 낱개 단위 - private String pce; // 낱개 단위 및 수량 - private String mnfNo; // 제조 번호 - private String prdValidDe; // 제조 유효기한 일자 - private String mnfSeq; // 제조 일련번호 - private String dsuseQy; // 폐기 수량 - private String usrRptInIdNo; // 사용자 보고 라인 식별 번호 - - public String getSchDscdmngId() { return ifEmpty(schDscdmngId, () -> null); } @@ -72,418 +20,4 @@ public class DsuseMgtDetailQuery extends QueryRequest{ this.schDscdmngId = schDscdmngId; return self(); } - - public String getDscdmngId() { - return ifEmpty(dscdmngId, () -> null); - } - - public T setDscdmngId(String dscdmngId) { - this.dscdmngId = dscdmngId; - return self(); - } - - public String getDeptCd() { - return ifEmpty(deptCd, () -> null); - } - - public T setDeptCd(String deptCd) { - this.deptCd = deptCd; - return self(); - } - - public String getUserId() { - return ifEmpty(userId, () -> null); - } - - public T setUserId(String userId) { - this.userId = userId; - return self(); - } - - public String getPrgrsSttsCd() { - return ifEmpty(prgrsSttsCd, () -> null); - } - - public T setPrgrsSttsCd(String prgrsSttsCd) { - this.prgrsSttsCd = prgrsSttsCd; - return self(); - } - - public String getBsshCd() { - return ifEmpty(bsshCd, () -> null); - } - - public T setBsshCd(String bsshCd) { - this.bsshCd = bsshCd; - return self(); - } - - public String getRndDtlRptCnt() { - return ifEmpty(rndDtlRptCnt, () -> null); - } - - public T setRndDtlRptCnt(String rndDtlRptCnt) { - this.rndDtlRptCnt = rndDtlRptCnt; - return self(); - } - - public String getHdrDe() { - return ifEmpty(hdrDe, () -> null); - } - - public T setHdrDe(String hdrDe) { - this.hdrDe = hdrDe; - return self(); - } - - public String getDsuseSeCd() { - return ifEmpty(dsuseSeCd, () -> null); - } - - public T setDsuseSeCd(String dsuseSeCd) { - this.dsuseSeCd = dsuseSeCd; - return self(); - } - - public String getDsusePrvCd() { - return ifEmpty(dsusePrvCd, () -> null); - } - - public T setDsusePrvCd(String dsusePrvCd) { - this.dsusePrvCd = dsusePrvCd; - return self(); - } - - public String getDsuseMthCd() { - return ifEmpty(dsuseMthCd, () -> null); - } - - public T setDsuseMthCd(String dsuseMthCd) { - this.dsuseMthCd = dsuseMthCd; - return self(); - } - - public String getDsuseLoc() { - return ifEmpty(dsuseLoc, () -> null); - } - - public T setDsuseLoc(String dsuseLoc) { - this.dsuseLoc = dsuseLoc; - return self(); - } - - public String getDsuseDe() { - return ifEmpty(dsuseDe, () -> null); - } - - public T setDsuseDe(String dsuseDe) { - this.dsuseDe = dsuseDe; - return self(); - } - - public String getStts() { - return ifEmpty(stts, () -> null); - } - - public T setStts(String stts) { - this.stts = stts; - return self(); - } - - public String getUsrRptIdNo() { - return ifEmpty(usrRptIdNo, () -> null); - } - - public T setUsrRptIdNo(String usrRptIdNo) { - this.usrRptIdNo = usrRptIdNo; - return self(); - } - - public String getOrgUsrRptIdNo() { - return ifEmpty(orgUsrRptIdNo, () -> null); - } - - public T setOrgUsrRptIdNo(String orgUsrRptIdNo) { - this.orgUsrRptIdNo = orgUsrRptIdNo; - return self(); - } - - public String getRptTyCd() { - return ifEmpty(rptTyCd, () -> null); - } - - public T setRptTyCd(String rptTyCd) { - this.rptTyCd = rptTyCd; - return self(); - } - - public String getUseYn() { - return ifEmpty(useYn, () -> null); - } - - public T setUseYn(String useYn) { - this.useYn = useYn; - return self(); - } - - public String getRegDt() { - return ifEmpty(regDt, () -> null); - } - - public T setRegDt(String regDt) { - this.regDt = regDt; - return self(); - } - - public String getRgtr() { - return ifEmpty(rgtr, () -> null); - } - - public T setRgtr(String rgtr) { - this.rgtr = rgtr; - return self(); - } - - public String getMdfcnDt() { - return ifEmpty(mdfcnDt, () -> null); - } - - public T setMdfcnDt(String mdfcnDt) { - this.mdfcnDt = mdfcnDt; - return self(); - } - - public String getMdfr() { - return ifEmpty(mdfr, () -> null); - } - - public T setMdfr(String mdfr) { - 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(); - } - - - public String getDscdmngSn() { - return ifEmpty(dscdmngSn, () -> null); - } - - public T setDscdmngSn(String dscdmngSn) { - this.dscdmngSn = dscdmngSn; - return self(); - } - - public String getPrductCd() { - return ifEmpty(prductCd, () -> null); - } - - public T setPrductCd(String prductCd) { - this.prductCd = prductCd; - return self(); - } - - public String getPrductNm() { - return ifEmpty(prductNm, () -> null); - } - - public T setPrductNm(String prductNm) { - this.prductNm = prductNm; - return self(); - } - - public String getMinDistbQy() { - return ifEmpty(minDistbQy, () -> null); - } - - public T setMinDistbQy(String minDistbQy) { - this.minDistbQy = minDistbQy; - return self(); - } - - public String getMinDistbUnit() { - return ifEmpty(minDistbUnit, () -> null); - } - - public T setMinDistbUnit(String minDistbUnit) { - this.minDistbUnit = minDistbUnit; - return self(); - } - - public String getMindistb() { - return ifEmpty(minDistb, () -> null); - } - - public T setMindistb(String minDistb) { - this.minDistb = minDistb; - return self(); - } - - public String getPceqy() { - return ifEmpty(pceQy, () -> null); - } - - public T setPceqy(String pceQy) { - this.pceQy = pceQy; - return self(); - } - - public String getPceunit() { - return ifEmpty(pceUnit, () -> null); - } - - public T setPceunit(String pceUnit) { - this.pceUnit = pceUnit; - return self(); - } - - public String getPce() { - return ifEmpty(pce, () -> null); - } - - public T setPce(String pce) { - this.pce = pce; - return self(); - } - - public String getMnfno() { - return ifEmpty(mnfNo, () -> null); - } - - public T setMnfno(String mnfNo) { - this.mnfNo = mnfNo; - return self(); - } - - public String getPrdvalidde() { - return ifEmpty(prdValidDe, () -> null); - } - - public T setPrdvalidde(String prdValidDe) { - this.prdValidDe = prdValidDe; - return self(); - } - - public String getMnfseq() { - return ifEmpty(mnfSeq, () -> null); - } - - public T setMnfseq(String mnfSeq) { - this.mnfSeq = mnfSeq; - return self(); - } - - public String getDsuseqy() { - return ifEmpty(dsuseQy, () -> null); - } - - public T setDsuseqy(String dsuseQy) { - this.dsuseQy = dsuseQy; - return self(); - } - - public String getUsrrptinidno() { - return ifEmpty(usrRptInIdNo, () -> null); - } - - public T setUsrrptinidno(String usrRptInIdNo) { - this.usrRptInIdNo = usrRptInIdNo; - return self(); - } } diff --git a/src/main/java/cokr/xit/adds/nims/DsuseMgtDocQuery.java b/src/main/java/cokr/xit/adds/nims/DsuseMgtDocQuery.java index 538ec6b..793e6f7 100644 --- a/src/main/java/cokr/xit/adds/nims/DsuseMgtDocQuery.java +++ b/src/main/java/cokr/xit/adds/nims/DsuseMgtDocQuery.java @@ -1,5 +1,7 @@ package cokr.xit.adds.nims; +import org.apache.poi.ss.formula.functions.T; + import cokr.xit.foundation.component.QueryRequest; /**폐기관리접수 정보 조회 요청 @@ -16,44 +18,8 @@ public class DsuseMgtDocQuery extends QueryRequest{ private String schDateTo; // 검색 일자 종료 private String schBsshCd; // 검색 일자 종료 private String schSttsCd; // 진행상태 - - //폐기관리 - 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 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 getSchSggCd() { return ifEmpty(schSggCd, () -> null); } @@ -99,15 +65,6 @@ public class DsuseMgtDocQuery extends QueryRequest{ return self(); } - public String getDscdmngId() { - return ifEmpty(dscdmngId, () -> null); - } - - public T setDscdmngId(String dscdmngId) { - this.dscdmngId = dscdmngId; - return self(); - } - public String getDeptCd() { return ifEmpty(deptCd, () -> null); } @@ -117,275 +74,6 @@ public class DsuseMgtDocQuery extends QueryRequest{ return self(); } - public String getUserId() { - return ifEmpty(userId, () -> null); - } - - public T setUserId(String userId) { - this.userId = userId; - return self(); - } - - public String getPrgrsSttsCd() { - return ifEmpty(prgrsSttsCd, () -> null); - } - - public T setPrgrsSttsCd(String prgrsSttsCd) { - this.prgrsSttsCd = prgrsSttsCd; - return self(); - } - - public String getBsshCd() { - return ifEmpty(bsshCd, () -> null); - } - - public T setBsshCd(String bsshCd) { - this.bsshCd = bsshCd; - return self(); - } - - public String getRndDtlRptCnt() { - return ifEmpty(rndDtlRptCnt, () -> null); - } - - public T setRndDtlRptCnt(String rndDtlRptCnt) { - this.rndDtlRptCnt = rndDtlRptCnt; - return self(); - } - - public String getHdrDe() { - return ifEmpty(hdrDe, () -> null); - } - - public T setHdrDe(String hdrDe) { - this.hdrDe = hdrDe; - return self(); - } - - public String getDsuseSeCd() { - return ifEmpty(dsuseSeCd, () -> null); - } - - public T setDsuseSeCd(String dsuseSeCd) { - this.dsuseSeCd = dsuseSeCd; - return self(); - } - - public String getDsusePrvCd() { - return ifEmpty(dsusePrvCd, () -> null); - } - - public T setDsusePrvCd(String dsusePrvCd) { - this.dsusePrvCd = dsusePrvCd; - return self(); - } - - public String getDsuseMthCd() { - return ifEmpty(dsuseMthCd, () -> null); - } - - public T setDsuseMthCd(String dsuseMthCd) { - this.dsuseMthCd = dsuseMthCd; - return self(); - } - - public String getDsuseLoc() { - return ifEmpty(dsuseLoc, () -> null); - } - - public T setDsuseLoc(String dsuseLoc) { - this.dsuseLoc = dsuseLoc; - return self(); - } - - public String getDsuseDe() { - return ifEmpty(dsuseDe, () -> null); - } - - public T setDsuseDe(String dsuseDe) { - this.dsuseDe = dsuseDe; - return self(); - } - - public String getStts() { - return ifEmpty(stts, () -> null); - } - - public T setStts(String stts) { - this.stts = stts; - return self(); - } - - public String getUsrRptIdNo() { - return ifEmpty(usrRptIdNo, () -> null); - } - - public T setUsrRptIdNo(String usrRptIdNo) { - this.usrRptIdNo = usrRptIdNo; - return self(); - } - - public String getOrgUsrRptIdNo() { - return ifEmpty(orgUsrRptIdNo, () -> null); - } - - public T setOrgUsrRptIdNo(String orgUsrRptIdNo) { - this.orgUsrRptIdNo = orgUsrRptIdNo; - return self(); - } - - public String getRptTyCd() { - return ifEmpty(rptTyCd, () -> null); - } - - public T setRptTyCd(String rptTyCd) { - this.rptTyCd = rptTyCd; - return self(); - } - - public String getUseYn() { - return ifEmpty(useYn, () -> null); - } - - public T setUseYn(String useYn) { - this.useYn = useYn; - return self(); - } - - public String getRegDt() { - return ifEmpty(regDt, () -> null); - } - - public T setRegDt(String regDt) { - this.regDt = regDt; - return self(); - } - - public String getRgtr() { - return ifEmpty(rgtr, () -> null); - } - - public T setRgtr(String rgtr) { - this.rgtr = rgtr; - return self(); - } - - public String getMdfcnDt() { - return ifEmpty(mdfcnDt, () -> null); - } - - public T setMdfcnDt(String mdfcnDt) { - this.mdfcnDt = mdfcnDt; - return self(); - } - - public String getMdfr() { - return ifEmpty(mdfr, () -> null); - } - - public T setMdfr(String mdfr) { - 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 setNizrno(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(); - } - public String getSchSttsCd() { return ifEmpty(schSttsCd, () -> null); } diff --git a/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java b/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java index 4439bca..b8ed8c7 100644 --- a/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java +++ b/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java @@ -15,44 +15,9 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ private String schDateTo; // 검색 일자 종료 private String schBsshCd; // 업체코드 private String schSttsCd; // 진행상태코드 - - //폐기관리 - 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 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; // 허가 번호 - private String nimsRptYn; // NIMS 보고 여부 public String getNimsRptYn() { @@ -64,7 +29,6 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ return self(); } - public String getSchSggCd() { return ifEmpty(schSggCd, () -> null); } @@ -110,15 +74,6 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ return self(); } - public String getdscdmngId() { - return ifEmpty(dscdmngId, () -> null); - } - - public T setdscdmngId(String dscdmngId) { - this.dscdmngId = dscdmngId; - return self(); - } - public String getdeptCd() { return ifEmpty(deptCd, () -> null); } @@ -137,123 +92,6 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ return self(); } - public String getprgrsSttsCd() { - return ifEmpty(prgrsSttsCd, () -> null); - } - - public T setprgrsSttsCd(String prgrsSttsCd) { - this.prgrsSttsCd = prgrsSttsCd; - return self(); - } - - public String getbsshCd() { - return ifEmpty(bsshCd, () -> null); - } - - public T setbsshCd(String bsshCd) { - this.bsshCd = bsshCd; - return self(); - } - - public String getrndDtlRptCnt() { - return ifEmpty(rndDtlRptCnt, () -> null); - } - - public T setrndDtlRptCnt(String rndDtlRptCnt) { - this.rndDtlRptCnt = rndDtlRptCnt; - return self(); - } - - public String gethdrDe() { - return ifEmpty(hdrDe, () -> null); - } - - public T sethdrDe(String hdrDe) { - this.hdrDe = hdrDe; - return self(); - } - - public String getdsuseSeCd() { - return ifEmpty(dsuseSeCd, () -> null); - } - - public T setdsuseSeCd(String dsuseSeCd) { - this.dsuseSeCd = dsuseSeCd; - return self(); - } - - public String getdsusePrvCd() { - return ifEmpty(dsusePrvCd, () -> null); - } - - public T setdsusePrvCd(String dsusePrvCd) { - this.dsusePrvCd = dsusePrvCd; - return self(); - } - - public String getdsuseMthCd() { - return ifEmpty(dsuseMthCd, () -> null); - } - - public T setdsuseMthCd(String dsuseMthCd) { - this.dsuseMthCd = dsuseMthCd; - return self(); - } - - public String getdsuseLoc() { - return ifEmpty(dsuseLoc, () -> null); - } - - public T setdsuseLoc(String dsuseLoc) { - this.dsuseLoc = dsuseLoc; - return self(); - } - - public String getdsuseDe() { - return ifEmpty(dsuseDe, () -> null); - } - - public T setdsuseDe(String dsuseDe) { - this.dsuseDe = dsuseDe; - return self(); - } - - public String getstts() { - return ifEmpty(stts, () -> null); - } - - public T setstts(String stts) { - this.stts = stts; - return self(); - } - - public String getusrRptIdNo() { - return ifEmpty(usrRptIdNo, () -> null); - } - - public T setusrRptIdNo(String usrRptIdNo) { - this.usrRptIdNo = usrRptIdNo; - return self(); - } - - public String getorgUsrRptIdNo() { - return ifEmpty(orgUsrRptIdNo, () -> null); - } - - public T setorgUsrRptIdNo(String orgUsrRptIdNo) { - this.orgUsrRptIdNo = orgUsrRptIdNo; - return self(); - } - - public String getrptTyCd() { - return ifEmpty(rptTyCd, () -> null); - } - - public T setrptTyCd(String rptTyCd) { - this.rptTyCd = rptTyCd; - return self(); - } - public String getuseYn() { return ifEmpty(useYn, () -> null); } @@ -261,139 +99,5 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ public T setuseYn(String useYn) { this.useYn = useYn; return self(); - } - - public String getregDt() { - return ifEmpty(regDt, () -> null); - } - - public T setregDt(String regDt) { - this.regDt = regDt; - return self(); - } - - public String getrgtr() { - return ifEmpty(rgtr, () -> null); - } - - public T setrgtr(String rgtr) { - this.rgtr = rgtr; - return self(); - } - - public String getmdfcnDt() { - return ifEmpty(mdfcnDt, () -> null); - } - - public T setmdfcnDt(String mdfcnDt) { - this.mdfcnDt = mdfcnDt; - return self(); - } - - public String getmdfr() { - return ifEmpty(mdfr, () -> null); - } - - public T setmdfr(String mdfr) { - 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/java/cokr/xit/adds/nims/dao/DsuseMgtDetailMapper.java b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtDetailMapper.java index 462fc9e..25cbe84 100644 --- a/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtDetailMapper.java +++ b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtDetailMapper.java @@ -13,7 +13,8 @@ import cokr.xit.foundation.data.DataObject; @Mapper("dsuseMgtDetailMapper") public interface DsuseMgtDetailMapper extends AbstractMapper { - /**지정한 조건에 따라 폐기관리상세 목록을 조회하여 반환한다.
+ /** + * 지정한 조건에 따라 폐기관리상세 목록을 조회하여 반환한다.
* @param req 폐기관리상세 조회 조건 * @return 폐기관리상세 목록 */ diff --git a/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtDocMapper.java b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtDocMapper.java index 2ac31c0..c400155 100644 --- a/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtDocMapper.java +++ b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtDocMapper.java @@ -13,7 +13,8 @@ import cokr.xit.foundation.data.DataObject; @Mapper("dsuseMgtDocMapper") public interface DsuseMgtDocMapper extends AbstractMapper { - /**지정한 조건에 따라 폐기보고문서관리 목록을 조회하여 반환한다.
+ /** + * 지정한 조건에 따라 폐기보고문서관리 목록을 조회하여 반환한다.
* @param req 폐기보고문서관리 조회 조건 * @return 폐기보고문서관리 목록 */ diff --git a/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtReceiptMapper.java b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtReceiptMapper.java index cd9591a..fa0644a 100644 --- a/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtReceiptMapper.java +++ b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtReceiptMapper.java @@ -19,16 +19,16 @@ public interface DsuseMgtReceiptMapper extends AbstractMapper { */ List selectDsuseMgtReceiptList(DsuseMgtReceiptQuery req); - DataObject selectDsuseMgtReceiptInfo(String dscdmngId); - - /** 신청서 접수 삭제. - * @param DsuseMgtReceiptQuery + /** + * 신청서 접수 삭제. + * @param query DsuseMgtReceiptQuery * @return 저장된 정보수 */ int removeDsuseMgt(DsuseMgtReceiptQuery query); - /** 처리상태 수정. - * @param DsuseMgtReceiptQuery + /** + * 처리상태 수정. + * @param query DsuseMgtReceiptQuery * @return 저장된 정보수 */ int updatePrgsSttusOfDsuseMgt(DsuseMgtReceiptQuery query); diff --git a/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtRsltMapper.java b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtRsltMapper.java index 928b212..7f740c8 100644 --- a/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtRsltMapper.java +++ b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtRsltMapper.java @@ -13,7 +13,8 @@ import cokr.xit.foundation.data.DataObject; @Mapper("dsuseMgtRsltMapper") public interface DsuseMgtRsltMapper extends AbstractMapper { - /**지정한 조건에 따라 폐기관리상세 목록을 조회하여 반환한다.
+ /** + * 지정한 조건에 따라 폐기관리상세 목록을 조회하여 반환한다.
* @param req 폐기관리상세 조회 조건 * @return 폐기관리상세 목록 */ diff --git a/src/main/java/cokr/xit/adds/nims/service/DsuseMgtReceiptService.java b/src/main/java/cokr/xit/adds/nims/service/DsuseMgtReceiptService.java index fa61541..68bf389 100644 --- a/src/main/java/cokr/xit/adds/nims/service/DsuseMgtReceiptService.java +++ b/src/main/java/cokr/xit/adds/nims/service/DsuseMgtReceiptService.java @@ -16,16 +16,17 @@ public interface DsuseMgtReceiptService { */ List getDsuseMgtReceiptList(DsuseMgtReceiptQuery query); - DataObject getDsuseMgtReceiptInfo(String dscdmngId); - /** 신청서 접수 삭제. - * @param DsuseMgtReceiptQuery + /** + * 신청서 접수 삭제. + * @param query DsuseMgtReceiptQuery * @return 저장된 정보수 */ String removeDsuseMgt(DsuseMgtReceiptQuery query); - /** 처리상태 수정. - * @param DsuseMgtReceiptQuery + /** + * 처리상태 수정. + * @param query DsuseMgtReceiptQuery * @return 저장된 정보수 */ String updatePrgsSttusOfDsuseMgt(DsuseMgtReceiptQuery query); diff --git a/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java b/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java index 5824091..1fe0c76 100644 --- a/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java +++ b/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java @@ -28,13 +28,8 @@ public class DsuseMgtReceiptServiceBean extends AbstractServiceBean implements D return dsuseMgtReceiptMapper.selectDsuseMgtReceiptList(query); } - @Override - public DataObject getDsuseMgtReceiptInfo(String dscdmngId){ - return dsuseMgtReceiptMapper.selectDsuseMgtReceiptInfo(dscdmngId); - } - /** 신청서 접수 삭제. - * @param DsuseMgtReceiptQuery + * @param query DsuseMgtReceiptQuery * @return 저장된 정보수 */ @Override @@ -47,7 +42,7 @@ public class DsuseMgtReceiptServiceBean extends AbstractServiceBean implements D } /** 처리상태 수정. - * @param DsuseMgtReceiptQuery + * @param query DsuseMgtReceiptQuery * @return 저장된 정보수 */ @Override diff --git a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java index 2ecc8e4..906b761 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -267,7 +267,6 @@ public class AddsNimsController extends ApplicationController { return mav .addObject("pageName", "dsuseMgtMappingInfo") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("apiHost", apiHost) .addObject("dsuseMappingInfo", toJson(dsuseMappingInfo)) /* View(jsp)에서 사용할 id 뒤에 붙일 suffix */; } @RequestMapping(value = "/updatePrgsSttusOfDsuseMgt.do", name = "페기 보고 확인 등록") @@ -417,8 +416,7 @@ public class AddsNimsController extends ApplicationController { .addObject("pageName", "bsshPopup") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "bssh") // prefix .addObject("infoPrefixUrl", "/adds/nims") // prefixUrl - .addObject("openPage", openPage) - .addObject("apiHost", apiHost); + .addObject("openPage", openPage); } @RequestMapping(value = "/product-popup.do", name="마약류 제품 조회 팝업") @@ -429,8 +427,7 @@ public class AddsNimsController extends ApplicationController { .addObject("pageName", "productMain") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "product") // prefix .addObject("infoPrefixUrl", "/adds/nims") // prefixUrl - .addObject("openPage", openPage) - .addObject("apiHost", apiHost); + .addObject("openPage", openPage); } //------------------------------------------------------------------------------------------------- // 마약류폐기보고 팝업 diff --git a/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml b/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml index c5aa0f4..6bab407 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml @@ -26,8 +26,6 @@ tdm.dsuse_de, /* 폐기_일자 */ MAX(CASE WHEN tf.sub_type = '01' THEN tf.file_id END) AS 'dsuse_rslt_doc', MAX(CASE WHEN tf.sub_type = '02' THEN tf.file_id END) AS 'dsuse_rslt_list_photo' - -- max(case when tf.SUB_TYPE = '01' THEN tf.file_nm end) as '폐기결과보고서파일', - -- max(case when tf.SUB_TYPE = '02' THEN tf.file_nm end) as '폐기처리내역및사진파일' FROM tb_dsuse_mgt tdm LEFT JOIN tb_dept td ON tdm.dept_cd = td.dept_cd LEFT JOIN tb_bssh_info tbi ON tdm.bssh_cd =tbi.bssh_cd diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/barcode-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/barcode-main.jsp deleted file mode 100644 index 9693eef..0000000 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/barcode-main.jsp +++ /dev/null @@ -1,300 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> -<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -QR code reading - -
- -
-
- - - -
- -

바코드(이미지) scan

- - -
-
- -
-
-
- -
- -
- - - -
- - - diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp index 63a2a49..98fc136 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp @@ -293,7 +293,6 @@ $P.mappingControl = new DatasetControl({ urls : { - <%--load : '',--%> load : wctx.url("/adds/nims/getDsuseRptAndDsuseMgtMapping.do") } , prefix: "dsuseMgtMapping" @@ -402,7 +401,6 @@ ajax.post({ - <%--url: ''--%> url: wctx.url("/adds/nims/modifyMappingDsuseMgt.do") , data: JSON.stringify({ dscdmngId: $P.formFields.get().dscdmngId,