no message

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

@@ -5212,9 +5212,9 @@
 	
 	
 	<select id="countScarRfidYn" parameterType="cfs.fine.vo.FineTransVO" resultType="java.lang.Long">
-		SELECT COUNT(*)
-		FROM TB_CFS_SCAR_PL_MST
-		WHERE car_no = #{carNo}
+	SELECT COUNT(*)
+	  FROM TB_CFS_SCAR_PL_MST
+	 WHERE car_no = #{carNo}
 	</select>
 
 

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

@@ -1005,9 +1005,10 @@ public class FineTransServiceImpl implements FineTransService {
 				param.setOverType("1");
 			}
 			
-			if(paramGammyeon && !existGammyeonMst){ //감면에 체크, 감면마스터없음			
+			if(paramGammyeon && !existGammyeonMst){ //감면에 체크, 감면마스터없음	
 				//마스터에 추가
 				fineTransDao.insertScarPlMst(param);
+				
 			} else if(!paramGammyeon && existGammyeonMst){ //감면에 미체크, 감면마스터있음
 				//마스터에서 삭제
 				fineTransDao.deleteScarPlMst(param);

src/main/java/cfs/trsmrcv/service/impl/CommCollectServerServiceImpl.java

@@ -541,7 +541,7 @@ public class CommCollectServerServiceImpl implements CommCollectServerService {
 	
 	@Override
 	public String searchHalfExmptCarNo(String strCarNo) {
-		// 감면 테이블 조회(겸차, 저공해)
+		// 감면 테이블 조회(경차, 지역주민)
 		Map<String, String> param = new HashMap<String, String>();
 		param.put("carNo", strCarNo);
 				
@@ -554,11 +554,11 @@ public class CommCollectServerServiceImpl implements CommCollectServerService {
 			logger.info("");
 		}catch(RuntimeException e) {
 			logger.info("catch check");
-			logger.info("경차 테이블 조회");
+			logger.info("감면 테이블 조회");
 
 		} catch (Exception e) {
 			logger.info("catch check");
-			logger.info("경차 테이블 조회");
+			logger.info("감면 테이블 조회");
 		}	
 		
 		return "01";

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

@@ -176,7 +176,19 @@ public class CommWebBrowserController {
 			
 			obj = commCollectServerService.selectReduCarList(param);
 			if(obj != null && obj.size() > 0) {
-				reduCheckReturn = obj.get(0).get("REDU_CD").toString();
+				boolean localResidentsYn = false;
+				for(int i=0; i<obj.size(); i++){
+					if(obj.get(i).get("REDU_CD").toString().equals("02")){
+						localResidentsYn = true;
+					}
+				}
+				
+				if(localResidentsYn){
+					reduCheckReturn = "02";
+				} else {
+					reduCheckReturn = obj.get(0).get("REDU_CD").toString();
+				}
+				
 			}
 
 			if(!reduCheckReturn.equals("")){