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 c35807b..4ad0f81 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml @@ -6,7 +6,8 @@ --> - SELECT tdm.dscdmng_id, /* 폐기관리 ID */ + SELECT tdm.dscdmng_id, /* 폐기관리 ID */ + tdm.dsuse_de, /* 폐기관리 ID */ tdm.dept_cd, /* 부서 코드 */ tdm.user_id, /* 사용자 ID */ tdm.prgrs_stts_cd, /* 진행 상태 코드 */ 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 142ca88..0f5b70b 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 @@ -86,18 +86,18 @@ No. - 취급일자 - 관리번호 - 업체명 - 보고건수 - 처리상태 - 폐기구분 - 폐기사유 - 폐기방법 - 폐기장소 - 폐기일자 - 폐기결과보고서 - 폐기처리내역및사진 + 폐기관리번호 + 취급일자 + 폐기일자 + 업체명 + 폐기건수 + 처리상태 + 폐기결과보고서 + 폐기처리내역및사진 + 폐기사유 + 폐기구분 + 폐기방법 + 폐기장소 @@ -105,18 +105,18 @@ @@ -161,8 +161,6 @@ $P.control = new DatasetControl({ urls : { load : wctx.url("/adds/nims/dsuseMgtDoc-list.do") - // FIXME: POST로 변경 - //load : '' } , prefix: "dsuseMgtMapping" , prefixName: "폐기 보고 확인" @@ -171,9 +169,8 @@ , appendData: true , infoSize: "xl" , formats: { - RPT_DE: dateFormat - , HDR_DE: dateFormat - , DSUSE_DE: dateFormat + hdr_de: dateFormat + , dsuse_de: dateFormat } }); // $P.control 설정 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 220cee6..cedcb2f 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 @@ -148,10 +148,10 @@ {ROW_NUM} {PRDUCT_NM} {PRDUCT_CD} - {DSUSE_QY} + {DSUSE_QY} {PCE_UNIT} {PRD_VALID_DE} - {MIN_DISTB_QY}{MIN_DISTB_UNIT} - {PCE_QY}{PCE_UNIT} + {MIN_DISTB_QY} {MIN_DISTB_UNIT} + {PCE_QY} {PCE_UNIT}