xit-app
/
adds-fo
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 그리드 항목 순서 및 정렬 조건 fix

Browse Source
main
Jonguk. Lim 2 weeks ago
parent 78c367a79a
commit 82acc8f3bf
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
Unescape Escape View File

@ -117,7 +117,7 @@ public class AddsNimsController extends ApplicationController {
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
@RequestMapping(value = "/dsuseMgtReceipt-list.do", name="신청서 접수 목록 조회") @RequestMapping(value = "/dsuseMgtReceipt-list.do", name="신청서 접수 목록 조회")
public ModelAndView getDsuseMgtReceiptList(DsuseMgtReceiptQuery query) { public ModelAndView getDsuseMgtReceiptList(DsuseMgtReceiptQuery query) {
query.setOrderBy("DSUSE_DE DESC, DSUSE_MTH_CD, DSCDMNG_ID"); query.setOrderBy("DSUSE_DE DESC, DSUSE_SE_CD, DSUSE_MTH_CD, DSCDMNG_ID");
setFetchSize(query); setFetchSize(query);
return setCollectionInfo(new ModelAndView("jsonView"), dsuseMgtReceiptService.getDsuseMgtReceiptList(query),"",""); return setCollectionInfo(new ModelAndView("jsonView"), dsuseMgtReceiptService.getDsuseMgtReceiptList(query),"","");

48
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
Unescape Escape View File

@ -90,13 +90,13 @@
<th class="cmn" style="width: 170.141px;">관할관청</th> <th class="cmn" style="width: 170.141px;">관할관청</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th> <th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th> <th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 150px;">폐기방법</th> <th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 300.469px;">업체명</th> <th class="cmn" style="width: 300.469px;">업체명</th>
<th class="cmn" style="width: 90px;">보고건수</th> <th class="cmn" style="width: 90px;">보고건수</th>
<th class="cmn" style="width: 270.469px;">NIMS보고ID</th> <th class="cmn" style="width: 270.469px;">NIMS보고ID</th>
<th class="cmn" style="width: 160.469px;">처리상태</th> <th class="cmn" style="width: 160.469px;">처리상태</th>
<th class="cmn" style="width: 180.469px;">폐기사유</th> <th class="cmn" style="width: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 200.469px;">폐기장소</th> <th class="cmn" style="width: 200.469px;">폐기장소</th>
<th class="cmn" style="width: 110.141px;">취급일자</th> <th class="cmn" style="width: 110.141px;">취급일자</th>
</tr> </tr>
@ -109,6 +109,7 @@
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_MTH_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_MTH_NM}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td> <td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td>
<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td> <td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td>
@ -117,7 +118,6 @@
</td> </td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
</tr> </tr>
@ -223,7 +223,7 @@
$P.control.defaultFetchSize = FETCH_XXS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 $P.control.defaultFetchSize = FETCH_XXS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30
$P.control.query = { pageNum : 1, fetchSize : $P.control.defaultFetchSize }; $P.control.query = { pageNum : 1, fetchSize : $P.control.defaultFetchSize };
$P.control.beforeCurrent = null; $P.control.beforeCurrent = null;
$P.detailControl = new DatasetControl({ $P.detailControl = new DatasetControl({
urls : { urls : {
@ -236,8 +236,8 @@
, formats : { , formats : {
PRD_VALID_DE: dateFormat PRD_VALID_DE: dateFormat
} }
}); });
/************************************************************************** /**************************************************************************
* DatasetControl 이벤트 * DatasetControl 이벤트
**************************************************************************/ **************************************************************************/
@ -254,9 +254,9 @@
, func: "pageObject['${pageName}'].control.load({index})" , func: "pageObject['${pageName}'].control.load({index})"
}); });
}; };
$P.detailControl.onDatasetChange = (obj) => { $P.detailControl.onDatasetChange = (obj) => {
$P.renderDetailList(obj.${infoPrefix}Total); $P.renderDetailList(obj.${infoPrefix}Total);
}; };
@ -291,7 +291,7 @@
} }
} }
}; };
// 현재 선택 자료 변경 이벤트 // 현재 선택 자료 변경 이벤트
$P.detailControl.onCurrentChange = (item) => { $P.detailControl.onCurrentChange = (item) => {
if (!item) return; if (!item) return;
@ -348,7 +348,7 @@
}; };
ajax.get({ ajax.get({
url : wctx.url("/adds/nims/dsuseMgtMapping-info.do") url : wctx.url("/adds/nims/dsuseMgtMapping-info.do")
, data : params , data : params
, success : resp => { , success : resp => {
dialog.open({ dialog.open({
@ -356,7 +356,7 @@
, title : dialogTitle , title : dialogTitle
, content : resp , content : resp
, size : "xxl" , size : "xxl"
, onClose : () => { , onClose : () => {
$P.control.reload({all : true}); $P.control.reload({all : true});
} }
}); });
@ -366,11 +366,11 @@
$P.control.onSave = (resp) => { $P.control.onSave = (resp) => {
// let dialogTitle = $("#" + $P.control.prefix + "Dialog").find("h5.modal-title").html(); // let dialogTitle = $("#" + $P.control.prefix + "Dialog").find("h5.modal-title").html();
let showMessage = "저장에 실패 하였습니다."; let showMessage = "저장에 실패 하였습니다.";
if (resp.saved) { if (resp.saved) {
showMessage = "저장에 성공 하였습니다."; showMessage = "저장에 성공 하였습니다.";
} }
dialog.alert({ dialog.alert({
content : showMessage, content : showMessage,
init : function(){ init : function(){
@ -391,7 +391,7 @@
userId: "${currentUser.account}", userId: "${currentUser.account}",
prgrsSttsCd: "99" prgrsSttsCd: "99"
}; };
ajax.get({ ajax.get({
url : wctx.url("/adds/nims/updatePrgsSttusOfDsuseMgt.do") url : wctx.url("/adds/nims/updatePrgsSttusOfDsuseMgt.do")
, data: params , data: params
@ -430,12 +430,12 @@
if(option != null && option.reloaded){ if(option != null && option.reloaded){
initScroll = false; initScroll = false;
} }
$("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore);
} }
$P.renderDetailList = () => { $P.renderDetailList = () => {
let ${infoPrefix}List = $P.detailControl.dataset; let ${infoPrefix}List = $P.detailControl.dataset;
let empty = ${infoPrefix}List.empty; let empty = ${infoPrefix}List.empty;
@ -454,11 +454,11 @@
// DataTables에 스크롤이 맨 밑으로 이동했을 때 이벤트 // DataTables에 스크롤이 맨 밑으로 이동했을 때 이벤트
$P.scrollDataList = () => { $P.scrollDataList = () => {
$P.control.load($P.control.query.pageNum + 1); $P.control.load($P.control.query.pageNum + 1);
} }
$P.control.getBsshInfo = (gdccId) => { $P.control.getBsshInfo = (gdccId) => {
let dialogTitle = "마약류 취급업체 조회"; let dialogTitle = "마약류 취급업체 조회";
let params = {openPage : "frmSearch--${pageName}"}; let params = {openPage : "frmSearch--${pageName}"};
@ -476,8 +476,8 @@
}); });
} }
}); });
} }
/************************************************************************** /**************************************************************************
* 사용자 함수(function) * 사용자 함수(function)
@ -494,7 +494,7 @@
$P.fnCreateDsuseMgtMapping = (title) => { $P.fnCreateDsuseMgtMapping = (title) => {
$P.control.getInfo(); $P.control.getInfo();
} }
// 처리상태 완료로 변경 // 처리상태 완료로 변경
$P.fnPrgsStts = () => { $P.fnPrgsStts = () => {
dialog.alert({ dialog.alert({
@ -505,9 +505,9 @@
onOK : () => { onOK : () => {
$P.control.prgsSttus(); $P.control.prgsSttus();
} }
}); });
} }
// 전자우편 안내문 등록 버튼 이벤트 // 전자우편 안내문 등록 버튼 이벤트
$P.fnSearchBssh = (title) => { $P.fnSearchBssh = (title) => {
$P.control.getBsshInfo(); $P.control.getBsshInfo();
@ -595,7 +595,7 @@
} }
}); });
}); });
// 안내문 등록 버튼 이벤트 // 안내문 등록 버튼 이벤트
$("#btnBsshSearch--${pageName}").on("click", function() { $("#btnBsshSearch--${pageName}").on("click", function() {
$P.fnSearchBssh($(this).attr("title")); $P.fnSearchBssh($(this).attr("title"));
@ -606,7 +606,7 @@
// DataTables 스크롤 이벤트 생성 // DataTables 스크롤 이벤트 생성
Componentization.fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollDataList); Componentization.fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollDataList);
// 하단 테이블 행 번호 표시 // 하단 테이블 행 번호 표시
Componentization.fnMakeRowNumberingTable(document.getElementById('tbody--${pageName}Detail') Componentization.fnMakeRowNumberingTable(document.getElementById('tbody--${pageName}Detail')
, (tr)=>{ return $(tr).find("td.row-num")[0]; } , (tr)=>{ return $(tr).find("td.row-num")[0]; }

4
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
Unescape Escape View File

@ -92,13 +92,13 @@
<th class="cmn" style="width: 170.141px;">관할관청</th> <th class="cmn" style="width: 170.141px;">관할관청</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th> <th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th> <th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 150px;">폐기방법</th> <th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 300.469px;">업체명</th> <th class="cmn" style="width: 300.469px;">업체명</th>
<th class="cmn" style="width: 90px;">폐기건수</th> <th class="cmn" style="width: 90px;">폐기건수</th>
<th class="cmn" style="width: 160.469px;">처리상태</th> <th class="cmn" style="width: 160.469px;">처리상태</th>
<th class="cmn" style="width: 180.469px;">폐기사유</th> <th class="cmn" style="width: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 110.141px;">사고발생일</th> <th class="cmn" style="width: 110.141px;">사고발생일</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 200.469px;">폐기장소</th> <th class="cmn" style="width: 200.469px;">폐기장소</th>
<th class="cmn" style="width: 110.141px;">취급일자</th> <th class="cmn" style="width: 110.141px;">취급일자</th>
</tr> </tr>
@ -111,13 +111,13 @@
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_MTH_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_MTH_NM}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td> <td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td>
<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td> <td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_ACDT_DE}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_ACDT_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td> <td class="cmn" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
</tr> </tr>

4
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
Unescape Escape View File

@ -87,13 +87,13 @@
<th class="cmn" style="width: 170.141px;">관할관청</th> <th class="cmn" style="width: 170.141px;">관할관청</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th> <th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th> <th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 150px;">폐기방법</th> <th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 250.469px;">업체명</th> <th class="cmn" style="width: 250.469px;">업체명</th>
<th class="cmn" style="width: 90px;">폐기건수</th> <th class="cmn" style="width: 90px;">폐기건수</th>
<th class="cmn" style="width: 160.469px;">처리상태</th> <th class="cmn" style="width: 160.469px;">처리상태</th>
<th class="cmn" style="width: 180.469px;">폐기사유</th> <th class="cmn" style="width: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 120.141px;">사고발생일</th> <th class="cmn" style="width: 120.141px;">사고발생일</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 200.469px;">폐기장소</th> <th class="cmn" style="width: 200.469px;">폐기장소</th>
<th class="cmn" style="width: 110.141px;">취급일자</th> <th class="cmn" style="width: 110.141px;">취급일자</th>
</tr> </tr>
@ -106,13 +106,13 @@
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_MTH_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_MTH_NM}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td> <td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td>
<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td> <td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_ACDT_DE}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_ACDT_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td> <td class="cmn" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
</tr> </tr>

Write Preview
Loading…
Cancel
Save