From d13aa4c8fff49aee1c75faa96deaa08b85fa1277 Mon Sep 17 00:00:00 2001 From: kjh Date: Fri, 20 Oct 2023 15:16:15 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=A7=88=EA=B0=90=EC=9D=BC=EC=8B=9C=20?= =?UTF-8?q?=EB=B0=8F=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=AC=B8=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/cmm/service/CmmEnsFileService.java | 29 +++++++++---------- .../mapper/biz/ens-cmm-file-mysql-mapper.xml | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/mens-api/src/main/java/kr/xit/biz/cmm/service/CmmEnsFileService.java b/mens-api/src/main/java/kr/xit/biz/cmm/service/CmmEnsFileService.java index 05af6ad..3af9108 100644 --- a/mens-api/src/main/java/kr/xit/biz/cmm/service/CmmEnsFileService.java +++ b/mens-api/src/main/java/kr/xit/biz/cmm/service/CmmEnsFileService.java @@ -286,6 +286,7 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn .unitySndngMastrId(dto.getUnitySndngMastrId()) .tmplatId(dto.getTmplatId()) .sndngDt(dto.getSndngDt()) + .closDt(dto.getNapPd() + "235959") .sndngCo(excelCnt) .sndngProcessSttus(ApiConstants.SndngProcessStatus.ACCEPT.getCode()) .register(register) @@ -370,21 +371,19 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn + "}," + "{" + "\"title\": \"세외수입 납부방법 안내\"," - + "\"item_type\": \"TABLE\"," - + "\"elements\": {" - + "\"head\": [" - + "\"가상계좌\\\\납부\"," - + "\"모바일\\\\n어플\"" - + "]," - + "\"rows\": [" - + "[" - + "\"고지서에 기재된 가상계좌로 이체,납부\\\\n고지서 금액과 일치해야 이체 가능\"" - + "]," - + "[" - + "\"앱,PLAY스토어에서 (서울시 세금납부) 앱 설치\\\\n계좌이체(전 은행), 신용카드, 간편결제 납부\"" - + "]" - + "]" - + "}" + + "\"item_type\": \"KEY_VALUE\"," + + "\"elements\": [" + + "{" + + "\"key\": \"가상계좌\\\\n납부\"," + + "\"value\": \"고지서에 기재된 가상계좌로 이체,납부\\\\n고지서 금액과 일치해야 이체 가능\"," + + "\"level\": 1" + + "}," + + "{" + + "\"key\": \"모바일\\\\n어플\"," + + "\"value\": \"앱,PLAY스토어에서 (서울시 세금납부) 앱 설치\\\\n계좌이체(전 은행), 신용카드, 간편결제 납부\"," + + "\"level\": 1" + + "}" + + "]" + "}" + "]" +"}"; diff --git a/mens-api/src/main/resources/egovframework/mapper/biz/ens-cmm-file-mysql-mapper.xml b/mens-api/src/main/resources/egovframework/mapper/biz/ens-cmm-file-mysql-mapper.xml index 909267c..b986fe2 100644 --- a/mens-api/src/main/resources/egovframework/mapper/biz/ens-cmm-file-mysql-mapper.xml +++ b/mens-api/src/main/resources/egovframework/mapper/biz/ens-cmm-file-mysql-mapper.xml @@ -27,7 +27,7 @@ , #{sndngCo} , #{sndngProcessSttus} , #{sndngDt} - , date_format(date_add(#{sndngDt}, interval +1 day), '%Y%m%d%H%i%S') + , #{closDt} , now() , #{register} FROM tb_ens_tmplat_manage tetm