Merge branch 'refs/heads/main' into dev

-> 상세조회 화면으로 처리 되도록 변경
     -> 요청 헤더 크기 오류 fix

src/main/java/cokr/xit/adds/cmm/model/DsuseReceiptDtl.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 @Data
 public class DsuseReceiptDtl {
-
+    private String dscdmngId;
 	private String dscdmngSn;
     private String prductNm;
     private String prductCd;
@@ -16,4 +16,5 @@ public class DsuseReceiptDtl {
     private String pceQy;
     private String pceUnit;
     private String dsuseQy;
+    private String usrRptLnIdNo;
 }

src/main/java/cokr/xit/adds/nims/dao/ApiKeyMapper.java

@@ -5,7 +5,6 @@ import java.util.List;
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
 import cokr.xit.adds.nims.ApiKeyQuery;
-import cokr.xit.adds.nims.DsuseMgtReceiptQuery;
 import cokr.xit.foundation.component.AbstractMapper;
 import cokr.xit.foundation.data.DataObject;
 

src/main/java/cokr/xit/adds/nims/dao/DsuseMgtDetailMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
+import cokr.xit.adds.cmm.model.DsuseReceiptDtl;
 import cokr.xit.adds.nims.DsuseMgtDetailQuery;
 import cokr.xit.foundation.component.AbstractMapper;
 import cokr.xit.foundation.data.DataObject;
@@ -20,4 +21,11 @@ public interface DsuseMgtDetailMapper extends AbstractMapper {
 	 */
 	List<DataObject> selectDsuseMgtDetailList(DsuseMgtDetailQuery req);
 
+	/**
+	 * 신청서접수 상세 페이지용 조회
+	 * @param dscdmngId
+	 * @return
+	 */
+	List<DsuseReceiptDtl> selectDsuseMgtDtlList(String dscdmngId);
+
 }

src/main/java/cokr/xit/adds/nims/service/DsuseMgtReceiptService.java

@@ -2,6 +2,7 @@ package cokr.xit.adds.nims.service;
 
 import java.util.List;
 
+import cokr.xit.adds.cmm.model.DsuseReceiptDtl;
 import cokr.xit.adds.nims.DsuseMgtReceiptQuery;
 import cokr.xit.foundation.data.DataObject;
 
@@ -16,6 +17,7 @@ public interface DsuseMgtReceiptService {
 	 */
 	List<DataObject> getDsuseMgtReceiptList(DsuseMgtReceiptQuery query);
 
+	List<DsuseReceiptDtl> getDsuseMgtDetailList(String dscdmngId);
 
 	/**
 	 * 신청서 접수 삭제.

src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java

@@ -6,7 +6,9 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
+import cokr.xit.adds.cmm.model.DsuseReceiptDtl;
 import cokr.xit.adds.nims.DsuseMgtReceiptQuery;
+import cokr.xit.adds.nims.dao.DsuseMgtDetailMapper;
 import cokr.xit.adds.nims.dao.DsuseMgtReceiptMapper;
 import cokr.xit.adds.nims.service.DsuseMgtReceiptService;
 import cokr.xit.foundation.component.AbstractServiceBean;
@@ -19,6 +21,9 @@ public class DsuseMgtReceiptServiceBean extends AbstractServiceBean implements D
 	@Resource(name = "dsuseMgtReceiptMapper")
 	private DsuseMgtReceiptMapper dsuseMgtReceiptMapper;
 
+	@Resource(name = "dsuseMgtDetailMapper")
+	private DsuseMgtDetailMapper dsuseMgtDetailMapper;
+
 	@Override
 	public List<DataObject> getDsuseMgtReceiptList(DsuseMgtReceiptQuery query){
 		if(ifEmpty(query.getOrderBy(), ()->"").equals("")) {
@@ -28,6 +33,11 @@ public class DsuseMgtReceiptServiceBean extends AbstractServiceBean implements D
 		return dsuseMgtReceiptMapper.selectDsuseMgtReceiptList(query);
 	}
 
+	@Override
+	public List<DsuseReceiptDtl> getDsuseMgtDetailList(String dscdmngId){
+		return dsuseMgtDetailMapper.selectDsuseMgtDtlList(dscdmngId);
+	}
+
 	/** 신청서 접수 삭제.
 	 * @param query DsuseMgtReceiptQuery
 	 * @return 저장된 정보수

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

@@ -160,32 +160,22 @@ public class AddsNimsController extends ApplicationController {
 
 
     @RequestMapping(value = "/dsuseMgtReceipt-info.do", name="신청서 접수 상세")
-    public ModelAndView getDsuseMgtReceiptInfo(DsuseRsltInfo dsuseReceptInfo, String productList) {
+    public ModelAndView getDsuseMgtReceiptInfo(DsuseRsltInfo dsuseReceptInfo) {
         ModelAndView mav = new ModelAndView();
         setCmmCode("ADDS04", mav);
-
-        List<DataObject> fileInfo = new ArrayList<DataObject>();
-        if(fileInfo == null) { fileInfo = new ArrayList<DataObject>();}
-        fileInfo = fileInfo.stream()
-	        .filter((item) -> item.string("USE_YN").equals("Y"))
-	        .sorted((item1, item2) -> item1.string("SUB_TYPE").compareTo(item2.string("SUB_TYPE")))
-	        .toList();
+        List<DataObject> fileInfo = new ArrayList<>();
 
         if(!isEmpty(dsuseReceptInfo) && !isEmpty(dsuseReceptInfo.getDscdmngId())){
-            mav.setViewName("adds/nims/dsuseMgtReceipt-edit");
             mav.addObject("dsuseReceptInfo", toJson(dsuseReceptInfo));
+            mav.addObject("dsuseReceptDtlInfo", toJson(dsuseMgtReceiptService.getDsuseMgtDetailList(dsuseReceptInfo.getDscdmngId())));
 
             FileQuery fileQuery = new FileQuery().setInfoType("100").setInfoKeys(dsuseReceptInfo.getDscdmngId()).setOrderBy("SUB_TYPE");
             fileInfo = fileService.getFileList(fileQuery);
-        }else{
-            mav.setViewName("adds/nims/dsuseMgtReceipt-info");
-        }
 
-        if(productList != null) {
-        	List<DsuseReceiptDtl> DsuseReceiptDtls = fromJson(productList, new TypeReference<List<DsuseReceiptDtl>>() {});
-        	mav.addObject("dsuseReceptDtlInfo", toJson(DsuseReceiptDtls));
-        } else {
+            mav.setViewName("adds/nims/dsuseMgtReceipt-edit");
+        }else{
             mav.addObject("dsuseReceptDtlInfo", toJson(new ArrayList<DsuseReceiptDtl>()));
+            mav.setViewName("adds/nims/dsuseMgtReceipt-info");
         }
 
         mav.addObject("fileInfo", toJson(fileInfo));

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

@@ -35,4 +35,22 @@
         <include refid="utility.paging-suffix" />
     </select>
 
+
+	<select id="selectDsuseMgtDtlList" parameterType="string" resultType="cokr.xit.adds.cmm.model.DsuseReceiptDtl">
+		SELECT DSCDMNG_ID AS dscdmngId										/* 폐기관리 ID */
+			 , DSCDMNG_SN AS dscdmngSn										/* 폐기관리_순번 */
+			 , PRDUCT_CD AS prductCd											/* 제품_코드 */
+			 , PRDUCT_NM AS prductNm											/* 제품_명 */
+			 , MIN_DISTB_QY	AS minDistbQy									/* 최소_유통단위_수량 */
+			 , MIN_DISTB_UNIT AS minDistbUnit									/* 최소_유통_단위 */
+			 , PCE_QY AS pceQy											/* 낱개단위_수량 */
+			 , PCE_UNIT AS pceUnit											/* 낱개_단위 */
+			 , MNF_NO AS mnfNo											/* 제조_번호 */
+			 , PRD_VALID_DE	AS prdValidDe									/* 제품_유효기한_일자 */
+			 , MNF_SEQ AS mnfSeq										/* 제조_일련번호 */
+			 , DSUSE_QY	AS dsuseQy										/* 폐기_수량 */
+			 , USR_RPT_LN_ID_NO usrRptLnIdNo									/* 사용자_보고_라인_식별_번호 */
+		FROM TB_DSUSE_MGT_DTL
+	   WHERE DSCDMNG_ID = #{dscdmngId}
+	</select>
 </mapper>

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

@@ -308,27 +308,27 @@
                     dsuseAcdtDe: row.DSUSE_ACDT_DE,
                     prgrsSttsCd: row.PRGRS_STTS_CD
                 };
-                let productDS = $P.detailControl.dataset.getDataset();
-                if(productDS.length > 0){
-					let newArr = [];
-                	for(let product of productDS){
-						let newObj = {};
-						newObj.dscdmngSn = product.DSCDMNG_SN;
-						newObj.prductNm = product.PRDUCT_NM;
-						newObj.prductCd = product.PRDUCT_CD;
-						newObj.prdValidDe = product.PRD_VALID_DE;
-						newObj.mnfNo = product.MNF_NO;
-						newObj.mnfSeq = product.MNF_SEQ;
-						newObj.minDistbQy = product.MIN_DISTB_QY;
-						newObj.minDistbUnit = product.MIN_DISTB_UNIT;
-						newObj.pceQy = product.PCE_QY;
-						newObj.pceUnit = product.PCE_UNIT;
-						newObj.dsuseQy = product.DSUSE_QY;
-                		newArr.push(newObj);
-					}
-                	params.productList = JSON.stringify(newArr);
-                	
-                }
+                // let productDS = $P.detailControl.dataset.getDataset();
+                // if(productDS.length > 0){
+				// 	let newArr = [];
+                // 	for(let product of productDS){
+				// 		let newObj = {};
+				// 		newObj.dscdmngSn = product.DSCDMNG_SN;
+				// 		newObj.prductNm = product.PRDUCT_NM;
+				// 		newObj.prductCd = product.PRDUCT_CD;
+				// 		newObj.prdValidDe = product.PRD_VALID_DE;
+				// 		newObj.mnfNo = product.MNF_NO;
+				// 		newObj.mnfSeq = product.MNF_SEQ;
+				// 		newObj.minDistbQy = product.MIN_DISTB_QY;
+				// 		newObj.minDistbUnit = product.MIN_DISTB_UNIT;
+				// 		newObj.pceQy = product.PCE_QY;
+				// 		newObj.pceUnit = product.PCE_UNIT;
+				// 		newObj.dsuseQy = product.DSUSE_QY;
+                // 		newArr.push(newObj);
+				// 	}
+                // 	params.productList = JSON.stringify(newArr);
+                //
+                // }
             }
 			
             ajax.get({