지역주민 감면 처리 수정

src/main/java/cfs/fine/dao/mapper/FineTrans_mapper.xml

@@ -5195,7 +5195,7 @@
 	</insert>
 	
 	<delete id="deleteScarPlMst" parameterType="cfs.fine.vo.FineTransVO" >
-		DELETE FROM DBUSER_CFS.TB_CFS_SCAR_PL_MST WHERE car_no = #{carNo}
+		DELETE FROM DBUSER_CFS.TB_CFS_SCAR_PL_MST WHERE car_no = #{carNo} AND REDU_CD = '00'
 	</delete>
 	
 	

src/main/java/cfs/fine/service/impl/FineTransServiceImpl.java

@@ -995,27 +995,22 @@ public class FineTransServiceImpl implements FineTransService {
 			fineTransDao.createFareTerminalUpdate(param);
 			
 			param.setSessionUserNm(HttpUtil.getEmpNm());
-			Long RfidYn = fineTransDao.countScarRfidYn(param);
+			
+			boolean existGammyeonMst = fineTransDao.countScarRfidYn(param) != 0;
+			boolean paramGammyeon = param.getRfidPenaltyKbn().equals("1");
 			
 			if(param.getOverDate().equals("1")){
 				param.setOverType("1");
 			}else if(param.getOverPayment().equals("1")){
 				param.setOverType("1");
 			}
-			//감면 여부 확인 후 현행화
-			if(param.getRfidPenaltyKbn().equals("1")){
-				//감면 여부 Y
-				if(RfidYn==0){
-					//ins
-					fineTransDao.insertScarPlMst(param);
-				}
-			}else{
-				//감면 여부 N
-				if(RfidYn!=0){
-					//del
-					fineTransDao.deleteScarPlMst(param);
-					
-				}
+			
+			if(paramGammyeon && !existGammyeonMst){ //감면에 체크, 감면마스터없음			
+				//마스터에 추가
+				fineTransDao.insertScarPlMst(param);
+			} else if(!paramGammyeon && existGammyeonMst){ //감면에 미체크, 감면마스터있음
+				//마스터에서 삭제
+				fineTransDao.deleteScarPlMst(param);
 			}
 			
 			if("2".equals(param.getReadDiv())) { //재판독일 때

src/main/java/cfs/schd/dao/mapper/Schd_mapper.xml

@@ -53,7 +53,7 @@ SELECT CAR_NO
                   THEN APPLY_DATE
                   ELSE PROC_STRT_DTTM
                   END) AS ORDER_DATE
-            FROM TB_CFS_LOCAL_RESIDENTS_CAR_MST_TEMP
+            FROM TB_CFS_LOCAL_RESIDENTS_CAR_MST
            WHERE DEL_YN = 'N' 
              AND TO_CHAR(APPLY_DATE,'YYYYMMDD') <![CDATA[ < ]]> TO_CHAR(SYSDATE-7,'YYYYMMDD')
            <if test='digit != null and digit != ""'>
@@ -71,7 +71,7 @@ SELECT SEQ_CNS_REQ.NEXTVAL FROM DUAL
 
 
 <update id="updateCarSearchFail" parameterType="java.util.Map">
-UPDATE TB_CFS_LOCAL_RESIDENTS_CAR_MST_TEMP
+UPDATE TB_CFS_LOCAL_RESIDENTS_CAR_MST
    SET PROC_CMPT_YN = 'N'
      , PROC_STRT_DTTM = TO_DATE(#{PROC_STRT_DTTM},'YYYYMMDDHH24MISS')
      , UPDATER = 'sys'
@@ -80,7 +80,7 @@ UPDATE TB_CFS_LOCAL_RESIDENTS_CAR_MST_TEMP
 </update>
 
 <update id="updateApplyDate" parameterType="java.util.Map">
-UPDATE TB_CFS_LOCAL_RESIDENTS_CAR_MST_TEMP
+UPDATE TB_CFS_LOCAL_RESIDENTS_CAR_MST
    SET PROC_CMPT_YN = 'Y'
      , PROC_STRT_DTTM = TO_DATE(#{PROC_STRT_DTTM},'YYYYMMDDHH24MISS')
      , APPLY_DATE = TO_DATE(#{APPLY_DATE},'YYYYMMDDHH24MISS')
@@ -91,22 +91,35 @@ UPDATE TB_CFS_LOCAL_RESIDENTS_CAR_MST_TEMP
 </update>
 
 <delete id="deleteMovingOut" parameterType="java.util.Map">
-DELETE FROM TB_CFS_LOCAL_RESIDENTS_CAR_MST_TEMP
+DELETE FROM TB_CFS_LOCAL_RESIDENTS_CAR_MST
  WHERE CAR_NO = #{CAR_NO}
 </delete>
 
 <delete id="deleteGammyeon" parameterType="java.util.Map">
 DELETE 
-  FROM TB_CFS_SCAR_PL_MST_TEMP
+  FROM TB_CFS_SCAR_PL_MST
  WHERE CAR_NO = #{CAR_NO} 
    AND REDU_CD = '02'
 </delete>
 
 <insert id="insertGammyeon" parameterType="java.util.Map">
-MERGE INTO TB_CFS_SCAR_PL_MST_TEMP
+MERGE INTO TB_CFS_SCAR_PL_MST
 USING DUAL ON (
 	CAR_NO = #{CAR_NO}
 )
+WHEN MATCHED THEN
+UPDATE  
+   SET SCAR_SEQ    = #{SCAR_SEQ}
+     , CAR_NO_HEX  = REPLACE(TRIM(#{CAR_NO_HEX}),' ','')
+     , REDU_CD     = '02'
+     , REQ_DATE    = SYSDATE
+     , MODI_YN     = 'N'
+     , CREATER     = 'sys'
+     , CREATE_DATE = SYSDATE
+     , UPDATER     = 'sys'
+     , UPDATE_DATE = SYSDATE
+     , END_DATE    = ''
+     , REMARKS     = #{REMARKS}
 WHEN NOT MATCHED THEN
 INSERT (
        SCAR_SEQ
@@ -123,7 +136,7 @@ INSERT (
      , REMARKS
 ) VALUES (
        #{SCAR_SEQ}
-     , REPLACE(TRIM(#{CAR_NO}),' ','')   
+     , REPLACE(TRIM(#{CAR_NO}),' ','')
      , REPLACE(TRIM(#{CAR_NO_HEX}),' ','')
      , '02'
      , SYSDATE

src/main/java/cfs/standard/dao/mapper/StandardCodeInfo_mapper.xml

@@ -2249,14 +2249,14 @@ INSERT INTO EXEMPT_CARS_INFO
 	SELECT CAR_NO
 	     , SCAR_SEQ
 	     , TO_CHAR(APPLY_DATE,'YYYYMMDD') AS APPLY_DATE
-	  FROM TB_CFS_LOCAL_RESIDENTS_CAR_MST_TEMP
+	  FROM TB_CFS_LOCAL_RESIDENTS_CAR_MST
 	 WHERE CAR_NO = #{carNo}
 	   AND DEL_YN = 'N'
 	</select>
 	
 	<insert id="insertLocalResidents" parameterType="java.util.Map">
     INSERT 
-      INTO TB_CFS_LOCAL_RESIDENTS_CAR_MST_TEMP (
+      INTO TB_CFS_LOCAL_RESIDENTS_CAR_MST (
 	       CAR_NO
 	     , CAR_NO_HEX
 	     , APPLY_DATE
@@ -2283,7 +2283,7 @@ INSERT INTO EXEMPT_CARS_INFO
 	</insert>
 
     <update id="updateLocalResidents" parameterType="java.util.Map">
-    UPDATE TB_CFS_LOCAL_RESIDENTS_CAR_MST_TEMP
+    UPDATE TB_CFS_LOCAL_RESIDENTS_CAR_MST
        SET APPLY_DATE = TO_DATE(#{levyStdde}||'000000','YYYYMMDDHH24MISS')
 	     , PROC_CMPT_YN = 'Y'
 	     , PROC_STRT_DTTM = SYSDATE
@@ -2295,10 +2295,23 @@ INSERT INTO EXEMPT_CARS_INFO
     </update>
     
 	<insert id="insertGammyeon" parameterType="java.util.Map">
-	MERGE INTO TB_CFS_SCAR_PL_MST_TEMP
+	MERGE INTO TB_CFS_SCAR_PL_MST
 	USING DUAL ON (
 		CAR_NO = #{carNo}
 	)
+	WHEN MATCHED THEN
+	UPDATE
+	   SET SCAR_SEQ    = #{scarSeq}
+	     , CAR_NO_HEX  = REPLACE(TRIM(#{carNoHex}),' ','')
+	     , REDU_CD     = '02'
+	     , REQ_DATE    = SYSDATE
+	     , MODI_YN     = 'N'
+	     , CREATER     = 'sys'
+	     , CREATE_DATE = SYSDATE
+	     , UPDATER     = 'sys'
+	     , UPDATE_DATE = SYSDATE
+	     , END_DATE    = ''
+	     , REMARKS     = #{remarks}
 	WHEN NOT MATCHED THEN
 	INSERT (
 	       SCAR_SEQ

src/main/java/cfs/trsmrcv/web/CommWebBrowserController.java

@@ -182,6 +182,7 @@ public class CommWebBrowserController {
 				mapTemp = new HashMap<String, String>();
 				mapTemp.put("00", "경차");
 				mapTemp.put("01", "요일제");
+				mapTemp.put("02", "지역주민");
 				mapTemp.put("03", "저공해");
 				
 				map = new HashMap<String, Object>();
@@ -189,7 +190,6 @@ public class CommWebBrowserController {
 				map.put("resultDecode", obj.get(0).get("REDU_CD").toString());
 				map.put("remarks", String.format("%s감면 차량", mapTemp.get(obj.get(0).get("REDU_CD").toString())));
 				
-				//commCollectServerService.updateDecisionResult(mapOrg); 
 
 				logger.info("자동판독 감면처리 (" + param.get("carNo") + ")");
 				logger.info(map.toString());