일할 계산 정지 사용자 관련 수정

해지 고객 정액 요금 계산 수정

frontend/src/modules/calculate/views/Verification.vue

@@ -183,11 +183,7 @@ export default {
     vuejsDatepicker
   },
   computed : {},
-  watch: {
+  watch: {},
-    discount : function(){
-      console.log("dddd");
-    }
-  },
   created() {
     this.getExcelHeader();
   },

src/main/resources/mapper/mysql/calculate/calculate-mapper.xml

@@ -195,7 +195,7 @@
 				,FORMAT(A.CFWD_CHRG_BLNC,1) AS CFWD_CHRG_BLNC
 				,A.NOW_CFWD_AMT
 				,(CASE
-					WHEN A.SUBS_STTUS_CD = '99'
+					WHEN A.SUBS_STTUS_CD = '99' AND A.CS_YN = 1
 					THEN 0
 					ELSE (IF(A.SUBS_STTUS_CD IN ('03','04') AND A.USE_DAY IS NULL,0,(ROUND((A.FX_LMT_AMT/LAST_DT)*IFNULL(A.USE_DAY,LAST_DT))))
 						+ A.CFWD_AMT - A.EXTNC_AMT - A.TOTAL_USE_AMT 
@@ -294,6 +294,7 @@
 					,A.MMS_COST
 					,IF(USETB.USE_DAY <![CDATA[ < ]]> 0,NULL,USETB.USE_DAY) AS USE_DAY
 					,DATE_FORMAT(LAST_DAY(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01')),'%d') AS LAST_DT
+					,USETB.CS_YN
 				FROM (
 					SELECT
 						LMT.USER_SEQ
@@ -457,9 +458,10 @@
 				LEFT JOIN (
 					SELECT
 						A.USER_SEQ
+						,MAX(CS_YN) AS CS_YN
 						,SUM(CASE 
 							WHEN A.STTUS_PLAG = 'S' THEN A.EFCT_FNS_DT - A.EFCT_ST_DT + 1
-							WHEN A.STTUS_PLAG = 'P' THEN -1
+							WHEN A.STTUS_PLAG = 'P' THEN A.P_DAY
 							WHEN A.STTUS_PLAG = 'E' THEN 0
 						END) AS USE_DAY
 					FROM (
@@ -467,8 +469,14 @@
 							ESI.CUST_SEQ
 							,ESI.USER_SEQ
 							,ESI.SUBS_ID
+							,IF(DATE_FORMAT(ESH.EFCT_ST_DT,'%Y%m') = DATE_FORMAT(CONCAT(STR_TO_DATE('202306','%Y%m'),'01'),'%Y%m') AND ESH.SUBS_STTUS_CD IN ('03','04'),-1,0) AS P_DAY
 							,IF(DATE_FORMAT(ESH.EFCT_ST_DT,'%Y%m') != DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m'),'01',DATE_FORMAT(ESH.EFCT_ST_DT,'%d')) AS EFCT_ST_DT
 							,IF(ESH.EFCT_FNS_DT <![CDATA[ > ]]> LAST_DAY(DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m01')) ,DATE_FORMAT(LAST_DAY(DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m01')),'%d'),DATE_FORMAT(ESH.EFCT_FNS_DT,'%d')) AS EFCT_FNS_DT
+							,(CASE
+								WHEN ESH.SUBS_STTUS_CD = '99'
+								THEN IF(DATE_FORMAT(ESH.EFCT_ST_DT,'%Y%m') <![CDATA[ > ]]> DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m'),0,1)
+								ELSE 0
+							END) AS CS_YN
 							,(CASE WHEN ESH.SUBS_STTUS_CD IN ('02') THEN 'S' WHEN ESH.SUBS_STTUS_CD IN ('03','04') THEN 'P' ELSE 'E' END) AS STTUS_PLAG
 							,DATE_FORMAT(LAST_DAY(DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m01')),'%d') AS LAST_DT
 						FROM hubez_common.EZ_SUBS_INFO ESI, hubez_common.EZ_SBSCST_HST ESH