최신화된 소스로 변경

src/cbot/basics/defaultResponse/controller/test.java

@@ -8,22 +8,10 @@ import java.util.stream.Collectors;
 public class test {
 
 	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		List<String> names = Arrays.asList("jeong", "pro", "jdk", "java", "java");
-//		names.stream().map(x -> x.concat("_추")).forEach(x -> System.out.println(x));
-//		names.stream().map(x -> x.concat("s")).forEach(x -> System.out.println(x));
-
-//		names.stream().sorted().forEach(x -> System.out.println(x));
-//		Stream<String> strStr = 
-
-		Set<String> set = names.stream().collect(Collectors.toSet());
-		set.forEach(x -> System.out.println(x));
-
-//		System.out.println(strStr);
+		String asd = "0";
+		
+		System.out.println(asd.substring(1,7));
 	}
 
-	private static String addStr(String str) {
-		return str += "_test";
-	}
 
 }

src/cfs/fine/dao/mapper/FineCivil_mapper.xml

@@ -203,15 +203,15 @@
 		<result property="reader" column="READER" />
 	</resultMap>
 	<select id="findFareReadInfo" parameterType="cfs.fine.vo.FineCivilVO" resultMap="findFareReadInfo-result">
-		SELECT NVL(CARS_STOP_PICTURE_FILE,'') AS stop_file,
-			NVL(CARS_MOVE_PICTURE_FILE,'') AS move_file,
-			(SELECT USER_NAME FROM MANAGE_INFO WHERE USER_ID = NVL(D.READER,'')) AS reader
-		FROM DEFAULT_FARE_READ_INFO_DAMO D
-		WHERE WORKER_ID = #{workerId}
-		AND FARE_OFFICE_ID = #{fareOfficeId}
-		AND BOOTH_ID = #{boothId}
-		AND D.YEAR || D.MONTH || D.DAY || D.WORK_TIMES = #{passDate}
-		AND SEQNO = #{seqno}
+			SELECT NVL(CARS_STOP_PICTURE_FILE,'') AS stop_file,
+				NVL(CARS_MOVE_PICTURE_FILE,'') AS move_file,
+				(SELECT USER_NAME FROM MANAGE_INFO WHERE USER_ID = NVL(D.READER,'')) AS reader
+			FROM DEFAULT_FARE_READ_INFO_DAMO D
+			WHERE WORKER_ID = #{workerId}
+			AND FARE_OFFICE_ID = #{fareOfficeId}
+			AND BOOTH_ID = #{boothId}
+			AND D.YEAR || D.MONTH || D.DAY || D.WORK_TIMES = #{passDate}
+			AND SEQNO = #{seqno}
 	</select>
 	
 	<resultMap type="cfs.fine.vo.FineCivilVO" id="findInternetInfo-result">

src/cfs/fine/service/impl/FinePenaltyServiceImpl.java

@@ -57,11 +57,13 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 	}
 
 	@Override
-	public List<PenaltyParamVO> findPenaltyList01(PenaltyParamVO param) throws Exception {
+	public List<PenaltyParamVO> findPenaltyList01(PenaltyParamVO param) throws Exception {//쩐쩐
+
 		List<PenaltyParamVO> result = finePenaltyDao.findPenaltyList01(param);
 		for(PenaltyParamVO rs : result){
 			rs.setFilePath(cfsCommonService.findCommonSecureGet("IMG_UP_URL")+rs.getYear()+"/"+rs.getFareOfficeId()+"/"+rs.getYear()+rs.getMonth()+rs.getDay());
 		}
+
 		return result;
 	}
 
@@ -71,6 +73,7 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 		for(PenaltyParamVO rs : result){
 			rs.setFilePath(cfsCommonService.findCommonSecureGet("IMG_UP_URL")+rs.getYear()+"/"+rs.getFareOfficeId()+"/"+rs.getYear()+rs.getMonth()+rs.getDay());
 		}
+
 		return result;
 	}
 
@@ -2674,8 +2677,10 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 				param.setEtaxKbn(str.substring(21,22));				 //시세입구분
 				param.setManageNo(Integer.parseInt(str.substring(23, 28))+""); //ls_seqno
 
-				param.setReceiptDate(param.getReceiptDate().replace("-", ""));
-				
+
+				logger.info("setReceiptDate" + param.getReceiptDate());
+				param.setReceiptDate(param.getReceiptDate().replaceAll("-", ""));
+
 				param.setReceiptAmount(param.getReceiptAmount().replaceAll("[^0-9]", ""));
 				
 //				System.out.println("################# 자료 : setReceiptDate       = " + param.getReceiptDate());
@@ -3569,7 +3574,7 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 	}
 	
 	@Override
-	public PenaltyParamVO findCreateETaxFile(PenaltyParamVO param) throws Exception {
+	public PenaltyParamVO findCreateETaxFile(PenaltyParamVO param) throws Exception { //쩐쩐
 		//BufferedWriter bf = null;
 		//FileWriter fw = null;
 		PenaltyParamVO result = new PenaltyParamVO();
@@ -3729,7 +3734,15 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 		}
 		return result;
 	}
-	
+
+	public String byteLeftPad(String var,int leng,String A) throws UnsupportedEncodingException{
+		byte[] buffers = var.getBytes("MS949");
+		String result = "";
+		result = StringUtils.leftPad(result,leng-buffers.length,A);
+		result = result+var;
+		return result;
+	}
+
 	@Override
 	public PenaltyParamVO findCreateDefETaxFile(PenaltyParamVO param) throws Exception {
 		//BufferedWriter bf = null;
@@ -3743,10 +3756,10 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 //				//가상계좌 발송일자, 납부기한 넣어줘야 초기화 안됨
 				finePenaltyDao.updateEtaxVirtualaccount(account);
 			}
-			
-			
+
+
 			String txt = "";
-			
+
 			String is_a1 = "000";	//시구코드(시도)(3 byte)
 			String is_a2 = "047";	//행정동코드(기관)(3 byte)
 			String is_a3 = "3";		//검비트1(1 byte)
@@ -3754,9 +3767,9 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 			String is_a5 = "227213";//세목코드(6 byte)
 			String is_a6;			//과세년월(6 byte)
 			String is_a7 = "1";		//과세번호(1 byte)
-			
+
 			String is_a9 = "";		//검비트2(1 byte)
-			
+
 			String is_seqNo = "";	// 과세번호(일련번호)(6 byte)
 			String is_owner = "";	// 납세자 (60 byte)
 			String is_resident = "";// 납세자주민번호 (13 byte)
@@ -3778,13 +3791,13 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 			String is_damdang = param.getDamdang();// 담당자 (20 byte)
 			String is_dept = param.getDept();// 담당부서 (40 byte)
 			String is_telno = param.getTelno();// 부과담당자 전화번호 (20 byte)
-			String ls_a48 = ""; 
+			String ls_a48 = "";
 			String ls_a53 = "3"; //수납구분
 			String ls_a44 = "SISUL";// 서버명(시스템명) (5 byte)
 			String virtualBank = "";//가상계좌번호
 			String lastDate = "";//납기내일자(8nyte)
 			String passDate = "";
-			
+
 			is_damdang = byteLeftPad(is_damdang,20," ");
 			is_dept = byteLeftPad(is_dept,40," ");
 			is_telno = byteLeftPad(is_telno,20," ");
@@ -3800,11 +3813,11 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 			is_szsemokNm = byteLeftPad(is_szsemokNm, 50, " ");
 			is_szsemokNm1 = byteLeftPad(is_szsemokNm1, 50, " ");
 			is_semokNm2 = byteRightPad(is_semokNm2, 50, " ");
-			
-			
-			
+
+
+
 			for(int i = 0; i<statList.size(); i++){
-				
+
 				passDate = statList.get(i).getYear()+statList.get(i).getMonth()+statList.get(i).getDay();
 				is_a6 = statList.get(i).getSendDate().substring(0, 6);
 				is_owner = statList.get(i).getOwner();
@@ -3815,18 +3828,18 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 				is_aAmt = "";
 				virtualBank = statList.get(i).getVirtualBank();
 				lastDate = statList.get(i).getEndDate();
-				
+
 				is_seqNo = byteLeftPad(is_seqNo, 6, "0");
 				is_a9 = combyteSec(is_a4+is_a5+is_a6+is_a7+is_seqNo);
-				
-				
-				
+
+
+
 				is_owner = byteRightPad(is_owner, 60, " ");
 				is_resident = byteRightPad(is_resident, 13, " ");
 				is_carNo = byteRightPad(is_carNo, 260, " ");
 				is_bAmt = byteLeftPad(is_bAmt, 11, "0");
 				is_aAmt = byteLeftPad(is_aAmt, 11, "0");
-				
+
 				txt += is_a1+is_a2+is_a3+is_a4+is_a5+is_a6+is_a7+is_seqNo+is_a9+is_owner
 						+is_resident+is_carNo
 						+is_szaccNm+is_szsemokNm+is_szsemokNm1+
@@ -3840,12 +3853,12 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 						+lastDate+lastDate+address+is_szVal1+is_szVal2+is_szVal3+is_szVal4
 						+is_damdang+is_dept+is_telno+is_bank+is_payDate+ls_a44+virtualBank
 						+ls_a48+ls_a48+ls_a48+ls_a48+ls_a48+ls_a53+"\r\n";
-				
+
 				statList.get(i).setSessionUserNm(HttpUtil.getEmpNm());
 				statList.get(i).setSysNoticeId("04");
 				statList.get(i).setEtaxNum(is_a1+is_a2+is_a3+is_a4+is_a5+is_a6+is_a7+is_seqNo+is_a9);
 				finePenaltyDao.updateDefEtaxSendInfo(statList.get(i));
-				
+
 			}
 			result.setEtaxCon(txt);
 		}catch(RuntimeException e) {
@@ -3862,14 +3875,6 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
 		}
 		return result;
 	}
-	
-	public String byteLeftPad(String var,int leng,String A) throws UnsupportedEncodingException{
-		byte[] buffers = var.getBytes("MS949");
-		String result = "";
-		result = StringUtils.leftPad(result,leng-buffers.length,A);
-		result = result+var;
-		return result;
-	}
 	public String byteRightPad(String var,int leng,String A) throws UnsupportedEncodingException{
 		byte[] buffers = var.getBytes("MS949");
 		String result = "";

src/cfs/fine/web/FinePenaltyController.java

@@ -1786,7 +1786,7 @@ public class FinePenaltyController {
 	 * @return
 	 * 수정내역
 	 */
-	@RequestMapping(value="/cfs/fine/findCreateETaxFile.do", method=RequestMethod.POST)
+	@RequestMapping(value="/cfs/fine/findCreateETaxFile.do", method=RequestMethod.POST) //전인종 etax
 	public @ResponseBody Map<String, Object> findCreateETaxFile(@RequestBody ParamBean<PenaltyParamVO> param, HttpServletRequest request) {
 		Result result = new Result();
 		PenaltyParamVO penaltyParamVO = param.getParam();

src/cfs/input/dao/PresentByWorkerStatDao.java

@@ -30,5 +30,7 @@ public interface PresentByWorkerStatDao {
 	public List<PresentByWorkerVO> findPresentByNotDownStatList(PresentByWorkerVO param);
 	
 	public void updateGroupAmPm(PresentByWorkerVO param);
+
+	public List<PresentByWorkerVO> findManage();
 	
 }

src/cfs/input/dao/mapper/PresentByWorkerStat_mapper.xml

@@ -115,5 +115,45 @@
 		   and work_stt_time = #{workSttTime}
 		   and work_end_time = #{workEndTime}
 	</update>
+	<!--
+		입력관리 > 징수원별 정산현황 - 근무자 확인을 조회한다.
+	 -->
+	<select id="findManage" resultType="cfs.input.vo.PresentByWorkerVO">
+		SELECT
+		mi.WORKER_NAME as manageName
+		FROM (
+		SELECT
+		t.FARE_OFFICE_ID,
+		t.BOOTH_ID,
+		t.WORKER_ID,
+		t.WORK_TIMES
+		FROM
+		DBUSER_CFS.FARE_TERMINAL_INFO t
+		WHERE
+		t.PASS_DATE = TO_CHAR(SYSDATE, 'YYYYMMDD')
+		AND t.BOOTH_ID IN ('01', '02', '03', '04')
+		AND (t.FARE_OFFICE_ID, t.BOOTH_ID, t.WORK_TIMES) IN (
+		SELECT
+		t2.FARE_OFFICE_ID,
+		t2.BOOTH_ID,
+		MAX(t2.WORK_TIMES)
+		FROM
+		DBUSER_CFS.FARE_TERMINAL_INFO t2
+		WHERE
+		t2.PASS_DATE = TO_CHAR(SYSDATE, 'YYYYMMDD')
+		AND t2.BOOTH_ID IN ('01', '02', '03', '04')
+		GROUP BY
+		t2.FARE_OFFICE_ID,
+		t2.BOOTH_ID
+		)
+		) main
+		JOIN
+		DBUSER_CFS.WORKER_INFO mi
+		ON
+		main.WORKER_ID = mi.WORKER_ID
+		ORDER BY
+		main.FARE_OFFICE_ID,
+		main.BOOTH_ID
+	</select>
 
 </mapper>

src/cfs/input/service/PresentByWorkerStatService.java

@@ -49,5 +49,16 @@ public interface PresentByWorkerStatService {
 	 * 수정내역
 	 */
 	public void updateGroupAmPm(PresentByWorkerVO param) throws Exception;
+
+	/**
+	 * 입력관리 > 징수원별 정산현황 - 근무자확인
+	 * @author exchange84
+	 * @task IP001M01
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 * 수정내역
+	 */
+	public List<PresentByWorkerVO> findManage() throws Exception;
 	
 }

src/cfs/input/service/impl/PresentByWorkerStatServiceImpl.java

@@ -143,5 +143,9 @@ public class PresentByWorkerStatServiceImpl implements PresentByWorkerStatServic
 		param.setSessionUserNm(HttpUtil.getEmpNm());
 		presentByWorkerStatDao.updateGroupAmPm(param);
 	}
-	
+
+	@Override
+	public List<PresentByWorkerVO> findManage() throws Exception {
+		return presentByWorkerStatDao.findManage();
+	}
 }

src/cfs/input/vo/PresentByWorkerVO.java

@@ -59,8 +59,16 @@ public class PresentByWorkerVO  extends CommonParamVO {
 	private String collectNm;
 	private long levyAmount=0;
 	private String noteInputRemarks;
-	
-	
+	private String manageName;
+
+	public String getManageName() {
+		return manageName;
+	}
+
+	public void setManageName(String manageName) {
+		this.manageName = manageName;
+	}
+
 	public String getIsGubun() {
 		return isGubun;
 	}

src/cfs/input/web/InputAfterController.java

@@ -408,8 +408,10 @@ public class InputAfterController {
 			
 			result.setMsg(Result.STATUS_SUCESS, "수정되었습니다.");
 		}catch(RuntimeException e) {
+			logger.info("문제", e);
 			result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE);
 		} catch (Exception ex) {
+			logger.info("문제", ex);
 			result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE);
 		}
 		

src/cfs/input/web/PresentByWorkerStatController.java

@@ -131,5 +131,28 @@ public class PresentByWorkerStatController {
 		}
 		return result.getResult();
 	}
+
+	/**
+	 * 입력관리 > 징수원별 정산현황 - 근무자 확인
+	 * @author exchange84
+	 * @task IP001M01
+	 * @param param
+	 * @param request
+	 * @return
+	 * @throws Exception
+	 * 수정내역
+	 */
+	@RequestMapping(value="/cfs/input/findmanage.do", method=RequestMethod.POST)
+	public @ResponseBody Map<String, Object> findManage(HttpServletRequest request) throws Exception {
+		Result result = new Result();
+		try {
+			result.setData("result", findPresentByWorkerStatService.findManage());
+		}catch(RuntimeException e) {
+			result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE);
+		} catch (Exception e) {
+			result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE);
+		}
+		return result.getResult();
+	}
 	
 }

src/cfs/standard/dao/StandardCodeInfoDao.java

@@ -52,6 +52,8 @@ public interface StandardCodeInfoDao {
 	public Map<String, String> findStandardExemptCarNoCheck(StandardCodeInfoVO standardCodeInfoVO);	
 	public void insertStandardExemptCarNo(StandardCodeInfoVO standardCodeInfoVO);	
 	public void insertStandardExemptCarNoBak(StandardCodeInfoVO standardCodeInfoVO);	
+	public void insertManyExemptCarNo(StandardCodeInfoVO standardCodeInfoVO);	
+	public void insertExemptCarNo(StandardCodeInfoVO standardCodeInfoVO);	
 	public void updateStandardExemptCarNo(StandardCodeInfoVO standardCodeInfoVO);	
 	public void updateStandardExemptCarNoCsvDup(StandardCodeInfoVO standardCodeInfoVO);	
 	public void updateStandardExemptCarNoCsvDup2(StandardCodeInfoVO standardCodeInfoVO);	

src/cfs/standard/service/StandardCodeInfoService.java

@@ -41,6 +41,7 @@ public interface StandardCodeInfoService {
 	public Map<String, String> findStandardExemptCarNo(StandardCodeInfoVO standardCodeInfoVO) throws Exception;
 	public Map<String, String> findStandardExemptCarTypeId(StandardCodeInfoVO standardCodeInfoVO) throws Exception;
 	public Map<String, String> updateStandardExemptCarNo(StandardCodeInfoVO standardCodeInfoVO) throws Exception;
+	public Map<String, String> insertManyExemptCarNo(StandardCodeInfoVO standardCodeInfoVO) throws Exception;
 	List<Map<String, Object>> insertCsvFile(StandardCodeInfoVO standardCodeInfoVO) throws Exception;
 	void insertStandardExemptCarNo(ParamBean param) throws Exception;
 	

src/cfs/standard/service/impl/StandardCodeInfoServiceImpl.java

@@ -1,10 +1,16 @@
 package cfs.standard.service.impl;
 
 
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
@@ -222,6 +228,90 @@ public class StandardCodeInfoServiceImpl implements StandardCodeInfoService{
 		
 		return result;
 	}
+	
+	@Override
+	public Map<String, String> insertManyExemptCarNo(StandardCodeInfoVO param) {
+	    Map<String, String> result = null;
+	    
+	    try {
+	        // 날짜 형식 지정
+	        DateTimeFormatter formatter6 = DateTimeFormatter.ofPattern("yyMMdd");
+	        DateTimeFormatter formatter8 = DateTimeFormatter.ofPattern("yyyyMMdd");
+	        
+	        // 빈 문자열을 "0"으로 처리
+	        if (param.getBirth1().isEmpty()) param.setBirth1("0");
+	        if (param.getBirth2().isEmpty()) param.setBirth2("0");
+	        if (param.getBirth3().isEmpty()) param.setBirth3("0");
+	        if (param.getBirth4().isEmpty()) param.setBirth4("0");
+	        if (param.getBirth5().isEmpty()) param.setBirth5("0");
+
+	        // 유효한 날짜를 리스트에 추가
+	        List<String> birthDates = Arrays.asList(
+	                param.getBirth1(), param.getBirth2(), param.getBirth3(), param.getBirth4(), param.getBirth5())
+	                .stream()
+	                .filter(date -> !date.equals("0"))
+	                .collect(Collectors.toList());
+	        
+	        // 날짜로 변환하여 가장 어린 날짜 찾기
+	        Optional<LocalDate> latestBirthDate = birthDates.stream()
+	                .map(date -> {
+	                    if (date.length() == 6) {
+	                        return LocalDate.parse(date, formatter6);
+	                    } else if (date.length() == 8) {
+	                        return LocalDate.parse(date, formatter8);
+	                    } else {
+	                        return null;
+	                    }
+	                })
+	                .filter(date -> date != null)
+	                .max(LocalDate::compareTo);
+	        
+	        if (latestBirthDate.isPresent()) {
+	            LocalDate youngestDate = latestBirthDate.get();
+	            // 만 19세가 되는 마지막 날짜 계산
+	            LocalDate date19YearsOld = youngestDate.plusYears(19);
+	            YearMonth yearMonth = YearMonth.of(date19YearsOld.getYear(), date19YearsOld.getMonth());
+	            LocalDate lastDayOfMonth = yearMonth.atEndOfMonth();
+	            
+	            // birthList 생성
+	            int[] birthArray = new int[6];
+	            birthArray[1] = Integer.parseInt("1" + param.getBirth1()); // 기존 birth1 처리
+	            birthArray[2] = Integer.parseInt("1" + param.getBirth2());
+	            birthArray[3] = Integer.parseInt("1" + param.getBirth3());
+	            birthArray[4] = Integer.parseInt("1" + param.getBirth4());
+	            birthArray[5] = Integer.parseInt("1" + param.getBirth5());
+	            
+	            Arrays.sort(birthArray);
+	            
+	            String birthList = (birthArray[5] > 100 ? (birthArray[5] + "").substring(1, 7) : "") 
+	                            + (birthArray[4] > 100 ? "|" + (birthArray[4] + "").substring(1, 7) : "") 
+	                            + (birthArray[3] > 100 ? "|" + (birthArray[3] + "").substring(1, 7) : "") 
+	                            + (birthArray[2] > 100 ? "|" + (birthArray[2] + "").substring(1, 7) : "") 
+	                            + (birthArray[1] > 100 ? "|" + (birthArray[1] + "").substring(1, 7) : "");
+
+	            param.setBirth1(birthList);
+	            
+	            // 결과를 birth2에 세팅 (YYYYMMDD 형식)
+	            String resultDate = lastDayOfMonth.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+	            param.setBirth2(resultDate);
+	            
+	            System.out.println("Updated birth1: " + param.getBirth1());
+	            System.out.println("Updated birth2: " + param.getBirth2());
+	        } else {
+	            // 유효한 날짜가 없으면 birth2를 기본값으로 설정 (선택 사항)
+	            param.setBirth2("00000000");
+	        }
+	        
+	        // DAO 호출
+	        StandardCodeInfoDao.insertManyExemptCarNo(param);
+	        StandardCodeInfoDao.insertExemptCarNo(param);
+	        
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	    }
+	    
+	    return result;
+	}
     
 	//면제차량 정보 - 일괄등록(엑셀) - 엑셀 내용 읽어 드리기
 	@Override

src/cfs/standard/vo/StandardCodeInfoVO.java

@@ -96,10 +96,45 @@ public class StandardCodeInfoVO extends CommonParamVO{
 	
 	private String reduCd;  		//감면코드
 	private String modiYn;			//수정여부
+	private String birth1;			//수정여부
+	private String birth2;			//수정여부
+	private String birth3;			//수정여부
+	private String birth4;			//수정여부
+	private String birth5;			//수정여부
 
 	
 	
 	
+	public String getBirth1() {
+		return birth1;
+	}
+	public void setBirth1(String birth1) {
+		this.birth1 = birth1;
+	}
+	public String getBirth2() {
+		return birth2;
+	}
+	public void setBirth2(String birth2) {
+		this.birth2 = birth2;
+	}
+	public String getBirth3() {
+		return birth3;
+	}
+	public void setBirth3(String birth3) {
+		this.birth3 = birth3;
+	}
+	public String getBirth4() {
+		return birth4;
+	}
+	public void setBirth4(String birth4) {
+		this.birth4 = birth4;
+	}
+	public String getBirth5() {
+		return birth5;
+	}
+	public void setBirth5(String birth5) {
+		this.birth5 = birth5;
+	}
 	public String getModiYn() {
 		return modiYn;
 	}

src/cfs/standard/web/StandardCodeInfoController.java

@@ -924,4 +924,37 @@ public class StandardCodeInfoController {
 		}
 		return result.getResult();
 	}
+	
+	
+	
+
+	/**
+	 * 
+	 * 면제차량 정보
+	 * @author cfs02
+	 * @task [SD07] 저장
+	 * @param param
+	 * @return
+	 * 
+	 */
+	@RequestMapping(value="/cfs/standard/insertManyExemptCarNo.do", method=RequestMethod.POST)
+	public @ResponseBody Map<String, Object> insertManyExemptCarNo(@RequestBody ParamBean<StandardCodeInfoVO> param, HttpServletRequest request) {
+		StandardCodeInfoVO standardCodeInfoVO = param.getParam(); 
+
+		Result result = new Result();
+		Map <String,String> statMap = null;
+		try {
+			HttpSession session = request.getSession();
+			standardCodeInfoVO.setSessionUserNm((String) session.getAttribute("EMP_NM"));
+			statMap = StandardCodeInfoService.insertManyExemptCarNo(standardCodeInfoVO);
+			result.setData("result", statMap);
+			
+			result.setMsg(Result.STATUS_SUCESS, "정상적으로 조회가 완료되었습니다.");
+		}catch(RuntimeException e) {
+			result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE);
+		} catch (Exception e) {
+			result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE);
+		}
+		return result.getResult();
+	}
 }

src/cfs/traffic/dao/mapper/TrafficInoutList_mapper.xml

@@ -1764,6 +1764,7 @@
 		<result property="sCarDiscQ" column="sCarDiscQ"/>
 		<result property="weekDiscQ" column="weekDiscQ"/>
 		<result property="greenDiscQ" column="greenDiscQ"/>
+		<result property="manyExemptQ" column="manyExemptQ"/>
 		<result property="threeExemptQ" column="threeExemptQ"/>
 		<result property="sCarExemptQ" column="sCarExemptQ"/>
 		<result property="pacrExemptQ" column="pacrExemptQ"/>
@@ -1794,7 +1795,7 @@
 	    	YEAR as passDate,
 	    </if>
 		sum(total_quantity)- sum(nonpayment_quantity) as totalQ,
-        SUM(payment_quantity) as payQ,
+		sum(pay_car_cnt) + sum(scar_disc_cnt) as payQ,
         sum(pay_car_cnt) as payCarQ,
         sum(scar_disc_cnt) as sCarDiscQ,
         sum(week_disc_cnt) as weekDiscQ,
@@ -1803,7 +1804,8 @@
         SUM(THREE_EXEMPT_CNT) as threeExemptQ,
         SUM(SCAR_EXEMPT_CNT) as sCarExemptQ,
         SUM(PCAR_EXEMPT_CNT) +SUM(KPCAR_EXEMPT_CNT) + SUM(REG_EXEMPT_CNT) as pacrExemptQ,
-        SUM(GREEN_EXEMPT_CNT) +SUM(ECO_EXEMPT_CNT) as greenExemptQ,
+        SUM(GREEN_EXEMPT_CNT) as greenExemptQ,
+        SUM(ECO_EXEMPT_CNT) AS manyExemptQ,
         SUM(EXE_EXEMPT_CNT) +SUM(KEY_EXEMPT_CNT) +SUM (GIN_EXEMPT_CNT) +SUM (GONG_EXEMPT_CNT) +SUM (NEWS_EXEMPT_CNT) as gongExemptQ,
         SUM(FCAR_EXEMPT_CNT) as fCarExemptQ,
         SUM(THREE_EXEMPT_CNT)+SUM(SCAR_EXEMPT_CNT)+SUM(PCAR_EXEMPT_CNT)+SUM(KPCAR_EXEMPT_CNT) + SUM(REG_EXEMPT_CNT)+SUM(GREEN_EXEMPT_CNT)+SUM(ECO_EXEMPT_CNT)+SUM(EXE_EXEMPT_CNT)+SUM(KEY_EXEMPT_CNT)+SUM (GIN_EXEMPT_CNT) +SUM (GONG_EXEMPT_CNT) +SUM (NEWS_EXEMPT_CNT)+SUM(FCAR_EXEMPT_CNT) as exemptQ,
@@ -1812,8 +1814,8 @@
         SUM(BUS_CNT) as busQ,
         SUM(CARTYPE2_CNT)+ SUM(TAXI_CNT) + SUM(BUS_CNT) + SUM(CARTYPE3_CNT) +SUM (CARTYPE4_CNT) as carTypeTotal,
         SUM(CARTYPE3_CNT) +SUM (CARTYPE4_CNT) as carTypeQ,
-        SUM(EXEMPT_QUANTITY) as exemptTotalQ
-   from tb_cfs_exempt_cars_traffic_sat
+		SUM(THREE_EXEMPT_CNT)+SUM(SCAR_EXEMPT_CNT)+SUM(PCAR_EXEMPT_CNT)+SUM(KPCAR_EXEMPT_CNT) + SUM(REG_EXEMPT_CNT)+SUM(GREEN_EXEMPT_CNT)+SUM(ECO_EXEMPT_CNT)+SUM(EXE_EXEMPT_CNT)+SUM(KEY_EXEMPT_CNT)+SUM (GIN_EXEMPT_CNT) +SUM (GONG_EXEMPT_CNT) +SUM (NEWS_EXEMPT_CNT)+SUM(FCAR_EXEMPT_CNT) + SUM(CARTYPE2_CNT)+ SUM(TAXI_CNT) + SUM(BUS_CNT) + SUM(CARTYPE3_CNT) +SUM (CARTYPE4_CNT) as exemptTotalQ
+		from tb_cfs_exempt_cars_traffic_sat
     <if test="kbn == 1">
     WHERE PASS_DATE BETWEEN #{inStDate} AND #{inEdDate}
     </if>

src/cfs/traffic/dao/mapper/TrafficNightTimeCoefficientList_mapper.xml

@@ -709,9 +709,9 @@
 				and fare_office_id = #{fareOfficeId}
 			</if>
 			GROUP BY PASS_DATE
-		) QQ		
+		) QQ
 		WHERE OO.PASS_DATE = PP.PASS_DATE(+)
-		AND OO.PASS_DATE = QQ.PASS_DATE(+)		
+		AND OO.PASS_DATE = QQ.PASS_DATE(+)
 		AND OO.PASS_DATE = AA.PASS_DATE(+)
 		AND OO.PASS_DATE = BB.PASS_DATE(+)
 		AND OO.PASS_DATE = CC.PASS_DATE(+)
@@ -731,248 +731,197 @@
 	<!-- 차종별 유입유출 통행량 현황 [TF025M01] -->
 	<select id="findTrafficCarInOutTypeList_kbn3" parameterType="cfs.traffic.vo.TrafficNightTimeCoefficientListVO" resultMap="trafficNightTimeCoefficientList-resultMap">
 		SELECT
-			OO.PASS_DATE  AS DIVISION
-			, NVL(OO.COUNT,0) AS SUBTOTAL
-			, NVL(PP.COUNT,0) AS INFLOW_SUBTOTAL
-			, NVL(QQ.COUNT,0) AS OUTFLOW_SUBTOTAL
-			, (NVL(AA.COUNT,0)+NVL(BB.COUNT,0)) AS CAR
-			, NVL(AA.COUNT,0) AS INFLOW_CAR
-			, NVL(BB.COUNT,0) AS OUTFLOW_CAR
-			, (NVL(CC.COUNT,0)+NVL(DD.COUNT,0)) AS VAN
-			, NVL(CC.COUNT,0) AS INFLOW_VAN
-			, NVL(DD.COUNT,0) AS OUTFLOW_VAN
-			, (NVL(EE.COUNT,0)+NVL(FF.COUNT,0)) AS FREIGHTCAR
-			, NVL(EE.COUNT,0) AS INFLOW_FREIGHTCAR
-			, NVL(FF.COUNT,0) AS OUTFLOW_FREIGHTCAR
-			, (NVL(GG.COUNT,0)+NVL(HH.COUNT,0)) AS SPECIALCAR
-			, NVL(GG.COUNT,0) AS INFLOW_SPECIALCAR
-			, NVL(HH.COUNT,0) AS OUTFLOW_SPECIALCAR
-			, (NVL(II.COUNT,0)+NVL(JJ.COUNT,0)) AS UNRECOGNIZED
-			, NVL(II.COUNT,0) AS INFLOW_UNRECOGNIZED
-			, NVL(JJ.COUNT,0) AS OUTFLOW_UNRECOGNIZED
-			, (NVL(KK.COUNT,0)+NVL(LL.COUNT,0)) AS TAXI
-			, NVL(KK.COUNT,0) AS INFLOW_TAXI
-			, NVL(LL.COUNT,0) AS OUTFLOW_TAXI
-			, (NVL(MM.COUNT,0)+NVL(NN.COUNT,0)) AS BUS
-			, NVL(MM.COUNT,0) AS INFLOW_BUS
-			, NVL(NN.COUNT,0) AS OUTFLOW_BUS
+		OO.PASS_DATE  AS DIVISION
+		, NVL(OO.COUNT,0) AS SUBTOTAL
+		, NVL(PP.COUNT,0) AS INFLOW_SUBTOTAL
+		, NVL(QQ.COUNT,0) AS OUTFLOW_SUBTOTAL
+		, (NVL(AA.COUNT,0)+NVL(BB.COUNT,0)) AS CAR
+		, NVL(AA.COUNT,0) AS INFLOW_CAR
+		, NVL(BB.COUNT,0) AS OUTFLOW_CAR
+		, (NVL(CC.COUNT,0)+NVL(DD.COUNT,0)) AS VAN
+		, NVL(CC.COUNT,0) AS INFLOW_VAN
+		, NVL(DD.COUNT,0) AS OUTFLOW_VAN
+		, (NVL(EE.COUNT,0)+NVL(FF.COUNT,0)) AS FREIGHTCAR
+		, NVL(EE.COUNT,0) AS INFLOW_FREIGHTCAR
+		, NVL(FF.COUNT,0) AS OUTFLOW_FREIGHTCAR
+		, (NVL(GG.COUNT,0)+NVL(HH.COUNT,0)) AS SPECIALCAR
+		, NVL(GG.COUNT,0) AS INFLOW_SPECIALCAR
+		, NVL(HH.COUNT,0) AS OUTFLOW_SPECIALCAR
+		, (NVL(II.COUNT,0)+NVL(JJ.COUNT,0)) AS UNRECOGNIZED
+		, NVL(II.COUNT,0) AS INFLOW_UNRECOGNIZED
+		, NVL(JJ.COUNT,0) AS OUTFLOW_UNRECOGNIZED
+		, (NVL(KK.COUNT,0)+NVL(LL.COUNT,0)) AS TAXI
+		, NVL(KK.COUNT,0) AS INFLOW_TAXI
+		, NVL(LL.COUNT,0) AS OUTFLOW_TAXI
+		, (NVL(MM.COUNT,0)+NVL(NN.COUNT,0)) AS BUS
+		, NVL(MM.COUNT,0) AS INFLOW_BUS
+		, NVL(NN.COUNT,0) AS OUTFLOW_BUS
 		FROM
 		(
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE SUBSTR(PASS_DATE, 1,6) BETWEEN #{inStDate} AND #{inEdDate}
-			AND CARS_TYPE_ID = '1'
-			AND IN_OUT_KBN= '1'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE SUBSTR(PASS_DATE, 1,6) BETWEEN ${inStDate} AND ${inEdDate}
+		AND CARS_TYPE_ID = '1'
+		AND IN_OUT_KBN= '1' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) AA
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '1'
-			AND IN_OUT_KBN= '2'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '1'
+		AND IN_OUT_KBN= '2' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) BB
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '2'
-			AND IN_OUT_KBN= '1'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '2'
+		AND IN_OUT_KBN= '1' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) CC
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '2'
-			AND IN_OUT_KBN= '2'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '2'
+		AND IN_OUT_KBN= '2' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) DD
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '3'
-			AND IN_OUT_KBN= '1'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '3'
+		AND IN_OUT_KBN= '1' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) EE
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '3'
-			AND IN_OUT_KBN= '2'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '3'
+		AND IN_OUT_KBN= '2' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) FF
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '4'
-			AND IN_OUT_KBN= '1'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '4'
+		AND IN_OUT_KBN= '1' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) GG
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '4'
-			AND IN_OUT_KBN= '2'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '4'
+		AND IN_OUT_KBN= '2' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) HH
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '5'
-			AND IN_OUT_KBN= '1'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '5'
+		AND IN_OUT_KBN= '1' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) II
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '5'
-			AND IN_OUT_KBN= '2'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '5'
+		AND IN_OUT_KBN= '2' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) JJ
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '6'
-			AND IN_OUT_KBN= '1'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '6'
+		AND IN_OUT_KBN= '1' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) KK
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '6'
-			AND IN_OUT_KBN= '2'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '6'
+		AND IN_OUT_KBN= '2' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) LL
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '7'
-			AND IN_OUT_KBN = '1'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '7'
+		AND IN_OUT_KBN = '1' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) MM
 		, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND CARS_TYPE_ID = '7'
-			AND IN_OUT_KBN = '2'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31'
+		AND CARS_TYPE_ID = '7'
+		AND IN_OUT_KBN = '2' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) NN, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) OO, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND IN_OUT_KBN = '1'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		AND IN_OUT_KBN = '1'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) PP, (
-			SELECT
-				SUBSTR(PASS_DATE,1,6) AS PASS_DATE
-				,COUNT(*) AS COUNT
-			FROM DAY_TRAFFIC_INFO
-			WHERE PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-			AND IN_OUT_KBN = '2'
-			<if test="fareOfficeId!=null and !fareOfficeId.equals('')">
-				and fare_office_id = #{fareOfficeId}
-			</if>
-			GROUP BY SUBSTR(PASS_DATE,1,6)
+		SELECT
+		SUBSTR(PASS_DATE,1,6) AS PASS_DATE
+		,COUNT(*) AS COUNT
+		FROM DBUSER_CFS.DAY_TRAFFIC_INFO A, DBUSER_CFS.T_TCCJ107_M01 B
+		WHERE PASS_DATE BETWEEN ${inStDate}||'01' AND ${inEdDate}||'31' AND A.PASS_DATE = B.DATES AND B.HLDY_CLSS_CD ='0' AND PASS_TIME BETWEEN '070000' and '205959'
+		AND IN_OUT_KBN = '2'
+		GROUP BY SUBSTR(PASS_DATE,1,6)
 		) QQ
 		WHERE OO.PASS_DATE = PP.PASS_DATE(+)
-		AND OO.PASS_DATE = QQ.PASS_DATE(+)		
+		AND OO.PASS_DATE = QQ.PASS_DATE(+)
 		AND OO.PASS_DATE = AA.PASS_DATE(+)
 		AND OO.PASS_DATE = BB.PASS_DATE(+)
 		AND OO.PASS_DATE = CC.PASS_DATE(+)

src/cfs/traffic/vo/TrafficInoutListVO.java

@@ -155,6 +155,7 @@ public class TrafficInoutListVO {
 	private String sCarDiscQ;
 	private String weekDiscQ;
 	private String greenDiscQ;
+	private String manyExemptQ;
 	private String threeExemptQ;
 	private String sCarExemptQ;
 	private String pacrExemptQ;
@@ -1230,6 +1231,12 @@ public class TrafficInoutListVO {
 	public void setEcoGrade0(String ecoGrade0) {
 		this.ecoGrade0 = ecoGrade0;
 	}
+	public String getManyExemptQ() {
+		return manyExemptQ;
+	}
+	public void setManyExemptQ(String manyExemptQ) {
+		this.manyExemptQ = manyExemptQ;
+	}
 	
 
 	

src/cfs/trsmrcv/web/CommCollectServer2Controller.java

@@ -529,7 +529,7 @@ public class CommCollectServer2Controller {
 		mapOrg.put("index_start", index_start);
 		mapOrg.put("index_end", index_end);
 		mapOrg.put("req_seq", String.format("%d", Integer.parseInt(req_seq.toString())));
-		
+
 		List<Map<String, Object>> obj = null;
 		
 		boolean isRunning = true;
@@ -540,7 +540,7 @@ public class CommCollectServer2Controller {
 				obj = commCollectServer2Service.selectExemptHex(mapOrg);
 				if(obj == null || obj.size() == 0) {
 					result.setMsg(ResultSmartPlatform.STATUS_SUCESS, "정상적으로 처리되었습니다.");	
-					result.setMsg(ResultSmartPlatform.RESULT_KEY_DEFAULT, "조회결과가 없습니다.");	
+					result.setMsg(ResultSmartPlatform.RESULT_KEY_DEFAULT, "조회결과가 없습니다.");
 					return result.getResult();
 				}	
 				int i=0;

src/cfs/trsmrcv/web/CommCollectServerController.java

@@ -801,6 +801,10 @@ public class CommCollectServerController {
 			, HttpServletRequest request) throws Exception {
 		ResultSmartPlatform result = new ResultSmartPlatform();
 
+		//---------------
+
+		//---------------
+
 		Map<String, String> mapOrg = new HashMap<String, String>();
 		mapOrg.put("insttNo", "BRSMC0300001");
 		mapOrg.put("insttCntcJobSe", "016");
@@ -891,7 +895,7 @@ public class CommCollectServerController {
 					obj.get(i).put("WORKER", "admin");
 					obj.get(i).put("MODI_YN", "N");
 					
-					logger.info("=== 1 : " + obj.get(i).get("CAR_NO").toString());
+					logger.info("=== 1 : " + obj.get(i).get("CAR_NO").toString()); //전인종
 					
 					// 탈퇴이거나 차량을 삭제하면 삭제만 함.
 					if(obj.get(i).get("SECSN_YN").toString().equals("Y") == true

src/cfs/trsmrcv/web/CommSmartPlatformPRPController.java

@@ -1037,6 +1037,7 @@ public class CommSmartPlatformPRPController {
 				
 				result.setMsg(ResultSmartPlatform.STATUS_ERROR, ResultSmartPlatform.STATUS_ERROR_MESSAGE);
 				return result.getResult();
+				
 			}else {
 				//성공 처리 Table Insert
 				JSONParser parser = new JSONParser();
@@ -1089,7 +1090,7 @@ public class CommSmartPlatformPRPController {
 			
 			//결과 수신
 			if(manylist == null || manylist.size() == 0) {
-				// 조회 실패
+				// 조회 실패	
 				logger.info("getChgManychild_조회 실패");
 				
 				result.setMsg(ResultSmartPlatform.STATUS_ERROR, ResultSmartPlatform.STATUS_ERROR_MESSAGE);

src/cfs/trsmrcv/web/MakeCarNoHex2CarNo.java

@@ -17,7 +17,7 @@ public class MakeCarNoHex2CarNo {
 
 	//	
 	public static void main(String[] args) {
-		String[] array ={ "0004332416", "9902422041", "", "", ""};
+		String[] array ={ "서울31바3919"};
 				
 				//{"서울31바3919", "61두6950", "54누5840", "56보1098", "06무3635", "31두7103", "42러2718 ", "41주4712", "24버1549 ", "68라8528 ", "61가3088 ", ""};
 		
@@ -25,9 +25,9 @@ public class MakeCarNoHex2CarNo {
 			if(array[i].length() == 0)
 				continue;
 
-			System.out.println(MakeCarNoHex2CarNo.makeCarNoHex2CarNo(array[i]));			
+			System.out.println(MakeCarNoHex2CarNo.makeCarNoHex2CarNo(array[i]));
 		}
-	}
+	}	
 	/** 
 	* 파라미터가 숫자인지 판단
 	* <pre></pre>

src/com/inswave/template/dao/mariamapper/login_mapper.xml

@@ -9,7 +9,7 @@
 			, b.FAVORITE_STORAGE
 			, b.MAIN_LAYOUT_PAGE_CODE
 		FROM (  SELECT *
-				FROM  dbuser_com.TB_COM_MEMBER
+					FROM  dbuser_com.TB_COM_MEMBER
 				WHERE USER_ID = #{USER_ID}
 				AND   USER_PW = DGUARD.HASH('ENC','PASSWD',#{PASSWORD})
 			) p LEFT JOIN BM_MAIN_SETTING b ON p.EMP_CD = b.EMP_CD