의견제출 심의의결서 출력 수정.

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<DataObject> dataObjectList, PrintOption printOption,
+	public void writeGlobalInfo(HWPFile baseFile, List<DataObject> dataObjectList, PrintOption printOption, HWPPrintUtil hwpPrintUtil) {
-			HWPPrintUtil hwpPrintUtil) {
+
 	}
 
 	@Override
-	public void writeSingleDataInfo(HWPFile baseFile, HWPFile attachFile, DataObject dataObject,
+	public void writeSingleDataInfo(HWPFile baseFile, HWPFile attachFile, DataObject dataObject, HWPPrintUtil hwpPrintUtil) {
-			HWPPrintUtil hwpPrintUtil) {
-
 		ClickHereEditor baseFileEditor = new ClickHereEditor(baseFile);
 
-		baseFileEditor.set("접수번호", dataObject.string("RCPT_NO"));
+		baseFileEditor.set("접수번호", dataObject.string("RCPT_NO_MASK"));
-		baseFileEditor.set("접수일자", dataObject.string("RCPT_YMD"));
+		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"));
-
 	}
 
 }

src/main/java/cokr/xit/fims/excl/service/OpnnSbmsnService.java

@@ -91,6 +91,6 @@ public interface OpnnSbmsnService {
 	 *     <li>fileName: 다운로드 파일명</li>
 	 * </ul>
 	 */
-	Map<String, String> makeDlbrDecsnFileFromHwpFormat(String formatType, String formatName, PrintOption printOption, String... opnnIDs);
+	Map<String, String> makeDlbrDecsnFileFromHwpFormat(String formatType, String formatName, PrintOption printOption, LevyExclQuery req);
 
 }

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<String, String> makeDlbrDecsnFileFromHwpFormat(String formatType, String formatName, PrintOption printOption, String... opnnIDs) {
+	public Map<String, String> makeDlbrDecsnFileFromHwpFormat(String formatType, String formatName, PrintOption printOption, LevyExclQuery req) {
 		Map<String, String> result = new HashMap<>();
 
 		HWPPrintUtil printUtil = new HWPPrintUtil();
@@ -129,7 +129,7 @@ public class OpnnSbmsnServiceBean extends AbstractServiceBean implements OpnnSbm
 
 		List<DataObject> dataObjectList = null;
 
-		dataObjectList = opnnSbmsnBean.getOpnnSbmsnDlbrDecsns(new LevyExclQuery().setOpnnIDs(opnnIDs));
+		dataObjectList = opnnSbmsnBean.getOpnnSbmsnDlbrDecsns(req);
 
 		int totalDataCount = dataObjectList.size();
 		List<String> partFileList = new ArrayList<>();

src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java

@@ -303,7 +303,7 @@ public class Excl02Controller extends ApplicationController {
 		Map<String,String> 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");
 

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

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

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

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);
 	            }
 			}