Merge remote-tracking branch 'origin/main'

mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java

@@ -402,13 +402,13 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu
                 +        "\"\""
                 +      "]"
                 +    "},"
-                /*+    "{"
+                +    "{"
                 +      "\"title\": \"내용 : "+ Checks.checkVal(dto.getGojiNm(),"") + " " + Checks.checkVal(dto.getGojiGubun(),"") +" 안내입니다.\","
                 +      "\"item_type\": \"SUBJECT_TEXT\","
                 +      "\"elements\": ["
                 +        "\"\""
                 +      "]"
-                +    "},"*/
+                +    "},"
                 +    "{"
                 +      "\"title\": \"내역\","
                 +      "\"item_type\": \"KEY_VALUE\","
@@ -696,38 +696,11 @@ public class BizSisulService extends EgovAbstractServiceImpl implements IBizSisu
                 +        "]"
                 +      "}"
                 +    "},"
-/*                +    "{"
-                +      "\"title\": \"납세번호\","
-                +      "\"item_type\": \"TABLE\","
-                +      "\"elements\": {"
-                +        "\"head\": ["
-                +          "\"기관번호\","
-                +          "\"세목\""
-                +        "],"
-                +        "\"rows\": ["
-                +          "["
-                +            "\""+ Checks.checkVal(dto.getTaxNum1(),"") +"\","
-                +            "\""+ Checks.checkVal(dto.getTaxNum2(),"") +"\""
-                +          "]"
-                +        "]"
-                +      "}"
-                +    "},"
                 +    "{"
-                +      "\"title\": \"\","
+                +      "\"title\" : \"\" ,"
-                +      "\"item_type\": \"TABLE\","
+                +      "\"item_type\" : \"PRE_TEXT\","
-                +      "\"elements\": {"
+                +      "\"elements\" : \" \\n※  서울특별시 장사 등에 관한 조례 제11조에 의거, 사용료 또는 관리비를 납부기한이 경과한 날부터 6개월 이내에 납부하지 아니한 경우 사용허가 취소될 수 있습니다.\""
-                +        "\"head\": ["
+                +    "},"
-                +          "\"납세년월기\","
-                +          "\"과세번호\""
-                +        "],"
-                +        "\"rows\": ["
-                +          "["
-                +            "\""+ Checks.checkVal(dto.getTaxNum3(),"") +"\","
-                +            "\""+ Checks.checkVal(dto.getTaxNum4(),"") +"\""
-                +          "]"
-                +        "]"
-                +      "}"
-                +    "},"*/
                 +    "{"
                 +      "\"title\": \"고객 전용계좌\","
                 +      "\"item_type\": \"KEY_VALUE\","

mens-batch/src/main/resources/egovframework/mapper/biz/ens-mysql-mapper.xml

@@ -468,9 +468,12 @@
 				   , teusd.unity_sndng_detail_id
            , row_number() over ()
            , tec.ci
-				   , CONCAT(tetm.tmplat_cn, '\n - 열람기간 : ', substring(teusm.clos_dt, 1, 4), '년 ', substring(teusm.clos_dt, 5, 2), '월 ', substring(teusm.clos_dt, 7, 2), '까지\n - 문의처 : ', tetm.cstmr_cnter_tlphon_no
+				 , CASE WHEN teusm.signgu_code='88328'
-				   , '\n\n{#INFO_CFRM_STR}\n{#RCVE_RF_STR}')
+				        THEN CONCAT('제목 : ', tetm.tmplat_sj, '(', teusd.use_instt_idntfc_id, ')\n'
-			     , tetm.tmplat_sj
+							      , tetm.tmplat_cn, '\n - 열람기간 : ', substring(teusm.clos_dt, 1, 4), '년 ', substring(teusm.clos_dt, 5, 2), '월 ', substring(teusm.clos_dt, 7, 2), '일까지\n - 문의처 : ', tetm.cstmr_cnter_tlphon_no, '\n\n{#INFO_CFRM_STR}\n{#RCVE_RF_STR}')
+						ELSE CONCAT(tetm.tmplat_cn, '\n - 열람기간 : ', substring(teusm.clos_dt, 1, 4), '년 ', substring(teusm.clos_dt, 5, 2), '월 ', substring(teusm.clos_dt, 7, 2), '일까지\n - 문의처 : ', tetm.cstmr_cnter_tlphon_no, '\n\n{#INFO_CFRM_STR}\n{#RCVE_RF_STR}') END
+				 , CASE WHEN teusm.signgu_code='88328' THEN CONCAT(tetm.tmplat_sj, '(', teusd.use_instt_idntfc_id, ')')
+						ELSE tetm.tmplat_sj END
 				   , #{url}
 			     , SHA2(teusd.unity_sndng_detail_id, 256)
            , '01093414345'