fix: 보고문서관리 필드 및 정렬 조건 fix

src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java

@@ -271,7 +271,7 @@ public class AddsNimsController extends ApplicationController {
     //-------------------------------------------------------------------------------------------------
     @RequestMapping(value = "dsuseMgtDoc-list.do", name="보고문서관리 목록 조회")
     public ModelAndView getDsuseMgtDocList(DsuseMgtDocQuery 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);
 
         return setCollectionInfo(new ModelAndView("jsonView"), dsuseMgtDocService.getDsuseMgtDocList(query),"","");

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp

@@ -95,21 +95,21 @@
 						data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
 						<th class="cmn" style="width: 60px;">No.</th>
 						<th class="cmn" style="width: 50px;">
-							<input type="checkbox" class="form-check-input" id="gridAllCheckbox--${pageName}" 
+							<input type="checkbox" class="form-check-input" id="gridAllCheckbox--${pageName}"
 								onchange="pageObject['${pageName}'].control.select(this.checked);" />
 						</th>
 						<th class="cmn" style="width: 160.141px;">관할관청</th>
 						<th class="cmn" style="width: 120.141px;">폐기관리번호</th>
 						<th class="cmn" style="width: 110.469px;">폐기일자</th>
+						<th class="cmn" style="width: 140px;">폐기구분</th>
 						<th class="cmn" style="width: 150px;">폐기방법</th>
+						<th class="cmn" style="width: 200.469px;">폐기장소</th>
 						<th class="cmn" style="width: 250.469px;">업체명</th>
 						<th class="cmn" style="width: 90px;">폐기건수</th>
 						<th class="cmn" style="width: 145px;">폐기결과보고서</th>
 						<th class="cmn" style="width: 145px;">처리내역및사진</th>
 						<th class="cmn" style="width: 160.469px;">처리상태</th>
 						<th class="cmn" style="width: 180.469px;">폐기사유</th>
-						<th class="cmn" style="width: 140px;">폐기구분</th>
-						<th class="cmn" style="width: 200.469px;">폐기장소</th>
 						<th class="cmn" style="width: 110.141px;">취급일자</th>
 					</tr>
 				</thead>
@@ -119,13 +119,15 @@
 					<tr data-key="{dscdmng_id}">
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">
-							<input type="checkbox" class="form-check-input" name="gridCheckbox" value="{dscdmng_id}" 
+							<input type="checkbox" class="form-check-input" name="gridCheckbox" value="{dscdmng_id}"
 								onchange="pageObject['${pageName}'].control.select('{dscdmng_id}', this.checked);">
 						</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}">{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-start" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_loc}</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-center" onclick="{onclick}">
@@ -136,8 +138,6 @@
 						</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_se_nm}</td>
-						<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_loc}</td>
 						<td class="cmn text-center"  onclick="{onclick}" ondblclick="{ondblclick}">{hdr_de}</td>
 					</tr>
 				</template>
@@ -198,7 +198,7 @@
 		$P.control.defaultFetchSize = FETCH_XS;									// 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30
 
 		$P.control.beforeCurrent = null;
-		
+
 
 		/**************************************************************************
 		 * DatasetControl 이벤트
@@ -206,7 +206,7 @@
 		// Dataset 변경 이벤트
 		$P.control.onDatasetChange = (obj) => {
 			$P.renderList(obj.${infoPrefix}Total);
-			
+
 			$("#${infoPrefix}Paging--${pageName}").setPaging({
 				  list: $P.control.dataset
 				, prefix: "${infoPrefix}Paging--${pageName}"
@@ -216,7 +216,7 @@
 				, func: "pageObject['${pageName}'].control.load({index})"
 			});
 
-			
+
 		};
 
 		// 현재 선택 자료 변경 이벤트
@@ -225,32 +225,32 @@
 			if (!item) {
 				return;
 			}
-			
+
 			let key = item.data.dscdmng_id;
 
 			$("#tbody--${pageName}").setCurrentRow(key);
 		};
-		
+
 		// 체크 자료 변경 이벤트
 		$P.control.onSelectionChange = (selected) => {
 			let list = $P.control.dataset;
 			let keys = selected.map(e => list.getKey(e));
-			
+
 			//버튼
 			$("#btnCreateDsuseRsltDoc--${pageName}").prop("disabled", keys.length < 1);
 			$("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", keys.length < 1);
-			
+
 			if(${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) {
 				$("#btnCreateDsuseRsltDoc--${pageName}").prop("disabled", true);
 				$("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", true);
 			}
-			
+
 			//그리드 체크박스
 			$("#tbody--${pageName}").find("td input[type='checkbox']").each(function() {
 				let checkbox = $(this);
 				checkbox.prop("checked", keys.includes(checkbox.val()));
 			});
-			
+
 			//그리드 제목 체크박스
 			if (keys.length < 1) {
 				$("#theadTr--${pageName}").find("input[type='checkbox']").prop("checked", false);	// 체크 해제
@@ -289,7 +289,7 @@
 
 			$("#tbody--${pageName}").html(trs.join());
 
-		    
+
 		}
 
         $P.control.getBsshInfo = (gdccId) => {
@@ -314,7 +314,7 @@
 		/**************************************************************************
 		 * 사용자 함수(function)
 		 **************************************************************************/
-		
+
 
 		// 사용자검색 callback
 		$P.callbackFindUser = (userId, userNm) => {
@@ -333,7 +333,7 @@
 			} else {
 				return;
 			}
-			
+
 			dialog.alert({
 				  content: "선택한 폐기관리 정보로 "+ docName+" 파일을 생성 하시겠습니까?"
 				, init: () => { AppSupport.setDialogZindex(); }
@@ -341,9 +341,9 @@
 					$P.fnCreateDoc(ADDS12);
 				}
 			});
-	
+
 		};
-		
+
 		//한글문서파일 생성 요청
 		$P.fnCreateDoc = (ADDS12) => {
 			let dscdmngIds = $P.control.dataset.getKeys("selected");
@@ -403,7 +403,7 @@
 				//alert(e)
 			});
 		};
-		
+
 		// 업체 검색 버튼 이벤트
 		$P.fnSearchBssh = () => {
 			$P.control.getBsshInfo();
@@ -493,7 +493,7 @@
 					}
 				});
 			});
-			
+
 			// 업체 검색 버튼 이벤트
 			$("#btnBsshSearch--${pageName}").on("click", function() {
 				$P.fnSearchBssh();