From 96e11dd1cf42b3132ae51eb051cad84517b3ba41 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Tue, 18 Jun 2024 13:30:52 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=8F=90=EA=B8=B0=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=83=81=EC=84=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...useReceiptInfo.java => DsuseRsltInfo.java} | 7 +- .../adds/nims/dao/DsuseMgtReceiptMapper.java | 2 +- .../bean/DsuseMgtReceiptServiceBean.java | 9 +- .../xit/adds/nims/web/AddsNimsController.java | 6 +- .../adds/nims/dsuseMgtReceipt-mapper.xml | 4 +- .../jsp/adds/nims/dsuseMgtReceipt-main.jsp | 1022 ++++++++--------- .../jsp/adds/nims/dsuseMgtRslt-info.jsp | 24 +- .../jsp/adds/nims/dsuseMgtRslt-main.jsp | 994 ++++++++-------- 8 files changed, 1037 insertions(+), 1031 deletions(-) rename src/main/java/cokr/xit/adds/cmm/model/{DsuseReceiptInfo.java => DsuseRsltInfo.java} (87%) diff --git a/src/main/java/cokr/xit/adds/cmm/model/DsuseReceiptInfo.java b/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java similarity index 87% rename from src/main/java/cokr/xit/adds/cmm/model/DsuseReceiptInfo.java rename to src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java index 64d809b..c930618 100644 --- a/src/main/java/cokr/xit/adds/cmm/model/DsuseReceiptInfo.java +++ b/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonAlias; import lombok.Data; @Data -public class DsuseReceiptInfo { +public class DsuseRsltInfo { /** * 마약류취급자식별번호 */ @@ -71,4 +71,9 @@ public class DsuseReceiptInfo { private String dsusePrvNm; private Integer rndDtlRptCnt; + private String hdrDe; + private String dsuseDe; + private String dsuseSeCd; + private String dsuseMthCd; + private String dsuseLoc; } 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 3304196..5f4e8ce 100644 --- a/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtReceiptMapper.java +++ b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtReceiptMapper.java @@ -17,6 +17,6 @@ public interface DsuseMgtReceiptMapper extends AbstractMapper { * @param req 폐기관리접수 조회 조건 * @return 폐기관리접수 목록 */ - List selectDsuseMgtReceiptcList(DsuseMgtReceiptQuery req); + List selectDsuseMgtReceiptList(DsuseMgtReceiptQuery req); } 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 4370a1e..02b0620 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 @@ -1,9 +1,6 @@ package cokr.xit.adds.nims.service.bean; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import java.util.Map; import javax.annotation.Resource; @@ -12,10 +9,6 @@ import org.springframework.stereotype.Service; import cokr.xit.adds.nims.DsuseMgtReceiptQuery; import cokr.xit.adds.nims.dao.DsuseMgtReceiptMapper; import cokr.xit.adds.nims.service.DsuseMgtReceiptService; -import cokr.xit.base.code.service.bean.CodeBean; -import cokr.xit.base.file.FileInfo; -import cokr.xit.base.file.service.FileQuery; -import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -30,7 +23,7 @@ public class DsuseMgtReceiptServiceBean extends AbstractServiceBean implements D public List getdsuseMgtReceiptList(DsuseMgtReceiptQuery query){ query.setOrderBy("DSCDMNG_ID DESC"); - return dsuseMgtReceiptMapper.selectDsuseMgtReceiptcList(query); + return dsuseMgtReceiptMapper.selectDsuseMgtReceiptList(query); } } 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 4f93b64..a6db705 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import cokr.xit.adds.cmm.model.DsuseReceiptInfo; +import cokr.xit.adds.cmm.model.DsuseRsltInfo; import cokr.xit.adds.nims.DsuseMgtDocQuery; import cokr.xit.adds.nims.DsuseMgtReceiptQuery; import cokr.xit.adds.nims.service.DsuseMgtDocService; @@ -64,14 +64,14 @@ public class AddsNimsController extends AbstractController { } @RequestMapping(value = "dsuseMgtRslt-info.do", name="결과[통보] 상세") - public ModelAndView getDsuseMgtRsltInfo(DsuseReceiptInfo dsuseReceiptInfo) { + public ModelAndView getDsuseMgtRsltInfo(DsuseRsltInfo dsuseRsltInfo) { ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtRslt-info"); return mav .addObject("pageName", "dsuseMgtRsltInfo") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "dsuseMgtRsltInfo") // prefix .addObject("infoPrefixUrl", "/adds/nims") // prefixUrl - .addObject("bsshInfo", toJson(dsuseReceiptInfo)) // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("dsuseRsltInfo", toJson(dsuseRsltInfo)) // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("apiHost", apiHost); } //------------------------------------------------------------------------------------------------- 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 c7125c2..067ea43 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml @@ -45,8 +45,8 @@ LEFT OUTER JOIN TB_BSSH_INFO B ON A.BSSH_CD = B.BSSH_CD - + /* 폐기관리접수 목록 조회(dsuseMgtReceiptMapper.selectDsuseMgtReceiptList) */ WHERE 1=1 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 796bdf3..e3f3dcc 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 @@ -3,62 +3,62 @@ 신청서 접수
- +
-
-
-
- - -
- <%-- -
- - - - - ~ - - - -
- --%> - -
- - - - -
- -
- - -
-
- -
-
-
+
+
+
+ + +
+ <%-- +
+ + + + + ~ + + + +
+ --%> + +
+ + + + +
+ +
+ + +
+
+ +
+
+
@@ -78,97 +78,97 @@
-
-
- - - - - - - - - - - - - - - - - - - - -
No.취급일자관리번호업체명보고건수처리상태폐기구분폐기사유폐기방법폐기장소폐기일자
-
-
+
+
+ + + + + + + + + + + + + + + + + + + + +
No.폐기관리번호처리상태업체명폐기건수폐기사유취급일자폐기일자폐기구분폐기방법폐기장소
+
+

-
-
-
-
-
- - - - - - - - - - - - - - - - - -
No.제품명제품코드폐기수량유효기간최소 유통단위 수량낱개 단위 수량폐기 수량
-
-
-
-
-
+
+
+
+
+
+ + + + + + + + + + + + + + + + + +
No.제품명제품코드폐기수량유효기간최소 유통단위 수량낱개 단위 수량폐기 수량
+
+
+
+
+
@@ -178,380 +178,380 @@ diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp index c0806df..a59c1e2 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp @@ -17,14 +17,14 @@ <%-- --%>
- +
- - + +
- - + +
@@ -44,12 +44,12 @@
- +
- +
@@ -76,7 +76,7 @@
- +
@@ -159,9 +159,9 @@ , appendData: true , infoSize: "xl" , formats: { - RPT_DE: dateFormat - , HDR_DE: dateFormat - , DSUSE_DE: dateFormat + rptDe: dateFormat + , hdrDe: dateFormat + , dsuseDe: dateFormat } }); // $P.control 설정 @@ -474,7 +474,7 @@ $P.initForm(); // 3. Dataset 설정 - $P.control.setData([${bsshInfo}]); + $P.control.setData([${dsuseRsltInfo}]); }); 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 b7ce10a..e5e6510 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 @@ -3,60 +3,60 @@ 결과(통보) 처리
- +
-
-
-
- - -
-
- - +
+
+
+ + +
+
+ + ~ -
- -
- - - - -
- -
- - -
-
- -
-
-
+
+ +
+ + + + +
+ +
+ + +
+
+ +
+
+
@@ -76,50 +76,50 @@
-
-
- - - - - - - - - - - - - - - - - - - - -
No.취급일자관리번호업체명보고건수처리상태폐기구분폐기사유폐기방법폐기장소폐기일자
-
-
+
+
+ + + + + + + + + + + + + + + + + + + + +
No.폐기관리번호처리상태업체명취급일자폐기일자폐기건수폐기사유폐기구분폐기방법폐기장소
+
+
@@ -128,417 +128,425 @@
-
-
-
-
- - - - - - - - - - - - - - - - - -
No.제품명제품코드폐기수량유효기간최소 유통단위 수량낱개단위 수량폐기수량
-
-
-
-
+
+
+
+
+ + + + + + + + + + + + + + + + +
No.제품명제품코드폐기수량유효기간유통단위 수량낱개단위 수량
+
+
+
+
- +