소스정리

src/main/java/cfs/input/dao/InputCommonDao.java

@@ -70,15 +70,7 @@ public interface InputCommonDao {
 	 */
 	public List<InputCommonVO> findCollectCodeInfo(InputCommonVO param);
 
-	/**
-	 * 입력관리 > 공통 - 정액권 가맹점 정보 조회
-	 * @author exchange84
-	 * @task 
-	 * @param param
-	 * @return
-	 * 수정내역
-	 */
-	public List<InputCommonVO> findCardJoinSaleInfo(InputCommonVO param);	
+
 	/**
 	 * 징수유형 코드정보를 조회한다.
 	 * @author cfs02

src/main/java/cfs/input/dao/WorkerFareAdjustDao.java

@@ -552,14 +552,7 @@ public interface WorkerFareAdjustDao {
 	 */
 	public void createWorkerFareTerminalTicketSaleInfo(WorkerFareTerminalInfoVO param);
 
-	/**
-	 * 입력관리 > 검수원정산(징수원정산) - 정액권 카드판매정보 등록
-	 * @author exchange84
-	 * @task IP002P05
-	 * @param param
-	 * 수정내역
-	 */
-	public void createWorkerFareCardTicketSaleInfo(WorkerFareSaleCardInfoVO param);
+
 	
 	/**
 	 * 입력관리 > 검수원정산(징수원정산산) - 정액권 카드결재정보 삭제
@@ -570,14 +563,7 @@ public interface WorkerFareAdjustDao {
 	 */
 	public void deleteWorkerFareCardSaleInfo(WorkerFareSaleCardInfoVO sale);
 	
-	/**
-	 * 입력관리 > 검수원정산(징수원정산) - 정액권 카드결재정보 수정
-	 * @author exchange84
-	 * @task IP002P05
-	 * @param sale
-	 * 수정내역
-	 */
-	public void updateWorkerFareCardSaleInfo(WorkerFareSaleCardInfoVO sale);
+
 
 	/**
 	 * 입력관리 > 검수원정산(징수원정산) - 정액권 판매정보 조회

src/main/java/cfs/input/dao/mapper/InputCommon_mapper.xml

@@ -103,15 +103,7 @@
 		
 	</select>
 	
-	<!-- 
-		입력관리 > 공통 - 정액권 가맹점 정보 조회
-	 -->
-	<select id="findCardJoinSaleInfo" parameterType="cfs.input.vo.InputCommonVO" resultType="cfs.input.vo.InputCommonVO">
-		SELECT JOIN_SALE_NUMBER AS joinSaleNumber
-		    , JOIN_SALE_NAME AS joinSaleName
-		FROM JOIN_SALE_INFO
-		WHERE FARE_OFFICE_ID = #{fareOfficeId, jdbcType=VARCHAR}			
-	</select>
+
 	
 	<select id="findNewCollectCodeInfo" parameterType="cfs.input.vo.InputCommonVO" resultType="cfs.input.vo.InputCommonVO">
 		SELECT COLLECT_ID_NEW AS collectId

src/main/java/cfs/input/dao/mapper/WorkerFareAdjust_mapper.xml

@@ -1534,30 +1534,7 @@
 		)
 	</insert>
 	
-	<!-- 
-		입력관리 > 검수원정산(징수원정산) - 정액권 카드판매정보 등록
-	 -->
-	<insert id="createWorkerFareCardTicketSaleInfo" parameterType="cfs.input.vo.WorkerFareSaleCardInfoVO">
-		INSERT INTO SALE_CARD_INFO (
-			WORKER_ID, FARE_OFFICE_ID, BOOTH_ID, YEAR, MONTH
-			, DAY, WORK_TIMES, SEQNO, COLLECT_ID, IN_OUT_KBN
-			, CARD_NO, PERSON_NAME, N_SALE_Q, N_SALE_M, JOIN_SALE_NUMBER
-			, CHARGE_RATE
-			, CHARGE_AMOUNT, REMARKS
-			, CARD_OFFICE_ID
-			, CARD_APPROVAL_NO
-			, CREATE_DATE, CREATER, UPDATE_DATE, UPDATER
-		) VALUES(
-			#{workerId, jdbcType=VARCHAR}, #{fareOfficeId, jdbcType=VARCHAR}, #{boothId, jdbcType=VARCHAR}, #{year, jdbcType=VARCHAR}, #{month, jdbcType=VARCHAR}
-			, #{day, jdbcType=VARCHAR}, #{workTimes, jdbcType=VARCHAR}, #{seqNo, jdbcType=VARCHAR}, #{collectId, jdbcType=VARCHAR}, #{inOutKbn, jdbcType=VARCHAR}
-			, #{cardNo, jdbcType=VARCHAR}, #{personName, jdbcType=VARCHAR}, #{ticketSaleQty, jdbcType=NUMERIC}, #{ticketSaleIncome, jdbcType=NUMERIC}, #{joinSaleNumber, jdbcType=VARCHAR}
-			, (SELECT CHARGE_RATE FROM JOIN_SALE_INFO WHERE FARE_OFFICE_ID = #{fareOfficeId, jdbcType=VARCHAR} AND JOIN_SALE_NUMBER = #{joinSaleNumber, jdbcType=VARCHAR})
-			, #{chargeAmount, jdbcType=NUMERIC}, #{remarks, jdbcType=VARCHAR}
-			, (SELECT CARD_OFFICE_ID FROM JOIN_SALE_INFO WHERE FARE_OFFICE_ID = #{fareOfficeId, jdbcType=VARCHAR} AND JOIN_SALE_NUMBER = #{joinSaleNumber, jdbcType=VARCHAR})
-			, #{cardApprovalNo, jdbcType=VARCHAR}
-			, SYSDATE, #{sessionUserNm, jdbcType=VARCHAR}, SYSDATE, #{sessionUserNm, jdbcType=VARCHAR}
-		)
-	</insert>
+
 	
 	<!-- 
 		입력관리 > 검수원정산(징수원정산) - 정액권 카드결재정보 삭제
@@ -1574,40 +1551,7 @@
 		AND SEQNO 			= #{seqNo, jdbcType=VARCHAR}
 	</delete>
 	
-	<!-- 
-		입력관리 > 검수원정산(징수원정산) - 정액권 카드결재정보 수정
-	 -->
-	<update id="updateWorkerFareCardSaleInfo" parameterType="cfs.input.vo.WorkerFareSaleCardInfoVO">
-		UPDATE SALE_CARD_INFO
-		SET COLLECT_ID 			= #{collectId, jdbcType=VARCHAR}
-			, CARD_NO 			= #{cardNo, jdbcType=VARCHAR}
-			, PERSON_NAME 		= #{personName, jdbcType=VARCHAR}
-			, N_SALE_Q 			= #{ticketSaleQty, jdbcType=NUMERIC}
-			, N_SALE_M 			= #{ticketSaleIncome, jdbcType=NUMERIC}
-			, REMARKS 			= #{remarks, jdbcType=VARCHAR}
-			, CARD_APPROVAL_NO 	= #{cardAprovalNo, jdbcType=VARCHAR}
-			<if test="befJoinSaleNumber.equals(joinSaleNumber)">
-				, JOIN_SALE_NUMBER 	= #{joinSaleNumber, jdbcType=VARCHAR}
-				, CHARGE_RATE 		= (SELECT CHARGE_RATE 
-									   FROM JOIN_SALE_INFO 
-									   WHERE FARE_OFFICE_ID = #{fareOfficeId, jdbcType=VARCHAR} 
-									   AND JOIN_SALE_NUMBER = #{joinSaleNumber, jdbcType=VARCHAR})
-				, CARD_OFFICE_ID 	= (SELECT CARD_OFFICE_ID 
-									   FROM JOIN_SALE_INFO 
-									   WHERE FARE_OFFICE_ID = #{fareOfficeId, jdbcType=VARCHAR} 
-									   AND JOIN_SALE_NUMBER = #{joinSaleNumber, jdbcType=VARCHAR})
-			</if>
-			, UPDATE_DATE 		= SYSDATE
-			, UPDATER 			= #{sessionUserNm, jdbcType=VARCHAR}
-		WHERE WORKER_ID 	= #{workerId, jdbcType=VARCHAR}
-		AND FARE_OFFICE_ID 	= #{fareOfficeId, jdbcType=VARCHAR}
-		AND BOOTH_ID 		= #{boothId, jdbcType=VARCHAR}
-		AND YEAR 			= #{year, jdbcType=VARCHAR}
-		AND MONTH 			= #{month, jdbcType=VARCHAR}
-		AND DAY 			= #{day, jdbcType=VARCHAR}
-		AND WORK_TIMES 		= #{workTimes, jdbcType=VARCHAR}
-		AND SEQNO 			= #{seqNo, jdbcType=VARCHAR}
-	</update>
+	
 	
 	<!-- 
 		입력관리 > 검수원정산(징수원정산) - 정액권 판매정보 조회

src/main/java/cfs/input/service/InputCommonService.java

@@ -61,15 +61,7 @@ public interface InputCommonService {
 	 */
 	public List<InputCommonVO> findCollectCodeInfo(InputCommonVO param) throws Exception;
 	
-	/**
-	 * 입력관리 > 공통 - 정액권 가맹점 정보 조회
-	 * @author exchange84
-	 * @task 
-	 * @param param
-	 * @return
-	 * 수정내역
-	 */
-	public List<InputCommonVO> findCardJoinSaleInfo(InputCommonVO param); 
+
 	/**
 	 * 징수유형 코드정보를 조회한다.
 	 * @author cfs02

src/main/java/cfs/input/service/WorkerFareAdjustService.java

@@ -359,25 +359,8 @@ public interface WorkerFareAdjustService {
 	 */
 	public WorkerFareSaleCardInfoVO findWorkerFareTicketCardSaleInfo(WorkerFareSaleCardInfoVO param) throws Exception;
 	
-	/**
-	 * 입력관리 > 검수원정산 - 정액권수정 팝업에서 정액권 판매정보를 등록한다. 
-	 * @author exchange84
-	 * @task IP002P05
-	 * @param param
-	 * @throws Exception
-	 * 수정내역
-	 */
-	public void createWorkerFareTicketSaleInfo(WorkerFareTerminalInfoVO param) throws Exception;
 
-	/**
-	 *  입력관리 > 검수원정산 - 정액권수정 팝업에서 정액권 판매정보를 수정한다. 
-	 * @author exchange84
-	 * @task IP002P05
-	 * @param param
-	 * @throws Exception
-	 * 수정내역
-	 */
-	public void updateWorkerFareTicketSaleInfo(WorkerFareTerminalInfoVO param) throws Exception;
+
 
 	/**
 	 * 입력관리 > 검수원정산(징수원정산) - 정액권수정 팝업에서 정액권 판매정보를 삭제한다. 

src/main/java/cfs/input/service/impl/InputCommonServiceImpl.java

@@ -58,10 +58,7 @@ public class InputCommonServiceImpl implements InputCommonService {
 		return inputCommonDao.findCollectCodeInfo(param);
 	}
 	
-	@Override
-	public List<InputCommonVO> findCardJoinSaleInfo(InputCommonVO param) {
-		return inputCommonDao.findCardJoinSaleInfo(param);
-	}
+
 	
 	@Override
 	public List<InputCommonVO> findNewCollectCodeInfo() {

src/main/java/cfs/input/service/impl/WorkerFareAdjustServiceImpl.java

@@ -1222,173 +1222,9 @@ public class WorkerFareAdjustServiceImpl implements WorkerFareAdjustService {
 		return workerFareAdjustDao.findWorkerFareTicketCardSaleInfo(param);
 	}
 	
-	@Override
-	public void createWorkerFareTicketSaleInfo(WorkerFareTerminalInfoVO param) throws Exception {
-		param.setSessionUserId(HttpUtil.getEmpCd());
-		param.setSessionUserNm(HttpUtil.getEmpNm());
-		String message = "";
-		try {
-			param.setNoteTransYn("1");
-			param.setNewDataYn("1");
-			
-			// 요금단말정보에 정액권판매 정보 등록
-			message = "[FARE_TERMINAL_INFO] 저장";
-			workerFareAdjustDao.createWorkerFareTerminalTicketSaleInfo(param);
-			
-			// 정액권 카드판매정보 등록
-			if ("1".equals(param.getUrgentKbn())) {
-				message = "[SALE_CARD_INFO] 저장";
-				WorkerFareSaleCardInfoVO sale = new WorkerFareSaleCardInfoVO();
-				sale.setWorkerId(param.getWorkerId());
-				sale.setFareOfficeId(param.getFareOfficeId());
-				sale.setBoothId(param.getBoothId());
-				sale.setYear(param.getYear());
-				sale.setMonth(param.getMonth());
-				sale.setDay(param.getDay());
-				sale.setWorkTimes(param.getWorkTimes());
-				sale.setSeqNo(param.getSeqNo());
-				sale.setCollectId(param.getCollectId());
-				sale.setInOutKbn(param.getInOutKbn());
-				sale.setCardNo(param.getCardNo());
-				sale.setPersonName(param.getPersonName());
-				sale.setTicketSaleQty(param.getTicketSaleQty());
-				sale.setTicketSaleIncome(param.getTicketSaleIncome());
-				sale.setJoinSaleNumber(param.getJoinSaleNumber());
-				sale.setChargeAmount(0);
-				sale.setRemarks(param.getNoteInputRemarks());
-				sale.setCardApprovalNo(param.getCardAprovalNo());
-				sale.setSessionUserNm(param.getSessionUserNm());
-				workerFareAdjustDao.createWorkerFareCardTicketSaleInfo(sale);
-			}
-			
-			// 수기단말정보 집계후 정산내역 갱신 
-			WorkerFareAdjustVO adjust = new WorkerFareAdjustVO();
-			adjust.setWorkerId(param.getWorkerId());
-			adjust.setFareOfficeId(param.getFareOfficeId());
-			adjust.setBoothId(param.getBoothId());
-			adjust.setYear(param.getYear());
-			adjust.setMonth(param.getMonth());
-			adjust.setDay(param.getDay());
-			adjust.setWorkDate(param.getWorkDate());
-			adjust.setWorkSttTime(param.getWorkSttTime());
-			adjust.setWorkEndTime(param.getWorkEndTime());
-			adjust.setOtherSeqNo(param.getOtherSeqNo());
-			
-			updateWorkerFareSugiTrafficVolInfo(adjust);
-			
-		}catch(RuntimeException e) {
-			message += "이 실패하였습니다.<br/>전산담당자에게 문의하세요.";
-			throw new Exception(message);
-		} catch (Exception e) {
-			message += "이 실패하였습니다.<br/>전산담당자에게 문의하세요.";
-			throw new Exception(message);
-		}
-	}
 	
-	@Override
-	public void updateWorkerFareTicketSaleInfo(WorkerFareTerminalInfoVO param) throws Exception {
-		param.setSessionUserId(HttpUtil.getEmpCd());
-		param.setSessionUserNm(HttpUtil.getEmpNm());
-		String message = "";
-		try {
-			WorkerFareSaleCardInfoVO sale = new WorkerFareSaleCardInfoVO();
-			sale.setWorkerId(param.getWorkerId());
-			sale.setFareOfficeId(param.getFareOfficeId());
-			sale.setBoothId(param.getBoothId());
-			sale.setYear(param.getYear());
-			sale.setMonth(param.getMonth());
-			sale.setDay(param.getDay());
-			sale.setWorkTimes(param.getWorkTimes());
-			sale.setSeqNo(param.getSeqNo());
-
-			sale.setCollectId(param.getCollectId());
-			sale.setCardNo(param.getCardNo());
-			sale.setPersonName(param.getPersonName());
-			sale.setTicketSaleQty(param.getTicketSaleQty());
-			sale.setTicketSaleIncome(param.getTicketSaleIncome());
-			sale.setJoinSaleNumber(param.getJoinSaleNumber());
-			sale.setBefJoinSaleNumber(param.getBefJoinSaleNumber());
-			sale.setRemarks(param.getNoteInputRemarks());
-			sale.setCardApprovalNo(param.getCardAprovalNo());
-			
-			sale.setInOutKbn(param.getInOutKbn());
-			sale.setChargeAmount(0);
-			sale.setSessionUserNm(param.getSessionUserNm());
-			
-			if ("1".equals(param.getBefUrgentKbn())) {
-				if ("0".equals(param.getUrgentKbn())) {
-					// 카드결재였다가 카드결재가 아님으로 바꾼경우
-					
-					// 정액권 카드결재정보 삭제  
-					message = "[SALE_CARD_INFO] 카드결재정보 삭제를 ";
-					workerFareAdjustDao.deleteWorkerFareCardSaleInfo(sale);
-
-				} else if ("1".equals(param.getUrgentKbn())) {
-					
-
-					// 정액권 카드결재정보 수정
-					message = "[SALE_CARD_INFO] 카드결재정보 수정을 ";
-					workerFareAdjustDao.updateWorkerFareCardSaleInfo(sale);
-				}
-				
-			} else if ("0".equals(param.getBefUrgentKbn())) {
-				if ("1".equals(param.getUrgentKbn())) {
-					// 카드결재정보 신규 입력
-					message = "[SALE_CARD_INFO] 저장이";
-					workerFareAdjustDao.createWorkerFareCardTicketSaleInfo(sale);
-				} else {
-					// SALE_CARD_INFO 테이블에 대한 아무런 작업 없음. (카드결재정보 넣지 않음)
-				}
-			}
-			
-			// 수정내역
-			String updateBeforeContents = "";
-			if ( !param.getBefCollectId().equals(param.getCollectId()) ) {
-				updateBeforeContents = "유형 : " + param.getBefCollectId() + " -> " + param.getCollectId();
-			}
-			
-			if ( param.getBefTicketSaleIncome() != param.getTicketSaleIncome() ) {
-				if (!"".equals(updateBeforeContents)) {
-					updateBeforeContents += ", ";
-				}
-				updateBeforeContents += "요금 : " + param.getBefTicketSaleIncome() + " -> " + param.getTicketSaleIncome();
-			}
-			param.setUpdateContents(!"".equals(updateBeforeContents)?updateBeforeContents:"없음");
-			
-			message = "요금단말변경사유정보 수정을 ";
-			param.setLevyAmount(param.getTicketSaleIncome());
-			param.setRemark(param.getNoteInputRemarks());
-			workerFareAdjustDao.createWorkerFareTerminalUpdateInfo(param);
-			
-			message = "요금단말이력정보 수정을 ";
-			workerFareAdjustDao.createWorkerFareTerminalHistoryInfo(param);
-
-			message = "요금단말정보 수정을 ";
-			workerFareAdjustDao.updateWorkerFareTerminalInfoCollectTypeChange(param);
-			
-			// 수기단말정보 집계후 정산내역 갱신 
-			WorkerFareAdjustVO adjust = new WorkerFareAdjustVO();
-			adjust.setWorkerId(param.getWorkerId());
-			adjust.setFareOfficeId(param.getFareOfficeId());
-			adjust.setBoothId(param.getBoothId());
-			adjust.setYear(param.getYear());
-			adjust.setMonth(param.getMonth());
-			adjust.setDay(param.getDay());
-			adjust.setWorkDate(param.getWorkDate());
-			adjust.setWorkSttTime(param.getWorkSttTime());
-			adjust.setWorkEndTime(param.getWorkEndTime());
-			adjust.setOtherSeqNo(param.getOtherSeqNo());
-			
-			updateWorkerFareSugiTrafficVolInfo(adjust);
-			
-		}catch(RuntimeException e) {
-			message += "실패하였습니다.<br/>전산담당자에게 문의하세요.";
-			throw new Exception(message);
-		} catch (Exception e) {
-			message += "실패하였습니다.<br/>전산담당자에게 문의하세요.";
-			throw new Exception(message);
-		}
-	}
+	
+	
 	
 	@Override
 	public void deleteWorkerFareTicketSaleInfo(WorkerFareTerminalInfoVO param) throws Exception {

src/main/java/cfs/input/web/InputCommonController.java

@@ -94,20 +94,7 @@ public class InputCommonController {
 		return inputCommonService.findCollectCodeInfo(param);
 	}
 	
-	/**
-	 * 입력관리 > 공통 - 정액권 가맹점 정보 조회
-	 * @author exchange84
-	 * @task 
-	 * @param param
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 * 수정내역
-	 */
-	@RequestMapping(value="/cfs/input/findCardJoinSaleInfo.do", method=RequestMethod.POST)
-	public @ResponseBody List<InputCommonVO> findCardJoinSaleInfo(@RequestBody InputCommonVO param, HttpServletRequest request) throws Exception {
-		return inputCommonService.findCardJoinSaleInfo(param);
-	}
+
 	
 	
 	

src/main/java/cfs/input/web/WorkerFareAdjustController.java

@@ -777,53 +777,9 @@ public class WorkerFareAdjustController {
 		return workerFareAdjustService.findWorkerFareTicketCardSaleInfo(param);
 	}
 	
-	/**
-	 * 입력관리 > 검수원정산(징수원정산) - 정액권수정 팝업에서 정액권 판매정보를 등록한다. 
-	 * @author exchange84
-	 * @task IP002P05
-	 * @param param
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 * 수정내역
-	 */
-	@RequestMapping(value="/cfs/input/createWorkerFareTicketSaleInfo.do", method=RequestMethod.POST)
-	public @ResponseBody Map<String, Object> createWorkerFareTicketSaleInfo(@RequestBody WorkerFareTerminalInfoVO param, HttpServletRequest request) throws Exception {
-		Result result = new Result();
-		try {
-			workerFareAdjustService.createWorkerFareTicketSaleInfo(param); 
-			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();
-	}
+
 	
-	/**
-	 * 입력관리 > 검수원정산(징수원정산) - 정액권수정 팝업에서 정액권 판매정보를 수정한다. 
-	 * @author exchange84
-	 * @task IP002P05
-	 * @param param
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 * 수정내역
-	 */
-	@RequestMapping(value="/cfs/input/updateWorkerFareTicketSaleInfo.do", method=RequestMethod.POST)
-	public @ResponseBody Map<String, Object> updateWorkerFareTicketSaleInfo(@RequestBody WorkerFareTerminalInfoVO param, HttpServletRequest request) throws Exception {
-		Result result = new Result();
-		try {
-			workerFareAdjustService.updateWorkerFareTicketSaleInfo(param); 
-			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();
-	}
+
 	
 	/**
 	 * 입력관리 > 검수원정산(징수원정산) - 정액권수정 팝업에서 정액권 판매정보를 삭제한다.