feat: 폐기결과 처리시 기등록 체크에 폐기구분 추가

src/main/java/cokr/xit/adds/nims/DsuseMgtRsltQuery.java

@@ -1,6 +1,6 @@
 package cokr.xit.adds.nims;
 
-import cokr.xit.foundation.component.QueryRequest;
+import cokr.xit.foundation.component.*;
 
 /**폐기관리접수 정보 조회 요청
 *
@@ -14,6 +14,7 @@ public class DsuseMgtRsltQuery extends QueryRequest{
 	private String deptCd;				// 부서 코드
 	private String userId;				// 사용자 ID
 	private String dsuseMthCd;			// 폐기 방법 코드
+	private String dsuseSeCd;			// 폐기 구분 코드
 	private String dsuseDe;				// 폐기 일자
 
 	public String getDscdmngId() {
@@ -52,6 +53,15 @@ public class DsuseMgtRsltQuery extends QueryRequest{
 		return self();
 	}
 
+	public String getDsuseSeCd() {
+		return ifEmpty(dsuseSeCd, () -> null);
+	}
+
+	public <T extends DsuseMgtRsltQuery> T setDsuseSeCd(String dsuseSeCd) {
+		this.dsuseSeCd = dsuseSeCd;
+		return self();
+	}
+
 	public String getDsuseDe() {
 		return ifEmpty(dsuseDe, () -> null);
 	}

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

@@ -207,7 +207,8 @@ public class AddsNimsController extends ApplicationController {
                             .setDscdmngId(dsuseRsltInfo.getDscdmngId())
                             .setDeptCd(dsuseRsltInfo.getDeptCd())
                             .setDsuseDe(dsuseRsltInfo.getDsuseDe().replaceAll("-", ""))
-                            .setDsuseMthCd(dsuseRsltInfo.getDsuseMthCd()
+                            .setDsuseMthCd(dsuseRsltInfo.getDsuseMthCd())
+                            .setDsuseSeCd(dsuseRsltInfo.getDsuseSeCd()
                         )
                     )
                 )

src/main/resources/sql/mapper/adds/nims/dsuseMgtRslt-mapper.xml

@@ -10,6 +10,7 @@
 			 , tdm.DSUSE_MTH_CD
 			 , tcc.CODE_VAL AS DSUSE_MTH_NM
 			 , tdm.DSUSE_DE
+		     , tdm.DSUSE_LOC
 		     , IF(#{dscdmngId} = tdm.DSCDMNG_ID, 'Y', 'N') AS SELF_YN
 			 , (SELECT GROUP_CONCAT(dscdmng_id SEPARATOR ',')
 				  FROM tb_dsuse_mgt
@@ -30,6 +31,7 @@
 		   AND tdm.use_yn = 'Y'
 		   AND tdm.dept_cd = #{deptCd}
 		   AND tdm.dsuse_mth_cd = #{dsuseMthCd}
+		   AND tdm.dsuse_se_cd = #{dsuseSeCd}
 		   AND tdm.dsuse_de = #{dsuseDe}
     </select>
 </mapper>

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp

@@ -161,6 +161,7 @@
 			let param = {
 				dscdmngId: $("#dscdmngId--${pageName}").val(),
 				dsuseDe: $("#dsuseDe--${pageName}").val().replace(/-/g, ""),
+				dsuseSeCd: $("#dsuseSeCd--${pageName}").val(),
 				dsuseMthCd: $("#dsuseMthCd--${pageName}").val(),
 				deptCd: "${currentUser.deptCode}"
 			};
@@ -197,7 +198,6 @@
 					$('#spnDsuseDe').show();
 					$('#spnDsuseMthCd').show();
 
-
 					document.getElementById("rsltImgList").innerHTML = '총 ' + dscnmngIds.length + '건 에서 폐기사진 공유<br>폐기사진 공유 폐기관리번호 : [' + dscnmngIds.filter(item => item != $("#dscdmngId--${pageName}").val()).join(', ') + ']';
 				}
 				return;
@@ -527,7 +527,7 @@
 			// 버튼 이벤트
 			$("#btnSave--${pageName}").on("click", () => $P.fnSave());			// 저장
 
-			$("#dsuseDe--${pageName}, #dsuseMthCd--${pageName}").on("change", () => {
+			$("#dsuseDe--${pageName}, #dsuseMthCd--${pageName}, #dsuseSeCd--${pageName}").on("change", () => {
 				isImgSaved = true;
 				isRsltImgRemove = false;
 				if(initDataset)		searchRsltImgList();

src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp

@@ -63,10 +63,12 @@
 		    <label id="${infoPrefix}Paging--${pageName}PagingInfo" class="dataTables_info" role="status" aria-live="polite"></label>
 		    <ul id="${infoPrefix}Paging--${pageName}" class="pagination pagination-primary" style="display: none;">
 		    </ul>
-		    <span class="container-window-btn-right">
 		    <!-- FIXME:: NIMS API 개발 완료후 적용 -->
-<%--		    <input type="checkbox" id="chkBsshCd--${pageName}" name="chkBsshCd" title="업체코드적용" style="align-items: baseline"/>&nbsp;<strong>신규API 업체코드 적용</strong>--%>
+<%--
+		    <span class="container-window-btn-right">
+		    	<input type="checkbox" id="chkBsshCd--${pageName}" name="chkBsshCd" title="업체코드적용" style="align-items: baseline"/>&nbsp;<strong>신규API 업체코드 적용</strong>
 		    </span>
+--%>
 		</div>
 	</div>
 	<div class="card col-6">
@@ -349,7 +351,7 @@
 			}
 
 			// FIXME:: NIMS API 개발 완료후 적용
-			<%--let bsshCd = '${bsshCd}';--%>
+			let bsshCd = '${bsshCd}';
 			<%--if(!$('#chkBsshCd--${pageName}').is(":checked")){--%>
             <%--    bsshCd = '';--%>
             <%--}--%>