xit-java
/
mens-traffic-parent
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
dev
gitea-관리자 1 year ago
parent 429771ba9c 5df60166af
commit 5de307eca0
2 changed files with 88 additions and 51 deletions
Show Stats Download Patch File Download Diff File

135
mens-api/src/main/java/kr/xit/biz/cmm/service/CmmEnsFileService.java
Unescape Escape View File

@ -374,14 +374,14 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
String jsonCn = "{"
+ "\"details\": ["
+ "{"
+ "\"title\": \"서울시설공단 고지서\","
+ "\"title\": \""+ Checks.checkVal(dto.getGojiNm(),"") + " " + Checks.checkVal(dto.getGojiGubun(),"") +"\","
+ "\"item_type\": \"SUBJECT_TEXT\","
+ "\"elements\": ["
+ "\"\""
+ "]"
+ "},"
+ "{"
+ "\"title\": \"내용\","
+ "\"title\": \"내역\","
+ "\"item_type\": \"KEY_VALUE\","
+ "\"properties\": {"
+ "},"
@ -391,54 +391,39 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
+ "\"value\": \""+ Checks.checkVal(dto.getRecevNm(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"고지서\","
+ "\"value\": \""+ Checks.checkVal(dto.getGojiNm(),"") +"("+ Checks.checkVal(dto.getGojiGubun(),"") +")"+"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"고지서 상세\","
+ "\"value\": \""+ Checks.checkVal(dto.getGojiDetailNm(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
/* + "{"
+ "\"key\": \"납세번호\","
+ "\"value\": \""+ Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "},"*/
+ "{"
+ "\"key\": \"\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmountNm1(),"") +"\","
+ "\"key\": \"납부금액\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmountTotal(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"금액\","
+ "\"key\": \" - 금액\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmount1(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \""+ Checks.checkVal(dto.getNapAmountDetailNm1(),"") +"\","
+ "\"key\": \" - "+ Checks.checkVal(dto.getNapAmountDetailNm1(),"") +"\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmount2(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \""+ Checks.checkVal(dto.getNapAmountDetailNm2(),"") +"\","
+ "\"key\": \" - "+ Checks.checkVal(dto.getNapAmountDetailNm2(),"") +"\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmount3(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
/* + "{"
+ "\"key\": \""+ Checks.checkVal(dto.getNapAmountDetailNm3(),"") +"\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmount4(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"합계액\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmountTotal(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "},"*/
+ "{"
+ "\"key\": \""+ Checks.checkVal(dto.getNapGubun1(),"") +"\","
+ "\"value\": \""+ Checks.checkVal(formatDate(dto.getNapPd().substring(0,8), "-"),"") +"까지 "+ Checks.checkVal(dto.getNapAmountTotal(),"") + "원\","
+ "\"value\": \""+ Checks.checkVal(formatDate(dto.getNapPd().substring(0,8), "-"),"") +"까지\","
+ "\"level\": 1"
+ "},"
+ "{"
@ -449,6 +434,38 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
+ "]"
+ "},"
+ "{"
+ "\"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\","
+ "\"properties\": {"
@ -533,14 +550,14 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
String jsonCn = "{"
+ "\"details\": ["
+ "{"
+ "\"title\": \"서울특별시 시립승화원 고지서\","
+ "\"title\": \""+ Checks.checkVal(dto.getGojiNm(),"") + " " + Checks.checkVal(dto.getGojiGubun(),"") +"\","
+ "\"item_type\": \"SUBJECT_TEXT\","
+ "\"elements\": ["
+ "\"\""
+ "]"
+ "},"
+ "{"
+ "\"title\": \"내용\","
+ "\"title\": \"내역\","
+ "\"item_type\": \"KEY_VALUE\","
+ "\"properties\": {"
+ "},"
@ -550,7 +567,7 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
+ "\"value\": \""+ Checks.checkVal(dto.getRecevNm(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
/* + "{"
+ "\"key\": \"고지서\","
+ "\"value\": \""+ Checks.checkVal(dto.getGojiNm(),"") +"("+ Checks.checkVal(dto.getGojiGubun(),"") +")"+"\","
+ "\"level\": 1"
@ -559,7 +576,7 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
+ "\"key\": \"고지서 상세\","
+ "\"value\": \""+ Checks.checkVal(dto.getGojiDetailNm(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "},"*/
+ "{"
+ "\"key\": \"자료관리번호\","
+ "\"value\": \""+ Checks.checkVal(dto.getDataSn(),"") +"\","
@ -569,11 +586,6 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
+ "\"key\": \"관리비 기간\","
+ "\"value\": \""+ Checks.checkVal(dto.getCostPd(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"납세번호\","
+ "\"value\": \""+ Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(),"") +"\","
+ "\"level\": 1"
+ "}"
+ "]"
+ "},"
@ -583,8 +595,8 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
+ "\"elements\": {"
+ "\"head\": ["
+ "\"구 분\","
+ "\"납기내 금액\","
+ "\"납기후 금액\""
+ "\"납기내\","
+ "\"납기후\""
+ "],"
+ "\"rows\": ["
+ "["
@ -597,25 +609,52 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
+ "\"" + Checks.checkVal(dto.getNapAmount2(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftAmount2(),"") + "\""
+ "],"
+ "["
/* + "["
+ "\"\","
+ "\"" + Checks.checkVal(dto.getNapAmount3(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftAmount3(),"") + "\""
+ "],"
+ "],"*/
+ "["
+ "\"합 계\","
+ "\"" + Checks.checkVal(dto.getNapAmountTotal(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftAmountTotal(),"") + "\""
+ "],"
+ "["
+ "\"" + Checks.checkVal(dto.getNapGubun1(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAmountTotal(),"") + "\","
+ "\"" + Checks.checkVal(formatDate(dto.getNapPd().substring(0,8), "-"),"") + "까지\""
+ "\"기 한\","
+ "\"" + Checks.checkVal(formatDate(dto.getNapPd().substring(0,8), "-"),"") + "까지\","
+ "\"" + Checks.checkVal(dto.getNapAftPd(),"") + "\""
+ "]"
+ "]"
+ "}"
+ "},"
+ "{"
+ "\"title\": \"납세번호\","
+ "\"item_type\": \"TABLE\","
+ "\"elements\": {"
+ "\"head\": ["
+ "\"기관번호\","
+ "\"세목\""
+ "],"
+ "\"rows\": ["
+ "["
+ "\"" + Checks.checkVal(dto.getNapGubun2(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftAmountTotal(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftPd(),"") + "\""
+ "\""+ Checks.checkVal(dto.getTaxNum1(),"") +"\","
+ "\""+ Checks.checkVal(dto.getTaxNum2(),"") +"\""
+ "]"
+ "]"
+ "}"
+ "},"
+ "{"
+ "\"title\": \"\","
+ "\"item_type\": \"TABLE\","
+ "\"elements\": {"
+ "\"head\": ["
+ "\"납세년월기\","
+ "\"과세번호\""
+ "],"
+ "\"rows\": ["
+ "["
+ "\""+ Checks.checkVal(dto.getTaxNum3(),"") +"\","
+ "\""+ Checks.checkVal(dto.getTaxNum4(),"") +"\""
+ "]"
+ "]"
+ "}"
@ -664,12 +703,12 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
+ "\"elements\": ["
+ "{"
+ "\"key\": \"가상계좌\\\\n납부\","
+ "\"value\": \"- 고지서에 기재된 고객 전용(가상)계좌로 납부\\\\n(단, 다른 은행 이체에 따른 수수료는 납세자가 부담하셔야 합니다.)\\\\n- 타인이 이체 하셔도 '서울세외납부자성명'으로 수납됩니다.\","
+ "\"value\": \"- 고지서에 기재된 고객 전용(가상)계좌로 납부\\\\n(단, 다른 은행 이체에 따른 수수료는 납세자가 부담하셔야 합니다.)\\\\n- 타인이 이체 하셔도 서울세외납부자성명으로 수납됩니다.\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"서울시 인터넷\\\\n세금납부\","
+ "\"value\": \"- 이택스에 접속하여 로그인 후 계좌이체나 신용카드 납부\\\\n이택스: https://etax.seoul.go.kr\\\\n※ 비회원의 경우에는 고지서에 표시된 '납세번호' 입력 후 납부\","
+ "\"value\": \"- 이택스에 접속하여 로그인 후 계좌이체나 신용카드 납부\\\\n이택스: https://etax.seoul.go.kr\\\\n※ 비회원의 경우에는 고지서에 표시된 납세번호 입력 후 납부\","
+ "\"level\": 1"
+ "},"
+ "{"

2
mens-batch/src/main/resources/egovframework/mapper/biz/ens-mysql-mapper.xml
Unescape Escape View File

@ -777,8 +777,6 @@
JOIN tb_ens_unity_sndng_mastr teusm
ON tesm.unity_sndng_mastr_id = teusm.unity_sndng_mastr_id
WHERE tesm.sndng_mastr_id = #{sndngMastrId}
AND tesm.signgu_code = #{signguCode}
AND tesm.ffnlg_code = #{ffnlgCode}
</select>
<update id="updateKakaoSendBulksResult">

Write Preview
Loading…
Cancel
Save