diff --git a/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java b/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java index 47e0470a..8bd893af 100644 --- a/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java @@ -216,7 +216,7 @@ public class CtznStmtDTO implements Serializable { //extends ExtlEsbDataType { @Builder @ToString public static class Request { - private String ctznSttemntDetailSn; private String interfaceSeqN; + private String ctznSttemntDetailSn; } } diff --git a/src/main/java/kr/xit/fims/biz/ec/web/EcCtznSttemntController.java b/src/main/java/kr/xit/fims/biz/ec/web/EcCtznSttemntController.java index a0e87518..0faf1b82 100644 --- a/src/main/java/kr/xit/fims/biz/ec/web/EcCtznSttemntController.java +++ b/src/main/java/kr/xit/fims/biz/ec/web/EcCtznSttemntController.java @@ -1,7 +1,5 @@ package kr.xit.fims.biz.ec.web; -import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; @@ -9,10 +7,8 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.Mapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import kr.xit.fims.biz.FimsConst; @@ -22,7 +18,6 @@ import kr.xit.framework.biz.cmm.model.CmmFileDTO; import kr.xit.framework.biz.cmm.service.ICmmFileService; import kr.xit.framework.core.model.ResultResponse; import kr.xit.framework.support.mybatis.MybatisUtils; -import kr.xit.framework.support.util.ConvertUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -47,16 +42,15 @@ public class EcCtznSttemntController { @RequestMapping(value = "/ecCtznSttemntMgtPopup") //@ResponseBody - public ModelAndView ecCtznSttemntMgtPopup(final String interfaceSeqN){ + public ModelAndView ecCtznSttemntMgtPopup(final CtznStmtDTO.Request reqDTO){ ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"ec/ecCtznSttemntMgtPopup.popup"); - CtznStmtDTO.Request reqDTO = CtznStmtDTO.Request.builder() - .interfaceSeqN(interfaceSeqN) - //.ctznSttemntDetailSn("01") + CtznStmtDTO.Request newReqDTO = CtznStmtDTO.Request.builder() + .interfaceSeqN(reqDTO.getInterfaceSeqN()) .build(); - mav.addObject("interfaceSeqN", interfaceSeqN); - mav.addObject("ctznStmtDTO", service.findCtznStmt(reqDTO)); - mav.addObject("ctznStmtDtlDTOs", service.findCtznStmtDtls(reqDTO)); + mav.addObject("reqDTO", reqDTO); + mav.addObject("ctznStmtDTO", service.findCtznStmt(newReqDTO)); + mav.addObject("ctznStmtDtlDTOs", service.findCtznStmtDtls(newReqDTO)); return mav; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp index e475bb44..756911a8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp @@ -91,7 +91,7 @@ } ,onClickGrid: function(props){ const rowData = props.grid.getRow(props.rowKey); - fnBiz.pagePopup('detail', {interfaceSeqN: rowData.interfaceSeqN}); + fnBiz.pagePopup('detail', {interfaceSeqN: rowData.interfaceSeqN, ctznSttemntDetailSn: rowData.ctznSttemntDetailSn}); } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp index c3d617a2..ab94f332 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp @@ -8,7 +8,7 @@