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 2910bffc..28f9f73e 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 @@ -53,8 +53,8 @@ public class EcCtznSttemntController { .interfaceSeqN(reqDTO.getInterfaceSeqN()) .build(); mav.addObject("reqDTO", reqDTO); - mav.addObject("ctznStmtDTO", service.findCtznStmt(newReqDTO)); - mav.addObject("ctznStmtDtlDTOs", service.findCtznStmtDtls(newReqDTO)); + mav.addObject("ctznDTO", service.findCtznStmt(newReqDTO)); + mav.addObject("ctznDtlDTOs", service.findCtznStmtDtls(newReqDTO)); return mav; } @@ -81,6 +81,21 @@ public class EcCtznSttemntController { return ResultResponse.of(service.findCtznStmtDtl(dto)); } + @RequestMapping(value = "/findCtznStmtDtlAndAttchFiles") + public ModelAndView findCtznStmtDtlAndAttchFiles(final CtznStmtDTO.Request dto) { + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + mav.addObject("ctznDTO", service.findCtznStmt(dto)); + mav.addObject("ctznDtlDTOs", service.findCtznStmtDtls(dto)); + mav.addObject("attchFiles", fileService.findFilesByEsbInterfaces( + CmmFileDTO.FileMst.builder() + .jobSeCode(FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode()) + .fileJobId(dto.getInterfaceSeqN()+dto.getCtznSttemntDetailSn()) + .build()).stream() + .filter(dtl -> !Objects.equals("png", dtl.getFileExtsn())) + .collect(Collectors.toList())); + return mav; + } + @RequestMapping("/findCtznStmtAttchFiles") public ModelAndView findCtznStmtAttchFiles(final CtznStmtDTO.Request dto) { return ResultResponse.of( diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp index c418a448..12392965 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp @@ -43,7 +43,6 @@
-<%----%> -<%----%> - +