diff --git a/src/main/java/cokr/xit/fims/sndb/Sndng.java b/src/main/java/cokr/xit/fims/sndb/Sndng.java index b5e0bcff..803507ad 100644 --- a/src/main/java/cokr/xit/fims/sndb/Sndng.java +++ b/src/main/java/cokr/xit/fims/sndb/Sndng.java @@ -140,7 +140,7 @@ public class Sndng extends AbstractEntity { /** * 단속 IDs */ - private String[] crdnIDs; + private String[] crdnIds; /** * 발송 상세 IDs diff --git a/src/main/java/cokr/xit/fims/sndb/SndngDtl.java b/src/main/java/cokr/xit/fims/sndb/SndngDtl.java index ac4918f5..2e7f4f34 100644 --- a/src/main/java/cokr/xit/fims/sndb/SndngDtl.java +++ b/src/main/java/cokr/xit/fims/sndb/SndngDtl.java @@ -442,4 +442,15 @@ public class SndngDtl extends AbstractEntity { */ private String delRsn; + // 추가 ///////////////////////////////////////////////////////////////////// + /** + * 발송 상세 IDs + */ + private String[] sndngDtlIds; + + /** + * 시군구 코드 + */ + private String sggCd; + } diff --git a/src/main/java/cokr/xit/fims/sndb/Svbtc.java b/src/main/java/cokr/xit/fims/sndb/Svbtc.java index 89f24dff..4e165578 100644 --- a/src/main/java/cokr/xit/fims/sndb/Svbtc.java +++ b/src/main/java/cokr/xit/fims/sndb/Svbtc.java @@ -17,16 +17,6 @@ public class Svbtc extends AbstractEntity { */ private String svbtcId; - /** - * 시군구 코드 - */ - private String sggCd; - - /** - * 업무 구분 코드 - */ - private String taskSeCd; - /** * 발송 구분 코드 */ @@ -72,10 +62,11 @@ public class Svbtc extends AbstractEntity { */ private String delRsn; + // 추가 ///////////////////////////////////////////////////////////////////// /** * 공시송달 IDs */ - private String[] svbtcIDs; + private String[] svbtcIds; /** * 발송 상세 IDs @@ -87,4 +78,9 @@ public class Svbtc extends AbstractEntity { */ private String sndngDtlId; + /** + * 시군구 코드 + */ + private String sggCd; + } diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index 74681558..233cedfe 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -278,7 +278,7 @@ public class Sndb01Controller extends ApplicationController { } /**계고장 발송 대상 정보 화면(sndb/sndb01/020-info)을 연다. - * @param crdnIDs 단속 IDs + * @param crdnIds 단속 Ids * @return fims/sndb/sndb01020-info 또는 jsonView * 
{
 	 *     "wrngSndngTrgts": [계고장 발송 대상 목록]
@@ -604,7 +604,7 @@ public class Sndb01Controller extends ApplicationController {
 	}
 
 	/**사전통지 발송 대상 정보 화면(sndb/sndb01/060-info)을 연다.
-	 * @param crdnIDs 단속 IDs
+	 * @param crdnIds 단속 Ids
 	 * @return fims/sndb/sndb01060-info 또는 jsonView
 	 * 
{
 	 *     "advntceSndngTrgs": [사전통지 발송 대상 목록]
diff --git a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml
index 9ac7e0f6..b7deff8b 100644
--- a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml
@@ -9,8 +9,6 @@
 
 	
 					
-						
-					
 						
 			
 						
@@ -52,8 +50,6 @@
 
     
         SELECT R.RCVMT_ID               
-             , R.SGG_CD                 
-             , R.TASK_SE_CD             
              , R.RCVMT_INPT_SE_CD       
              , R.DEPT_CD                
              , R.SPCL_BIZ_CD            
@@ -141,124 +137,122 @@
     
 
     
         SELECT R.RCVMT_ID               
-             , R.SGG_CD                 
-             , R.TASK_SE_CD             
              , R.RCVMT_INPT_SE_CD       
              , R.DEPT_CD                
              , R.SPCL_BIZ_CD            
@@ -342,16 +336,14 @@
 
     /* 수납 대장 등록(rcvmtMapper.insertRcvmt) */
         
-            SELECT (CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(RCVMT_ID, 5)) + 1, 1) AS INT), 16, '0'))) AS NEW_ID
+            SELECT CONCAT(#{rcvmt.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(RCVMT_ID, 10)) + 1, 1) AS INT), 11, '0')) AS NEW_ID
                  , (SELECT LPAD(CAST(IFNULL(MAX(RCVMT_SN) + 1, 1) AS INT), 2, '0') FROM TB_RCVMT WHERE LEVY_ID = #{rcvmt.levyId}) AS NEW_RCVMT_SN
               FROM TB_RCVMT
-             WHERE RCVMT_ID LIKE CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), '%')
+             WHERE RCVMT_ID LIKE CONCAT(#{rcvmt.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%')
         
         INSERT
           INTO TB_RCVMT (
                RCVMT_ID         
-             , SGG_CD           
-             , TASK_SE_CD       
              , LEVY_ID          
              , RCVMT_INPT_SE_CD 
              , DEPT_CD          
@@ -389,8 +381,6 @@
         )
         VALUES (
                #{rcvmt.rcvmtId}         
-             , #{rcvmt.sggCd}           
-             , #{rcvmt.taskSeCd}        
              , #{rcvmt.levyId}          
              , #{rcvmt.rcvmtInptSeCd}   
              , #{rcvmt.deptCd}          
@@ -430,9 +420,7 @@
 
     /* 수납 대장 수정(rcvmtMapper.updateRcvmt) */
         UPDATE TB_RCVMT
-           SET LEVY_ID          = #{rcvmt.levyId}           
-             , RCVMT_INPT_SE_CD = #{rcvmt.rcvmtInptSeCd}    
-             , DEPT_CD          = #{rcvmt.deptCd}           
+           SET DEPT_CD          = #{rcvmt.deptCd}           
              , SPCL_BIZ_CD      = #{rcvmt.spclBizCd}        
              , FYR              = #{rcvmt.fyr}              
              , ACNTG_SE_CD      = #{rcvmt.acntgSeCd}        
diff --git a/src/main/resources/sql/mapper/fims/rdca/rdcamt-mapper.xml b/src/main/resources/sql/mapper/fims/rdca/rdcamt-mapper.xml
index ec07b1ae..417ae1da 100644
--- a/src/main/resources/sql/mapper/fims/rdca/rdcamt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/rdca/rdcamt-mapper.xml
@@ -100,9 +100,9 @@
 
     /* 감액 대장 등록(rdcamtMapper.insertRdcamt) */
         
-            SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(LEVY_ID, 5)) + 1, 1) AS INT), 16, '0')) AS NEW_ID
+            SELECT CONCAT(#{rdcamt.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(SVBTC_ID, 10)) + 1, 1) AS INT), 11, '0')) AS NEW_ID
               FROM TB_RDCAMT
-             WHERE RDCAMT_ID LIKE CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), '%')
+             WHERE RDCAMT_ID LIKE CONCAT(#{rdcamt.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%')
         
         INSERT
           INTO TB_RDCAMT (
diff --git a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
index 2d84c7dd..bbb7cc02 100644
--- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
@@ -877,9 +877,9 @@
 
     /* 발송 대장 등록(sndngMapper.insertSndng) */
         
-            SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(SNDNG_ID, 5)) + 1, 1) AS INT), 16, '0')) AS NEW_ID
+            SELECT CONCAT(#{sndng.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(SNDNG_ID, 10)) + 1, 1) AS INT), 11, '0')) AS NEW_ID
               FROM TB_SNDNG
-             WHERE SNDNG_ID LIKE CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), '%')
+             WHERE SNDNG_ID LIKE CONCAT(#{sndng.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%')
         
         INSERT
           INTO TB_SNDNG (
diff --git a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml
index ceb7a059..980d2d38 100644
--- a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml
@@ -304,8 +304,9 @@
 
     /* 발송 상세 등록(sndngDtlMapper.insertSndngDtl) */
         
-            SELECT LPAD(CAST(IFNULL(MAX(SNDNG_DTL_ID) + 1, 1) AS INT), 10, '0') AS NEW_ID
+            SELECT CONCAT(#{sndngDtl.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(SNDNG_DTL_ID, 10)) + 1, 1) AS INT), 11, '0')) AS NEW_ID
               FROM TB_SNDNG_DTL
+             WHERE SNDNG_DTL_ID LIKE CONCAT(#{sndngDtl.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%')
         
         INSERT
           INTO TB_SNDNG_DTL (
@@ -942,17 +943,17 @@
             
            AND SD.SNDNG_ID      =  #{sndngId}   
             
-            
+            
            AND SD.CRDN_ID       IN (            
-                 #{crdnId} 
+                 #{crdnId} 
              )
             
             
            AND SD.CRDN_ID       =  #{crdnId}    
             
-            
+            
            AND SD.SVBTC_ID      IN (            
-                 #{svbtcId} 
+                 #{svbtcId} 
              )
             
             
diff --git a/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml
index 065787dd..31dc85af 100644
--- a/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml
@@ -9,8 +9,6 @@
 
 	
 				
-					
-				
 				
 				
 			
@@ -30,8 +28,6 @@
 
     
         SELECT SV.SVBTC_ID      
-             , SV.SGG_CD        
-             , SV.TASK_SE_CD    
              , SV.SNDNG_SE_CD   
              , SV.SVBTC_YMD     
              , SV.SVBTC_END_YMD 
@@ -57,70 +53,70 @@
     
@@ -146,8 +142,6 @@
 
     
         SELECT SV.SVBTC_ID          
-             , SV.SGG_CD            
-             , SV.TASK_SE_CD        
              , SV.SNDNG_SE_CD       
              , SV.SVBTC_YMD         
              , SV.SVBTC_END_YMD     
@@ -281,25 +275,26 @@
              , SD.UNDLVR_RSN_NM     
              , SD.ACTL_RCPN_NM      
              , SD.RCPN_REL_NM       
-             , (GET_MASK_DATE(SD.DLVR_YMD, '-'))    AS DLVR_YMD_MASK    
-             , (GET_MASK_NAME(SD.RCPN_NM, 'MIDDLE', 2, '*')) AS RCPN_NM_MASK    
+             , (GET_MASK_DATE(SD.DLVR_YMD, '-'))                AS DLVR_YMD_MASK    
+             , (GET_MASK_NAME(SD.RCPN_NM, 'MIDDLE', 2, '*'))    AS RCPN_NM_MASK     
              , (REGEXP_REPLACE(CONCAT(SD.RCPN_ADDR, ' ', SD.RCPN_DTL_ADDR), '[0-9]', '*'))  AS WHOL_ADDR_MASK   
              , (CONCAT(SUBSTRING(SD.VHRNO, 1, CHAR_LENGTH(SD.VHRNO) - 2), '**'))            AS VHRNO_MASK       
-             , (GET_INST_LEADER(S.INST_NM, S.INST_SE_CD))   AS INST_LEADER      
-             , OFFCS_FILE_PATH      
-             , DEPT_TELNO           
-             , (CONCAT(SGG_NM, ' ', DEPT_NM))   AS SGG_DEPT_NM  
+             , (GET_INST_LEADER(S.INST_NM, S.INST_SE_CD))       AS INST_LEADER      
+             , SGG.OFFCS_FILE_PATH  
+             , DPT.DEPT_TELNO       
+             , (CONCAT(SGG.SGG_NM, ' ', DPT.DEPT_NM))   AS SGG_DEPT_NM  
              , #{printDocNo}        AS INPUT_DOC_NO     
              , #{printTtlNm}        AS INPUT_TTL_NM     
              , #{printSvbtcDate}    AS INPUT_SVBTC_DATE 
           FROM TB_SVBTC             SV
          INNER JOIN TB_SNDNG_DTL    SD  ON (SV.SVBTC_ID = SD.SVBTC_ID)
-         INNER JOIN TB_SGG          S   ON (SV.SGG_CD   = S.SGG_CD AND S.SGG_CD  = #{sggCd})
-         INNER JOIN TB_DEPT         D   ON (S.SGG_CD    = D.SGG_CD AND D.DEPT_CD = #{deptCd})
+         INNER JOIN TB_SNDNG        S   ON (SD.SNDNG_ID = S.SNDNG_ID)
+         INNER JOIN TB_SGG          SGG ON (S.SGG_CD    = SGG.SGG_CD AND SGG.SGG_CD  = #{sggCd})
+         INNER JOIN TB_DEPT         DPT ON (SGG.SGG_CD  = DPT.SGG_CD AND DPT.DEPT_CD = #{deptCd})
         
-            
+            
            AND SV.SVBTC_ID      IN (            
-                 #{svbtcId} 
+                 #{svbtcId} 
                )
             
             
@@ -335,15 +330,13 @@
 
     /* 공시송달 대장 등록(svbtcMapper.insertSvbtc) */
         
-            SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(SVBTC_ID, 5)) + 1, 1) AS INT), 16, '0')) AS NEW_ID
+            SELECT CONCAT(#{svbtc.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(SVBTC_ID, 10)) + 1, 1) AS INT), 11, '0')) AS NEW_ID
               FROM TB_SVBTC
-             WHERE SVBTC_ID LIKE CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), '%')
+             WHERE SVBTC_ID LIKE CONCAT(#{svbtc.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%')
         
         INSERT
           INTO TB_SVBTC (
                SVBTC_ID     
-             , SGG_CD       
-             , TASK_SE_CD   
              , SNDNG_SE_CD  
              , SVBTC_YMD    
              , SVBTC_END_YMD 
@@ -359,8 +352,6 @@
         )
         VALUES (
                #{svbtc.svbtcId}     
-             , #{svbtc.sggCd}       
-             , #{svbtc.taskSeCd}    
              , #{svbtc.sndngSeCd}   
              , #{svbtc.svbtcYmd}    
              , #{svbtc.svbtcEndYmd} 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp
index 0285cfea..e56f5ef3 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp
@@ -528,7 +528,7 @@
 		$P.refreshList = () => {
 			$P.control.untilPageNum = $P.control.query.pageNum;
 			$P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum;
-			$P.control.query.crdnIDs = null;
+			$P.control.query.crdnIds = null;
 
 			$P.control.load(1);
 		}
@@ -651,7 +651,7 @@
 			} else {
 				params.sndngSeCd = "11";				// 발송 구분 코드 - 11 계고장
 			}
-			params.crdnIDs = selected.join(",");		// IDs
+			params.crdnIds = selected.join(",");		// IDs
 			params.resndYn = "N";						// 재발송 여부
 			params.delYn = "N";							// 삭제 여부
 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp
index c796d42a..2f7b6d36 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp
@@ -512,7 +512,7 @@
 		$P.refreshList = () => {
 			$P.control.untilPageNum = $P.control.query.pageNum;
 			$P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum;
-			$P.control.query.crdnIDs = null;
+			$P.control.query.crdnIds = null;
 
 			$P.control.load(1);
 		}
@@ -593,7 +593,7 @@
 			let params = $P.control.query;				// 검색 조건
 			params.callPurpose = "create";				// 호출 용도 (등록)
 			params.title = title;						// 타이틀
-			params.crdnIDs = selected.join(",");		// Ids
+			params.crdnIds = selected.join(",");		// Ids
 			params.sndngSeCd = "02";					// 발송 구분 코드(FIM047) - 02 사전통지서
 			params.resndYn = "N";						// 재발송 여부
 			params.delYn = "N";							// 삭제 여부
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp
index 46ab388f..9382e403 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp
@@ -462,7 +462,7 @@
 		$P.refreshList = () => {
 			$P.control.untilPageNum = $P.control.query.pageNum;
 			$P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum;
-			$P.control.query.crdnIDs = null;
+			$P.control.query.crdnIds = null;
 
 			$P.control.load(1);
 		}
@@ -536,7 +536,7 @@
 			let params = $P.control.query;				// 검색 조건
 			params.callPurpose = "create";				// 호출 용도 (등록)
 			params.title = title;						// 타이틀
-			params.crdnIDs = selected.join(",");		// Ids
+			params.crdnIds = selected.join(",");		// Ids
 			params.sndngSeCd = "03";					// 발송 구분 코드(FIM047) - 03 부과고지서
 			params.resndYn = "N";						// 재발송 여부
 			params.delYn = "N";							// 삭제 여부
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp
index d76f82cc..0a35e0e4 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp
@@ -360,9 +360,9 @@
 		if (selected.length < 1) return;
 
 		let params = {
-			  crdnIDs = selected.join(",");						// 단속 IDs
-			, sggCd : $("#sggCd--${pageName}").val()			// 시군구 코드
+			  sggCd : $("#sggCd--${pageName}").val()			// 시군구 코드
 			, taskSeCd : $("#taskSeCd--${pageName}").val()		// 업무 구분 코드
+			, crdnIds = selected.join(",");						// 단속 IDs
 			, sndngYmd : obj.sndngYmd							// 부과 일자
 			, dudtYmd : obj.dudtYmd								// 납기 일자
 		};
@@ -500,7 +500,7 @@
 
 		var resp = await fetch(wctx.url("/resources/html/inputDateDialog.html"));
 		var template = await resp.text();
-		
+
 		dialog.open({
 			id : "inputRductLevyDateDialog",
 			title: "감경부과등록",
@@ -517,14 +517,14 @@
 				if (!inputDateComparison($("#sndngYmd").val(), $("#sndngEndYmd").val())) {
 					return;
 				}
-				
+
 				$P.callbackDate({
 					"sndngYmd" : $("#sndngYmd").val(),
 					"dudtYmd" : $("#sndngEndYmd").val()
 				});
 			}
 		});
-		
+
 	}
 
 	/**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp
index 71aa06a9..936df92c 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp
@@ -516,7 +516,7 @@
 		$P.refreshList = () => {
 			$P.control.untilPageNum = $P.control.query.pageNum;
 			$P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum;
-			$P.control.query.crdnIDs = null;
+			$P.control.query.crdnIds = null;
 
 			$P.control.load(1);
 		}