diff --git a/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java b/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java index d33b34d..6469ac2 100644 --- a/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java +++ b/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java @@ -377,7 +377,8 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu .unitySndngDetailId(dto.getUnitySndngDetailId()) .tmplatId(dto.getTmplatId()) .mainCode(dto.getTaxNum1()+dto.getTaxNum2()+dto.getTaxNum3()+dto.getTaxNum4()) // 납세번호로 자료 찾기 - .tmpltMsgData(dto.getNapAmountTotal()) // 고객사 요청 사항 납부금액 표기 + .tmpltMsgData(dto.getNapAmountTotal()) // 고객사 요청 사항 납부금액 표기 + .useInsttIdntfcId(dto.getGojiDetailNm()) // 교통시설운영처 제목 가변 항목 .mobilePageCn(mpc) .register(register) .build() @@ -395,12 +396,19 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu String jsonCn = "{" + "\"details\": [" + "{" - + "\"title\": \""+ Checks.checkVal(dto.getGojiNm(),"") + " " + Checks.checkVal(dto.getGojiGubun(),"") +"\"," + + "\"title\": \"제목 : "+ Checks.checkVal(dto.getGojiNm(),"") + "(" + Checks.checkVal(dto.getGojiDetailNm(),"") +")\"," + "\"item_type\": \"SUBJECT_TEXT\"," + "\"elements\": [" + "\"\"" + "]" + "}," + /*+ "{" + + "\"title\": \"내용 : "+ Checks.checkVal(dto.getGojiNm(),"") + " " + Checks.checkVal(dto.getGojiGubun(),"") +" 안내입니다.\"," + + "\"item_type\": \"SUBJECT_TEXT\"," + + "\"elements\": [" + + "\"\"" + + "]" + + "},"*/ + "{" + "\"title\": \"내역\"," + "\"item_type\": \"KEY_VALUE\"," @@ -415,7 +423,12 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu + "}," + "\"elements\": [" + "{" - + "\"key\": \"수취인\"," + + "\"key\": \"부과대상\"," + + "\"value\": \""+ Checks.checkVal(dto.getRecevDetailAddr(),"") +"\"," + + "\"level\": 1" + + "}," + + "{" + + "\"key\": \"납부자\"," + "\"value\": \""+ Checks.checkVal(dto.getRecevNm(),"") +"\"," + "\"level\": 1" + "}," @@ -425,7 +438,7 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu + "\"level\": 1" + "}," + "{" - + "\"key\": \"- 금액\"," + + "\"key\": \"- 사용료\"," + "\"value\": \""+ Checks.checkVal(dto.getNapAmount1(),"") +"\"," + "\"level\": 1" + "}," @@ -462,38 +475,6 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu + "}" + "]" + "}," - /*+ "{" - + "\"title\": \"납세번호\"," - + "\"item_type\": \"TABLE\"," - + "\"elements\": {" - + "\"head\": [" - + "\"기관번호\"," - + "\"세목\"" - + "]," - + "\"rows\": [" - + "[" - + "\""+ Checks.checkVal(dto.getTaxNum1(),"") +"\"," - + "\""+ Checks.checkVal(dto.getTaxNum2(),"") +"\"" - + "]" - + "]" - + "}" - + "}," - + "{" - + "\"title\": \"\"," - + "\"item_type\": \"TABLE\"," - + "\"elements\": {" - + "\"head\": [" - + "\"납세년월기\"," - + "\"과세번호\"" - + "]," - + "\"rows\": [" - + "[" - + "\""+ Checks.checkVal(dto.getTaxNum3(),"") +"\"," - + "\""+ Checks.checkVal(dto.getTaxNum4(),"") +"\"" - + "]" - + "]" - + "}" - + "},"*/ + "{" + "\"title\": \"서울시 세외수입 납부 전용계좌\"," + "\"item_type\": \"KEY_VALUE\"," @@ -531,6 +512,11 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu + "]" + "}," + "{" + + "\"title\" : \"\" ," + + "\"item_type\" : \"PRE_TEXT\"," + + "\"elements\" : \" \\n※ 해당 고지서에 대한 연체료(공유재산법 의거 연7%~15%)는 최종 납부 이후 일할 정산하여 별도 고지서로 부과됩니다.\"" + + "}," + + "{" + "\"title\": \"세외수입 납부방법 안내\"," + "\"item_type\": \"KEY_VALUE\"," + "\"elements\": [" @@ -582,6 +568,12 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu + "]" + "]" + "}" + + "}," + + "{" + + "\"title\" : \"\" ," + + "\"item_type\" : \"PRE_TEXT\"," + + "\"elements\" : \" \\n※ 2022.04.19.까지 연체료율 10%~15%\\n※ 체납 시 보중보험 청구, 재산 압류, 사용료 청구소송 등 조치가 이루어지며," + + " 금융기관 및 신용정보기관에 연체정보가 등록되어 금융거래 등 각종 경제활동에 불이익이 있을 수 있습니다.\"" + "}" + "]" +"}"; @@ -589,6 +581,8 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu } private String jsonCn2(FmcInfExcel dto){ + String buContent3 = Checks.checkVal(dto.getBuContent3().replace("$&$", "\\n"),""); + String jsonCn = "{" + "\"details\": [" + "{" @@ -612,7 +606,7 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu + "}," + "\"elements\": [" + "{" - + "\"key\": \"수취인\"," + + "\"key\": \"납부자\"," + "\"value\": \""+ Checks.checkVal(dto.getRecevNm(),"") +"\"," + "\"level\": 1" + "}," @@ -637,6 +631,11 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu + "\"level\": 1" + "}," + "{" + + "\"key\": \"부과내역\"," + + "\"value\": \""+ buContent3 +"\"," + + "\"level\": 1" + + "}," + + "{" + "\"key\": \"납세번호\"," + "\"value\": \""+ Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(),"") +"\\\\n※ ETAX 납부 시 29자리 입력\"," diff --git a/mens-api/src/main/resources/egovframework/mapper/biz/ens-sisul-mysql-mapper.xml b/mens-api/src/main/resources/egovframework/mapper/biz/ens-sisul-mysql-mapper.xml index 6dfbdef..50db895 100644 --- a/mens-api/src/main/resources/egovframework/mapper/biz/ens-sisul-mysql-mapper.xml +++ b/mens-api/src/main/resources/egovframework/mapper/biz/ens-sisul-mysql-mapper.xml @@ -56,6 +56,7 @@ main_code, /* 메인 코드 - 자료 식별 코드 */ tmplt_msg_data, /* 템플릿 메시지 데이터 - 가변 항목 자료 */ mobile_page_cn, /* 모바일 페이지 내용 */ + use_instt_idntfc_id, /* 이용 기관 식별 ID - 교통시설 운영처 제목 가변 */ regist_dt, register ) @@ -66,6 +67,7 @@ , #{mainCode} , #{tmpltMsgData} , #{mobilePageCn} + , #{useInsttIdntfcId} , now() , #{register} FROM tb_ens_tmplat_manage tetm diff --git a/mens-batch/src/main/resources/egovframework/mapper/biz/ens-mysql-mapper.xml b/mens-batch/src/main/resources/egovframework/mapper/biz/ens-mysql-mapper.xml index 83329e5..6256d97 100644 --- a/mens-batch/src/main/resources/egovframework/mapper/biz/ens-mysql-mapper.xml +++ b/mens-batch/src/main/resources/egovframework/mapper/biz/ens-mysql-mapper.xml @@ -248,7 +248,8 @@ , #{sndngMastrId} , teusm.signgu_code , teusm.ffnlg_code - , tetm.tmplat_nm + , CASE WHEN teusm.signgu_code='88328' THEN CONCAT(tetm.tmplat_sj, '(', teusd.use_instt_idntfc_id, ')') + ELSE tetm.tmplat_sj END , SHA2(teusd.unity_sndng_detail_id, 256) , '[NOTICE]' , unix_timestamp(teusm.clos_dt)