From 912603c0de8aceb2e67fa75a8568e74c0ebad1bb Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 27 Nov 2023 13:37:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=98=EA=B2=AC=EC=A0=9C=EC=B6=9C=20?= =?UTF-8?q?=EC=8B=AC=EC=9D=98=EC=9D=98=EA=B2=B0=EC=84=9C=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/cmmn/hwp/format/DlbrDecsn.java | 16 +++++++--------- .../xit/fims/excl/service/OpnnSbmsnService.java | 2 +- .../excl/service/bean/OpnnSbmsnServiceBean.java | 4 ++-- .../cokr/xit/fims/excl/web/Excl02Controller.java | 2 +- .../cokr/xit/fims/task/web/CmnController.java | 10 ---------- .../cokr/xit/fims/task/web/DpvController.java | 6 ++++++ .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml | 9 ++++----- .../WEB-INF/jsp/fims/sprt/sprt02030-info.jsp | 4 +--- 8 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/DlbrDecsn.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/DlbrDecsn.java index b7c85969..84d60dde 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/DlbrDecsn.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/DlbrDecsn.java @@ -24,23 +24,22 @@ public class DlbrDecsn implements HWPFormatWriter { } @Override - public void writeGlobalInfo(HWPFile baseFile, List dataObjectList, PrintOption printOption, - HWPPrintUtil hwpPrintUtil) { + public void writeGlobalInfo(HWPFile baseFile, List dataObjectList, PrintOption printOption, HWPPrintUtil hwpPrintUtil) { + } @Override - public void writeSingleDataInfo(HWPFile baseFile, HWPFile attachFile, DataObject dataObject, - HWPPrintUtil hwpPrintUtil) { - + public void writeSingleDataInfo(HWPFile baseFile, HWPFile attachFile, DataObject dataObject, HWPPrintUtil hwpPrintUtil) { ClickHereEditor baseFileEditor = new ClickHereEditor(baseFile); - baseFileEditor.set("접수번호", dataObject.string("RCPT_NO")); - baseFileEditor.set("접수일자", dataObject.string("RCPT_YMD")); + baseFileEditor.set("접수번호", dataObject.string("RCPT_NO_MASK")); + baseFileEditor.set("접수일", dataObject.string("RCPT_YMD_MASK")); baseFileEditor.set("위반정보", dataObject.string("TASK_SE_NM")); baseFileEditor.set("진술자명", dataObject.string("STTR_NM")); - baseFileEditor.set("진술자생년월일", dataObject.string("STTR_BRDT")); + baseFileEditor.set("진술자생년월일", dataObject.string("STTR_BRDT_FORMAT")); baseFileEditor.set("진술자연락처", dataObject.string("STTR_CTTPC")); baseFileEditor.set("소유주관계", dataObject.string("OWNR_REL_NM")); + baseFileEditor.set("진술자주소", dataObject.string("STTR_WHOL_ADDR")); baseFileEditor.set("차량번호", dataObject.string("VHRNO")); baseFileEditor.set("단속일시", dataObject.string("CRDN_YMD_TM_MASK")); baseFileEditor.set("단속장소", dataObject.string("CRDN_PLC")); @@ -60,7 +59,6 @@ public class DlbrDecsn implements HWPFormatWriter { baseFileEditor.set("심의회원직급7", dataObject.string("DLBR_MBR_JBGD7")); baseFileEditor.set("심의회원명7", dataObject.string("DLBR_MBR_NM7")); baseFileEditor.set("담당자검토의견", dataObject.string("PIC_RVW_OPNN")); - } } diff --git a/src/main/java/cokr/xit/fims/excl/service/OpnnSbmsnService.java b/src/main/java/cokr/xit/fims/excl/service/OpnnSbmsnService.java index 4cb58e47..0f88ed69 100644 --- a/src/main/java/cokr/xit/fims/excl/service/OpnnSbmsnService.java +++ b/src/main/java/cokr/xit/fims/excl/service/OpnnSbmsnService.java @@ -91,6 +91,6 @@ public interface OpnnSbmsnService { *
  • fileName: 다운로드 파일명
    • * */ - Map makeDlbrDecsnFileFromHwpFormat(String formatType, String formatName, PrintOption printOption, String... opnnIDs); + Map makeDlbrDecsnFileFromHwpFormat(String formatType, String formatName, PrintOption printOption, LevyExclQuery req); } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java index 226ae161..c421b7f6 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java @@ -116,7 +116,7 @@ public class OpnnSbmsnServiceBean extends AbstractServiceBean implements OpnnSbm } @Override - public Map makeDlbrDecsnFileFromHwpFormat(String formatType, String formatName, PrintOption printOption, String... opnnIDs) { + public Map makeDlbrDecsnFileFromHwpFormat(String formatType, String formatName, PrintOption printOption, LevyExclQuery req) { Map result = new HashMap<>(); HWPPrintUtil printUtil = new HWPPrintUtil(); @@ -129,7 +129,7 @@ public class OpnnSbmsnServiceBean extends AbstractServiceBean implements OpnnSbm List dataObjectList = null; - dataObjectList = opnnSbmsnBean.getOpnnSbmsnDlbrDecsns(new LevyExclQuery().setOpnnIDs(opnnIDs)); + dataObjectList = opnnSbmsnBean.getOpnnSbmsnDlbrDecsns(req); int totalDataCount = dataObjectList.size(); List partFileList = new ArrayList<>(); diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index d63e4a89..d3bceeae 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -303,7 +303,7 @@ public class Excl02Controller extends ApplicationController { Map result = null; PrintOption printOption = new PrintOption(); - result = opnnSbmsnService.makeDlbrDecsnFileFromHwpFormat("info", "dlbrDecsn", printOption, req.getOpnnIDs()); + result = opnnSbmsnService.makeDlbrDecsnFileFromHwpFormat("info", "dlbrDecsn", printOption, req); ModelAndView mav = new ModelAndView("jsonView"); diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java index 1a2daf7e..100a1ad1 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.fims.sprt.PrintOption; import cokr.xit.fims.sprt.SprtQuery; import cokr.xit.fims.stat.StatQuery; @@ -201,15 +200,6 @@ public class CmnController { return super.opinionSubmissionMain(); } - /** 의견제출 관리 메인화면을 연다. - * @return fims/excl/excl02010-main - */ - @Override - @RequestMapping(name = "의견제출 관리 메인", value = METHOD_URL.makeDlbrDecsnFileFromHwpFormat) - public ModelAndView makeDlbrDecsnFileFromHwpFormat(LevyExclQuery req) { - return super.makeDlbrDecsnFileFromHwpFormat(req); - } - } @Controller diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index 23eb4575..7ff8fd27 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -428,6 +428,12 @@ public class DpvController { return super.removeOpinionSubmission(opnnSbmsn); } + @Override + @RequestMapping(name="의견제출 심의의결서 출력", value = METHOD_URL.makeDlbrDecsnFileFromHwpFormat) + public ModelAndView makeDlbrDecsnFileFromHwpFormat(LevyExclQuery req) { + return super.makeDlbrDecsnFileFromHwpFormat(req); + } + } @Controller diff --git a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml index c8d9340d..30ae5be6 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -333,6 +333,7 @@ , C.CRDN_YMD , C.CRDN_TM , C.VHRNO + , C.CRDN_PLC , C.CRDN_STTS_CD , C.CRDN_STTS_CHG_DT , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM @@ -345,23 +346,21 @@ , OS.OWNR_REL_CD , OS.STTR_NM , OS.STTR_BRDT - , OS.STTR_RRNO - , OS.STTR_ADDR - , OS.STTR_DADDR , OS.STTR_ZIP , OS.STTR_CTTPC , OS.STTR_EML , OS.OPNN_SBMSN_CN , OS.OPNN_SBMSN_SE_CD , OS.OPNN_SBMSN_GIST - , OS.ATCH_FILE_CNT , OS.DOC_NO , OS.NTFCTN_SE_CD , OS.PIC_RVW_OPNN , OS.OPNN_SBMSN_STTS_CD + , (CONCAT(SUBSTR(OS.RCPT_NO, 1, 4), '-', SUBSTR(OS.RCPT_NO, 5, 6))) AS RCPT_NO_MASK , (SELECT GET_MASK_DATE(OS.RCPT_YMD, '-') FROM DUAL) AS RCPT_YMD_MASK , (SELECT GET_CODE_NM('FIM032', OS.OWNR_REL_CD) FROM DUAL) AS OWNR_REL_NM - , (SELECT GET_BRDT_FORMAT(OS.STTR_BRDT, '-') FROM DUAL) AS STTR_BRDT_FORMAT + , (SELECT GET_BRDT_FORMAT(OS.STTR_BRDT, '.') FROM DUAL) AS STTR_BRDT_FORMAT + , (CONCAT(OS.STTR_ADDR, ' ', OS.STTR_DADDR)) AS STTR_WHOL_ADDR , (SELECT GET_CODE_NM('FIM033', OS.OPNN_SBMSN_SE_CD) FROM DUAL) AS OPNN_SBMSN_SE_NM , (SELECT GET_CODE_NM('FIM031', OS.OPNN_SBMSN_STTS_CD) FROM DUAL) AS OPNN_SBMSN_STTS_NM FROM TB_CRDN C diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp index 2ca766ee..55d66bd5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp @@ -273,7 +273,7 @@ if (!params) return; ajax.get({ - url : wctx.url("/excl/excl02/040/makeDlbrDecsnHwp.do") + url : wctx.url(params.taskSeCd + "/excl/excl02/040/makeDlbrDecsnHwp.do") , data : params || {} , success : resp => { if (resp.filePath != null && resp.filePath != "") { @@ -283,9 +283,7 @@ a.download = resp.fileName; document.getElementById("tempArea--${pageName}").appendChild(a); - a.click(); - document.getElementById("tempArea--${pageName}").removeChild(a); } }