From a33b1a8f984babc042f0c784208f050bb0d90c47 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Thu, 11 Jul 2024 16:31:40 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B3=B4=EA=B3=A0=EB=AC=B8=EC=84=9C?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=A0=95=EB=A0=AC=20=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=20=20=20=20=20->=20=ED=8F=90=EA=B8=B0?= =?UTF-8?q?=EC=9D=BC=EC=9E=90=20DESC,=20=ED=8F=90=EA=B8=B0=EB=B0=A9?= =?UTF-8?q?=EB=B2=95,=20=ED=8F=90=EA=B8=B0ID=20DESC=20=20=20=20=20=20?= =?UTF-8?q?=EB=B0=94=EC=BD=94=EB=93=9C=20=EC=9E=85=EB=A0=A5=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/adds/nims/web/AddsNimsController.java | 2 +- .../WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp | 24 +++++++++---------- .../jsp/adds/nims/dsuseMgtReceipt-info.jsp | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) 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 6a42282..22f94cd 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -252,7 +252,7 @@ public class AddsNimsController extends ApplicationController { //------------------------------------------------------------------------------------------------- @RequestMapping(value = "dsuseMgtDoc-list.do", name="결과[통보] 처리 조회") public ModelAndView getDsuseMgtDocList(DsuseMgtDocQuery query) { - query.setOrderBy("dept_cd, dscdmng_id"); + query.setOrderBy("dsuse_de DESC, dsuse_mth_cd, dscdmng_id DESC"); setFetchSize(query); return setCollectionInfo(new ModelAndView("jsonView"), dsuseMgtDocService.getDsuseMgtDocList(query),"",""); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp index 8b0dad6..1973ce8 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp @@ -93,23 +93,23 @@ - No. + No. - 관할관청 - 폐기관리번호 - 취급일자 + 관할관청 + 폐기관리번호 폐기일자 + 폐기방법 업체명 - 폐기결과보고서 - 폐기처리내역및사진 + 폐기결과보고서 + 처리내역및사진 + 취급일자 폐기건수 - 처리상태 + 처리상태 폐기사유 - 폐기구분 - 폐기방법 + 폐기구분 폐기장소 @@ -124,8 +124,8 @@ {dept_nm} {dscdmng_id} - {hdr_de} {dsuse_de} + {dsuse_mth_nm} {bssh_nm} {dsuse_rslt_doc} @@ -133,12 +133,12 @@ {dsuse_rslt_list_photo} + {hdr_de} {rnd_dtl_rpt_cnt} {prgrs_stts_nm} {dsuse_prv_nm} {dsuse_se_nm} - {dsuse_mth_nm} - {dsuse_loc} + {dsuse_loc} <%-- {USR_RPT_ID_NO}--%> diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp index 86679fd..9dc3dd0 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp @@ -625,7 +625,7 @@ $("#dsuseAcdtDe--${pageName}").datepicker("setDate", new Date()); //FIXME: 바코드 사용시 제거 - $("#btnProductBarcodeSearch--${pageName}").prop("disabled", true); + //$("#btnProductBarcodeSearch--${pageName}").prop("disabled", true); }