xit-app
/
greencar-cfs
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

관리번호 채번 수정

Browse Source
main
이범준 5 months ago
parent 32eb0ef8d2
commit e0d26d96fe
18 changed files with 299 additions and 325 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/cfs/fine/dao/FineTransDao.java
Unescape Escape View File

@ -301,8 +301,7 @@ public interface FineTransDao {
public void updateDefaultTrans(FineTransVO param);
public void createDefaultEtax(FineTransVO param);
public void updateDefaultFareCarsData(FineTransVO param);
public void updateDefaultFareCarsDataKbn(FineTransVO param);

21
src/main/java/cfs/fine/dao/mapper/FinePenaltyDisableProcessing_mapper.xml
Unescape Escape View File

@ -1267,15 +1267,14 @@
, UPDATER = #{sessionUserNm}
<if test="carNo != carNo2">
, CAR_NO = #{carNo}
,OWNER = #{owner}
, OWNER = #{owner}
</if>
<if test="residentNo != residentNo2">
, ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo})
</if>
<if test="miniCarKbn != miniCarKbn2 and collectId == '40'">
, MINI_CAR_KBN = #{miniCarKbn}
</if>
</if>
WHERE WORKER_ID = #{workerId}
AND FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
@ -4605,20 +4604,20 @@
<!-- 과태료 금액수정 - 저장4 -->
<update id="findPaymentOfPenaltyUpdate4" parameterType="cfs.fine.vo.FinePenaltyDisableProcessingVO">
update DEFAULT_FARE_READ_INFO_DAMO
set update_date = sysdate,
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET update_date = sysdate
<if test="collectId == '11' and kbn == '00'">
mini_car_kbn = '1',
, mini_car_kbn = '1'
</if>
<if test="collectId == '11' and kbn == '11'">
rfid_penalty_kbn = '1',
, rfid_penalty_kbn = '1'
</if>
<if test="collectId == '10'">
mini_car_kbn = '0',
rfid_penalty_kbn = '0',
, mini_car_kbn = '0'
, rfid_penalty_kbn = '0'
</if>
updater = #{sessionUserNm}
where worker_id = #{workerId}
, updater = #{sessionUserNm}
WHERE worker_id = #{workerId}
and fare_office_id = #{fareOfficeId}
and booth_id = #{boothId}
and year = #{year}

33
src/main/java/cfs/fine/dao/mapper/FinePenalty_mapper.xml
Unescape Escape View File

@ -4392,7 +4392,8 @@ ORDER BY a.MANAGE_YEAR, a.MANAGE_NO DESC
WHERE PASS_DATE BETWEEN #{inStDate} AND #{inEdDate}
AND send_date BETWEEN TO_DATE(#{sendDate},'yyyymmdd') AND TO_DATE(#{sendDate},'yyyymmdd')+1
AND end_date BETWEEN TO_DATE(#{endDate},'yyyymmdd') AND TO_DATE(#{endDate},'yyyymmdd')+1
GROUP BY MANAGE_YEAR, MANAGE_NO HAVING count(1) >1
GROUP BY MANAGE_YEAR, MANAGE_NO
HAVING count(1) >1
)
</select>
@ -5144,21 +5145,21 @@ ORDER BY a.MANAGE_YEAR, a.MANAGE_NO DESC
</update>
<update id="updateIncomeOcrFileDef" parameterType="cfs.fine.vo.PenaltyParamVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET RECEIPT_DATE = REPLACE(#{receiptDate}, '-', ''),
RECEIPTER = #{owner},
READING_ID = '21',
READ_KBN = '1',
READER = #{sessionUserNm},
READ_RESULT_ID = '31',
RECEIPT_RESULT_ID = '31',
READING_DATE = SYSDATE,
BANK_KBN = #{bankCd},
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserNm}
WHERE MANAGE_YEAR = #{manageYear}
AND MANAGE_NO = to_number(#{manageNo})
AND ETAX_KBN = #{etaxKbn}
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET RECEIPT_DATE = REPLACE(#{receiptDate}, '-', '')
, RECEIPTER = #{owner}
, READING_ID = '21'
, READ_KBN = '1'
, READER = #{sessionUserNm}
, READ_RESULT_ID = '31'
, RECEIPT_RESULT_ID = '31'
, READING_DATE = SYSDATE
, BANK_KBN = #{bankCd}
, UPDATE_DATE = SYSDATE
, UPDATER = #{sessionUserNm}
WHERE MANAGE_YEAR = #{manageYear}
AND MANAGE_NO = to_number(#{manageNo})
AND ETAX_KBN = #{etaxKbn}
</update>
<update id="updateIncomeOcrFileCard" parameterType="cfs.fine.vo.PenaltyParamVO">

113
src/main/java/cfs/fine/dao/mapper/FineTrans_mapper.xml
Unescape Escape View File

@ -1062,20 +1062,19 @@
</update>
<update id="updateCarNo" parameterType="cfs.fine.vo.FineTransVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET <!-- car_no = #{carNo, jdbcType=VARCHAR}, -->
X_POSITION = #{xPosition,jdbcType=VARCHAR},
Y_POSITION = #{yPosition,jdbcType=VARCHAR},
GARO_LEN = #{hLen,jdbcType=VARCHAR},
SERO_LEN = #{vLen,jdbcType=VARCHAR},
update_date = SYSDATE,
updater = #{updater, jdbcType=VARCHAR}
WHERE worker_id = #{workerId, jdbcType=VARCHAR}
AND fare_office_id = #{fareOfficeId, jdbcType=VARCHAR}
AND booth_id = #{boothId, jdbcType=VARCHAR}
AND PASS_DATE = #{passDate, jdbcType=VARCHAR}
AND work_times = #{passTime, jdbcType=VARCHAR}
AND seqno = #{seqno, jdbcType=INTEGER}
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET X_POSITION = #{xPosition,jdbcType=VARCHAR}
, Y_POSITION = #{yPosition,jdbcType=VARCHAR}
, GARO_LEN = #{hLen,jdbcType=VARCHAR}
, SERO_LEN = #{vLen,jdbcType=VARCHAR}
, update_date = SYSDATE
, updater = #{updater, jdbcType=VARCHAR}
WHERE worker_id = #{workerId, jdbcType=VARCHAR}
AND fare_office_id = #{fareOfficeId, jdbcType=VARCHAR}
AND booth_id = #{boothId, jdbcType=VARCHAR}
AND PASS_DATE = #{passDate, jdbcType=VARCHAR}
AND work_times = #{passTime, jdbcType=VARCHAR}
AND seqno = #{seqno, jdbcType=INTEGER}
</update>
<resultMap type="cfs.fine.vo.FineTransVO" id="findFareTransList-result">
@ -2772,16 +2771,16 @@
</update>
<update id="updateExcemptReason" parameterType="cfs.fine.vo.FineTransVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET READ_RESULT_ID = '01',
EXEMPT_REASON_ID = #{exemptReasonId},
update_date = SYSDATE,
updater = #{updater}
WHERE worker_id = #{workerId,jdbcType=VARCHAR}
AND fare_office_id = #{fareOfficeId,jdbcType=VARCHAR}
AND booth_id = #{boothId,jdbcType=VARCHAR}
AND year|| month||day||work_times = #{workTimes,jdbcType=VARCHAR}
AND seqno = #{seqno,jdbcType=INTEGER}
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET READ_RESULT_ID = '01'
, EXEMPT_REASON_ID = #{exemptReasonId}
, update_date = SYSDATE
, updater = #{updater}
WHERE worker_id = #{workerId,jdbcType=VARCHAR}
AND fare_office_id = #{fareOfficeId,jdbcType=VARCHAR}
AND booth_id = #{boothId,jdbcType=VARCHAR}
AND year|| month||day||work_times = #{workTimes,jdbcType=VARCHAR}
AND seqno = #{seqno,jdbcType=INTEGER}
</update>
<update id="updateMotionIdVerify" parameterType="cfs.fine.vo.FineTransVO">
@ -2831,14 +2830,13 @@
</update>
<update id="updateResidentDate2">
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET resident_date = TO_DATE(#{residentDate}, 'yyyymmdd'),
update_date = SYSDATE,
updater = #{userName}
WHERE year||month||day||work_times = #{workTimes}
AND worker_id = #{workerId} AND fare_office_id = #{fareOfficeId}
AND
booth_id = #{boothId} AND seqno = #{seqno}
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET resident_date = TO_DATE(#{residentDate}, 'yyyymmdd')
, update_date = SYSDATE
, updater = #{userName}
WHERE year||month||day||work_times = #{workTimes}
AND worker_id = #{workerId} AND fare_office_id = #{fareOfficeId}
AND booth_id = #{boothId} AND seqno = #{seqno}
</update>
<update id="updateResidentDate3">
@ -3154,9 +3152,9 @@
</update>
<update id="updateCarsDataKbn" parameterType="cfs.fine.vo.FineTransVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET CARS_DATA_KBN = #{carsDataKbn,jdbcType=VARCHAR}
WHERE WORKER_ID = #{workerId,jdbcType=VARCHAR}
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET CARS_DATA_KBN = #{carsDataKbn,jdbcType=VARCHAR}
WHERE WORKER_ID = #{workerId,jdbcType=VARCHAR}
AND FARE_OFFICE_ID = #{fareOfficeId,jdbcType=VARCHAR}
AND BOOTH_ID = #{boothId,jdbcType=VARCHAR}
AND PASS_DATE = #{passDate,jdbcType=VARCHAR}
@ -3729,14 +3727,14 @@
</update>
<update id="updateFareReadKeyInfo" parameterType="cfs.fine.vo.FineTransVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET OWNER = RTRIM(#{owner,jdbcType=VARCHAR},' '),
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET OWNER = RTRIM(#{owner,jdbcType=VARCHAR},' '),
ENC_RESIDENT_NO = RTRIM(DGUARD.ENCRYPT('ENC','COL',#{residentNo}),' '),
RESIDENT_DATE = to_date(#{residentDate,jdbcType=VARCHAR},'yyyymmdd'),
CAR_TYPE_NAME = RTRIM(#{carTypeName},' '),
UPDATE_DATE = SYSDATE,
UPDATER = RTRIM(#{updater,jdbcType=VARCHAR},' ')
WHERE WORKER_ID = #{workerId,jdbcType=VARCHAR}
WHERE WORKER_ID = #{workerId,jdbcType=VARCHAR}
AND FARE_OFFICE_ID = #{fareOfficeId,jdbcType=VARCHAR}
AND BOOTH_ID = #{boothId,jdbcType=VARCHAR}
AND PASS_DATE = #{passDate,jdbcType=VARCHAR}
@ -4824,12 +4822,12 @@
<update id="updateDefaultFareCarsData" parameterType="cfs.fine.vo.FineTransVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET CARS_DATA_KBN = '1',
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET CARS_DATA_KBN = '1',
RESIDENT_DATE = #{residentDate},
ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo}),
OWNER = replace(#{owner}, chr(10), '')
where worker_id = #{workerId}
where worker_id = #{workerId}
and FARE_OFFICE_ID = #{fareOfficeId}
and BOOTH_ID = #{boothId}
and YEAR = #{year}
@ -4861,7 +4859,8 @@
</update>
<update id="updateDefaultTrans" parameterType="cfs.fine.vo.FineTransVO">
UPDATE DEFAULT_CARS_TRANS_INFO_DAMO SET NOTICE_KBN = #{carsTransLevl}
UPDATE DEFAULT_CARS_TRANS_INFO_DAMO
SET NOTICE_KBN = #{carsTransLevl}
where worker_id = #{workerId}
and fare_office_id = #{fareOfficeId}
and booth_id = #{boothId}
@ -4872,30 +4871,6 @@
and seqno = #{seqno}
</update>
<update id="createDefaultEtax" parameterType="cfs.fine.vo.FineTransVO">
/*createDefaultEtax*/
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET manage_year = #{year}
, MANAGE_NO = (select max(to_number(manage_no)) +1
from default_fare_read_info_damo
where year = #{year}
and manage_year = #{year})
, ETAX_KBN = '1'
, SEND_DATE = SYSDATE
, END_DATE = ( select min(dates)
from T_TCCJ107_M01
where HLDY_CLSS_CD = '0'
and dates >= to_char(to_date(year || month || day, 'YYYYMMDD') +15, 'YYYYMMDD') )
where worker_id = #{workerId}
and fare_office_id = #{fareOfficeId}
and booth_id = #{boothId}
and year = #{year}
and month = #{month}
and day = #{day}
and work_times = #{workTimes}
and seqno = #{seqno}
AND SYS_NOTICE_ID <![CDATA[<>]]> '03'
</update>
<resultMap type="cfs.fine.vo.FineTransVO" id="findCarsSelect-result">
<result property="workerId" column="worker_id" />
@ -4949,9 +4924,9 @@
<update id="updateDefaultFareCarsDataKbn" parameterType="cfs.fine.vo.FineTransVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET CARS_DATA_KBN = '1'
where worker_id = #{workerId}
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET CARS_DATA_KBN = '1'
where worker_id = #{workerId}
and FARE_OFFICE_ID = #{fareOfficeId}
and BOOTH_ID = #{boothId}
and YEAR = #{year}

2
src/main/java/cfs/fine/service/FineTransService.java
Unescape Escape View File

@ -125,7 +125,5 @@ public interface FineTransService {
public void insertDefaultCarInsInfo(List<FineTransVO> param) throws Exception;
public void insertManageNum(List<FineTransVO> param) throws Exception;
}

5
src/main/java/cfs/fine/service/impl/FinePenaltyServiceImpl.java
Unescape Escape View File

@ -3711,10 +3711,7 @@ public class FinePenaltyServiceImpl implements FinePenaltyService {
logger.info("catch check");
e.printStackTrace();
}finally{
/*if(fw != null)
fw.close();
if(bf != null)
bf.close();*/
}
return result;
}

21
src/main/java/cfs/fine/service/impl/FineTransServiceImpl.java
Unescape Escape View File

@ -2043,26 +2043,7 @@ public class FineTransServiceImpl implements FineTransService {
}
}
@Override
public void insertManageNum(List<FineTransVO> paramList) throws Exception {
try{
for(FineTransVO param : paramList){
//manage_year, manage_no 가 이미 있으면 넣으면 안됨 존재여부 확인
FineTransVO manageChk = fineTransDao.findManageChk(param);
if(null == manageChk.getManageYear()){
//update default_fare_read_info
logger.info("MANAGE가 null 입니다");
fineTransDao.createDefaultEtax(param);
}else{
logger.info("manage가 이미 존재합니다"+manageChk.getManageYear());
}
}
}catch(Exception e){
e.printStackTrace();
}
}
@Override
public FineTransVO updateFareNonChkVerify(List<FineTransVO> paramList) throws Exception {

24
src/main/java/cfs/fine/web/FineTransController.java
Unescape Escape View File

@ -1302,29 +1302,7 @@ public class FineTransController {
return result.getResult();
}
/**
* 미납 가상계좌 번호 생성
*
* @param param
* @return
* @throws Exception
*/
@RequestMapping(value="/cfs/fine/insertManageNum.do", method=RequestMethod.POST)
public @ResponseBody Map<String, Object> insertManageNum(@RequestBody List<FineTransVO> param) throws Exception {
Result result = new Result();
try {
fineTransService.insertManageNum(param);
result.setMsg(Result.STATUS_SUCESS, "저장이 완료되었습니다.");
}catch(RuntimeException e) {
result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE);
}catch (Exception ex) {
result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE);
}
return result.getResult();
}
/**
* 차적조회 데이터 저장

9
src/main/java/cfs/income/dao/mapper/IncomeCard_mapper.xml
Unescape Escape View File

@ -1130,8 +1130,9 @@
<insert id="insertCardDefault" parameterType="cfs.income.vo.IncomeParamsVO" >
INSERT INTO DEFAULT_FARE_READ_INFO_DAMO (WORKER_ID,
INSERT
INTO DEFAULT_FARE_READ_INFO_DAMO(
WORKER_ID,
FARE_OFFICE_ID,
BOOTH_ID,
YEAR,
@ -1157,7 +1158,9 @@
UPDATER,
SEND_FLAG,
T_REAL_TIME,
PASS_DATE) ( SELECT WORKER_ID,
PASS_DATE
) (
SELECT WORKER_ID,
FARE_OFFICE_ID,
BOOTH_ID,
YEAR,

269
src/main/java/cfs/input/dao/mapper/InputAfter_mapper.xml
Unescape Escape View File

@ -1830,7 +1830,7 @@ ORDER BY PASS_DATE
</select>
<select id="fineOverIncomeVirtualList" parameterType="cfs.input.vo.InputAfterVO" resultMap="findAfterPay-resultMap">
SELECT A.MANAGE_YEAR,
SELECT A.MANAGE_YEAR,
A.MANAGE_NO,
PASS_DATE,
TO_CHAR(SEND_DATE,'YYYYMMDD') as SEND_DATE,
@ -1848,8 +1848,8 @@ ORDER BY PASS_DATE
</select>
<select id="fineOverIncomeManageList" parameterType="cfs.input.vo.InputAfterVO" resultMap="findAfterPay-resultMap">
SELECT MANAGE_YEAR,
MANAGE_NO
SELECT MANAGE_YEAR
, MANAGE_NO
FROM INCOME_ETAX_INFO
WHERE FARE_OFFICE_ID = #{fareOfficeId}
AND PASS_DATE = #{passDate}
@ -2086,7 +2086,8 @@ ORDER BY PASS_DATE
<update id="updateDefaultRead" parameterType="cfs.input.vo.InputAfterVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO SET READ_RESULT_ID = #{readResultId},
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET READ_RESULT_ID = #{readResultId},
READING_ID = '21',
READ_KBN = '1',
READER = #{sessionUserNm},
@ -2100,7 +2101,7 @@ ORDER BY PASS_DATE
LEVY_AMOUNT = #{levyAmt},
BANK_KBN = #{bankKbn},
OVER_TYPE = #{overType}
WHERE FARE_OFFICE_ID = #{fareOfficeId}
WHERE FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
AND WORKER_ID = #{workerId}
AND SEQNO = #{seqNo}
@ -2145,13 +2146,14 @@ WHEN NOT MATCHED THEN
</insert>
<delete id="deleteEtaxReceipt" parameterType="cfs.input.vo.InputAfterVO">
DELETE FROM
DBUSER_CFS.ETAX_RECEIPT_INFO
WHERE (MANAGE_YEAR,MANAGE_NO,ETAX_KBN) IN( SELECT MANAGE_YEAR, MANAGE_NO,ETAX_KBN
DELETE FROM DBUSER_CFS.ETAX_RECEIPT_INFO
WHERE (MANAGE_YEAR, MANAGE_NO, ETAX_KBN) IN (
SELECT MANAGE_YEAR, MANAGE_NO, ETAX_KBN
FROM DBUSER_CFS.INCOME_ETAX_INFO
WHERE FARE_OFFICE_ID = #{fareOfficeId}
AND PASS_DATE = #{passDate}
AND ETAX_KBN = #{etaxKbn})
AND ETAX_KBN = #{etaxKbn}
)
</delete>
@ -2206,7 +2208,7 @@ WHEN NOT MATCHED THEN
RECEIPT_RESULT_ID ='',
RECEIPT_DATE = '',
RECEIPTER = ''
WHERE FARE_OFFICE_ID = #{fareOfficeId}
WHERE FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
AND WORKER_ID = #{workerId}
AND SEQNO = #{seqNo}
@ -2497,7 +2499,10 @@ WHEN NOT MATCHED THEN
CREATE_DATE,
CREATER,
UPDATE_DATE,
UPDATER) values (#{workerId}, #{fareOfficeId}, #{boothId}, #{year}, #{month}, #{day}, #{year}||#{month}||#{day}, #{workTimes},
UPDATER
)
VALUES (
#{workerId}, #{fareOfficeId}, #{boothId}, #{year}, #{month}, #{day}, #{year}||#{month}||#{day}, #{workTimes},
(select 90000+count(1)
from DEFAULT_FARE_READ_INFO_DAMO
where worker_id = #{workerId}
@ -2527,7 +2532,7 @@ WHEN NOT MATCHED THEN
REMARKS = '면제차량 자진납부',
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserId}
WHERE FARE_OFFICE_ID = #{fareOfficeId}
WHERE FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
AND WORKER_ID = #{workerId}
AND SEQNO = #{seqNo}
@ -3951,12 +3956,13 @@ WHEN NOT MATCHED THEN
</delete>
<update id="updateDefaultReadSysNoticeEgreen" parameterType="cfs.input.vo.InputAfterVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO SET SYS_NOTICE_ID = #{sysNoticeId},
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET SYS_NOTICE_ID = #{sysNoticeId},
EGREEN_SEND_DATE = TO_CHAR(SYSDATE,'YYYYMMDD'),
EGREEN_SEND_TIME = TO_CHAR(SYSDATE,'HH24MISS'),
NOTICE_DATE = SYSDATE,
NOTICE_ID = '21'
WHERE WORKER_ID = #{workerId}
WHERE WORKER_ID = #{workerId}
AND FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
AND YEAR = #{year}
@ -3967,11 +3973,12 @@ WHEN NOT MATCHED THEN
</update>
<update id="updateDefaultReadSysNoticeEgreenTemp" parameterType="cfs.input.vo.InputAfterVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO SET SYS_NOTICE_ID = #{sysNoticeId},
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET SYS_NOTICE_ID = #{sysNoticeId},
NOTICE_DATE = SYSDATE,
EGREEN_PRINT_DATE = SYSDATE,
NOTICE_ID = '21'
WHERE WORKER_ID = #{workerId}
WHERE WORKER_ID = #{workerId}
AND FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
AND YEAR = #{year}
@ -3982,12 +3989,13 @@ WHEN NOT MATCHED THEN
</update>
<update id="updateMobiDel" parameterType="cfs.input.vo.InputAfterVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO SET MOBILE_RESULT_ID = '00',
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET MOBILE_RESULT_ID = '00',
MOBILE_SEND_DATE = '',
MOBILE_CHECK_DATE = '',
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserId}
WHERE WORKER_ID = #{workerId}
WHERE WORKER_ID = #{workerId}
AND FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
AND YEAR = #{year}
@ -3998,12 +4006,13 @@ WHEN NOT MATCHED THEN
</update>
<update id="updatePostDtl" parameterType="cfs.input.vo.InputAfterVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO SET POST_NO = #{postNo},
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET POST_NO = #{postNo},
ADDRESS_NAME = #{addressName},
ADDRESS_NUMBER = #{addressNumber},
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserId}
WHERE WORKER_ID = #{workerId}
WHERE WORKER_ID = #{workerId}
AND FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
AND YEAR = #{year}
@ -4014,13 +4023,14 @@ WHEN NOT MATCHED THEN
</update>
<update id="updateDefaultCarsChg" parameterType="cfs.input.vo.InputAfterVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO SET CAR_TYPE_NAME = trim(#{carTypeNm}),
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET CAR_TYPE_NAME = trim(#{carTypeNm}),
OWNER = trim(#{owner}),
mini_car_kbn = #{miniCarKbn},
LEVY_AMOUNT = #{levyAmt},
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserId}
WHERE WORKER_ID = #{workerId}
WHERE WORKER_ID = #{workerId}
AND FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
AND YEAR = #{year}
@ -4031,12 +4041,13 @@ WHEN NOT MATCHED THEN
</update>
<update id="updateDefaultEgreen" parameterType="cfs.input.vo.InputAfterVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO SET EGREEN_SEND_DATE = TO_CHAR(SYSDATE,'YYYYMMDD'),
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET EGREEN_SEND_DATE = TO_CHAR(SYSDATE,'YYYYMMDD'),
EGREEN_SEND_TIME = TO_CHAR(SYSDATE,'HH24MISS'),
DEVIBRSLTCD = '01',
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserId}
WHERE WORKER_ID = #{workerId}
WHERE WORKER_ID = #{workerId}
AND FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
AND YEAR = #{year}
@ -4063,10 +4074,11 @@ WHEN NOT MATCHED THEN
</update>
<update id="updateEgreenNonImage" parameterType="cfs.input.vo.InputAfterVO">
UPDATE DEFAULT_FARE_READ_INFO_DAMO SET NO_IMAGE = 1,
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET NO_IMAGE = 1,
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserNm}
WHERE WORKER_ID = #{workerId}
WHERE WORKER_ID = #{workerId}
AND FARE_OFFICE_ID = #{fareOfficeId}
AND BOOTH_ID = #{boothId}
AND YEAR = #{year}
@ -4077,33 +4089,31 @@ WHEN NOT MATCHED THEN
</update>
<update id="updateCardIncomeEtax" parameterType="cfs.input.vo.InputAfterVO">
MERGE INTO INCOME_ETAX_INFO
MERGE INTO INCOME_ETAX_INFO
USING dual
ON (FARE_OFFICE_ID = #{fareOfficeId}
and PASS_DATE = #{passDate}
and etax_kbn = #{etaxKbn})
WHEN MATCHED THEN
WHEN MATCHED THEN
UPDATE SET ETAX_AMT = #{cardM},
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserNm}
WHEN NOT MATCHED THEN
WHEN NOT MATCHED THEN
INSERT (FARE_OFFICE_ID, PASS_DATE, ETAX_KBN, MANAGE_YEAR, MANAGE_NO, YEAR, MONTH, DAY, ETAX_AMT, CREATE_DATE, CREATER, UPDATE_DATE, UPDATER)
values(#{fareOfficeId}, #{passDate}, '2', TO_CHAR(SYSDATE,'YYYY'), (SELECT NVL(MAX(MANAGE_NO),0)+1 FROM INCOME_ETAX_INFO WHERE MANAGE_YEAR = TO_CHAR(SYSDATE,'YYYY') AND etax_kbn = #{etaxKbn})
, #{year}, #{month}, #{day}, #{cardM},SYSDATE, #{sessionUserNm}, SYSDATE, #{sessionUserNm})
</update>
<update id="updateOverRfIncomeEtax" parameterType="cfs.input.vo.InputAfterVO">
MERGE INTO INCOME_ETAX_INFO
USING dual
ON (PASS_DATE = #{passDate}
and etax_kbn = #{etaxKbn})
WHEN MATCHED THEN
UPDATE SET ETAX_AMT = #{etaxAmt},
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserNm}
WHEN NOT MATCHED THEN
MERGE INTO INCOME_ETAX_INFO
USING dual ON (PASS_DATE = #{passDate} and etax_kbn = #{etaxKbn})
WHEN MATCHED THEN
UPDATE SET ETAX_AMT = #{etaxAmt}
, UPDATE_DATE = SYSDATE
, UPDATER = #{sessionUserNm}
WHEN NOT MATCHED THEN
INSERT (FARE_OFFICE_ID, PASS_DATE, ETAX_KBN, MANAGE_YEAR, MANAGE_NO, YEAR, MONTH, DAY, ETAX_AMT, CREATE_DATE, CREATER, UPDATE_DATE, UPDATER)
values(#{fareOfficeId}, #{passDate}, '5', #{manageYear}, #{manageNo}
values (#{fareOfficeId}, #{passDate}, '5', #{manageYear}, #{manageNo}
, #{year}, #{month}, #{day}, #{etaxAmt}, SYSDATE, #{sessionUserNm}, SYSDATE, #{sessionUserNm})
</update>
@ -4179,11 +4189,16 @@ WHEN NOT MATCHED THEN
</update>
<update id="updateIncomeFareEtax" parameterType="cfs.input.vo.InputAfterVO">
MERGE INTO ETAX_FARE_INFO USING dual ON (PASS_DATE = #{passDate} ) WHEN MATCHED THEN UPDATE SET CITY_TAXES_COUNT = #{cityTaxesCount},
CITY_TAXES_AMONT = #{cityTaxesAmont},
ETAX_YN = '1',
update_date = sysdate,
updater = #{sessionUserNm} WHEN NOT MATCHED THEN INSERT (PASS_DATE,
MERGE INTO ETAX_FARE_INFO
USING dual ON (PASS_DATE = #{passDate} )
WHEN MATCHED THEN
UPDATE SET CITY_TAXES_COUNT = #{cityTaxesCount}
, CITY_TAXES_AMONT = #{cityTaxesAmont}
, ETAX_YN = '1'
, update_date = sysdate
, updater = #{sessionUserNm}
WHEN NOT MATCHED THEN
INSERT (PASS_DATE,
YEAR,
MONTH,
CITY_TAXES_COUNT,
@ -4324,19 +4339,18 @@ WHEN NOT MATCHED THEN
</update>
<update id="updateIncomeReceiptInfo" parameterType="cfs.input.vo.InputAfterVO">
MERGE INTO
ETAX_FARE_INFO USING dual ON (PASS_DATE = #{passDate})
WHEN MATCHED THEN UPDATE SET
CITY_TAXES_COUNT = #{cityTaxesCount},
CITY_TAXES_AMONT = #{cityTaxesAmont},
ACC_CNT = #{accCnt},
ACC_AMT = #{accAmt},
REMARKS = #{remarks},
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserNm}
WHEN NOT MATCHED THEN
INSERT
(PASS_DATE,
MERGE INTO ETAX_FARE_INFO
USING dual ON (PASS_DATE = #{passDate})
WHEN MATCHED THEN
UPDATE SET CITY_TAXES_COUNT = #{cityTaxesCount}
, CITY_TAXES_AMONT = #{cityTaxesAmont}
, ACC_CNT = #{accCnt}
, ACC_AMT = #{accAmt}
, REMARKS = #{remarks}
, UPDATE_DATE = SYSDATE
, UPDATER = #{sessionUserNm}
WHEN NOT MATCHED THEN
INSERT (PASS_DATE,
YEAR,
MONTH,
CITY_TAXES_COUNT,
@ -4350,8 +4364,9 @@ WHEN NOT MATCHED THEN
UPDATER,
MANAGE_YEAR,
MANAGE_NO,
ETAX_KBN)
VALUES(#{passDate},
ETAX_KBN
)
VALUES (#{passDate},
#{year},
#{month},
#{cityTaxesCount},
@ -4436,14 +4451,19 @@ WHEN NOT MATCHED THEN
</update>
<update id="updateEtaxFareIncomeMainOver" parameterType="cfs.input.vo.InputAfterVO">
MERGE INTO ETAX_FARE_INFO USING dual ON (PASS_DATE = #{passDate}) WHEN MATCHED THEN UPDATE SET ENDAFT_CNT = #{endaftCnt},
MERGE INTO ETAX_FARE_INFO
USING dual ON (PASS_DATE = #{passDate})
WHEN MATCHED THEN
UPDATE SET ENDAFT_CNT = #{endaftCnt},
ENDAFT_AMT = #{endaftAmt},
MIS_CNT = #{misCnt},
MIS_AMT = #{misAmt},
UNCONF_CNT = #{unconfCnt},
UNCONF_AMT = #{unconfAmt},
UPDATE_DATE = SYSDATE,
UPDATER = #{sessionUserNm} WHEN NOT MATCHED THEN INSERT (PASS_DATE,
UPDATER = #{sessionUserNm}
WHEN NOT MATCHED THEN
INSERT (PASS_DATE,
YEAR,
MONTH,
ENDAFT_CNT,
@ -4552,21 +4572,21 @@ WHEN NOT MATCHED THEN
</update>
<update id="updateCardIncomeEtaxAcc" parameterType="cfs.input.vo.InputAfterVO">
UPDATE INCOME_ETAX_INFO SET
ACCOUNTNOW_CHG = FN_ETAX_VIRTUALACCOUNT('1',MANAGE_YEAR,MANAGE_NO,2)
, ACCOUNTNOS_CHG = FN_ETAX_VIRTUALACCOUNT('2',MANAGE_YEAR,MANAGE_NO,2)
, ACCOUNTNOH_CHG = FN_ETAX_VIRTUALACCOUNT('3',MANAGE_YEAR,MANAGE_NO,2)
WHERE FARE_OFFICE_ID = #{fareOfficeId}
and PASS_DATE = #{passDate}
and etax_kbn = #{etaxKbn}
UPDATE INCOME_ETAX_INFO
SET ACCOUNTNOW_CHG = FN_ETAX_VIRTUALACCOUNT('1',MANAGE_YEAR,MANAGE_NO,2)
, ACCOUNTNOS_CHG = FN_ETAX_VIRTUALACCOUNT('2',MANAGE_YEAR,MANAGE_NO,2)
, ACCOUNTNOH_CHG = FN_ETAX_VIRTUALACCOUNT('3',MANAGE_YEAR,MANAGE_NO,2)
WHERE FARE_OFFICE_ID = #{fareOfficeId}
and PASS_DATE = #{passDate}
and etax_kbn = #{etaxKbn}
</update>
<update id="updatePrpEtaxAcc" parameterType="cfs.input.vo.InputAfterVO">
UPDATE ETAX_FARE_INFO SET
ACCOUNTNOW_CHG = FN_ETAX_VIRTUALACCOUNT('1',MANAGE_YEAR,MANAGE_NO,'4')
, ACCOUNTNOS_CHG = FN_ETAX_VIRTUALACCOUNT('2',MANAGE_YEAR,MANAGE_NO,'4')
, ACCOUNTNOH_CHG = FN_ETAX_VIRTUALACCOUNT('3',MANAGE_YEAR,MANAGE_NO,'4')
WHERE PASS_DATE = #{passDate}
UPDATE ETAX_FARE_INFO
SET ACCOUNTNOW_CHG = FN_ETAX_VIRTUALACCOUNT('1',MANAGE_YEAR,MANAGE_NO,'4')
, ACCOUNTNOS_CHG = FN_ETAX_VIRTUALACCOUNT('2',MANAGE_YEAR,MANAGE_NO,'4')
, ACCOUNTNOH_CHG = FN_ETAX_VIRTUALACCOUNT('3',MANAGE_YEAR,MANAGE_NO,'4')
WHERE PASS_DATE = #{passDate}
</update>
<update id="updateVirtualaccount" parameterType="cfs.input.vo.InputAfterVO">
@ -4580,30 +4600,30 @@ WHEN NOT MATCHED THEN
<!-- 가상계좌 이중 발급 수정 -->
<update id="updateVirtualDue" parameterType="cfs.fine.vo.PenaltyParamVO" >
/*updateVirtualDue*/
UPDATE ETAX_VIRTUALACCOUNT
SET USEDTAG = '0',
MANAGE_YEAR = '',
MANAGE_NO = '',
SEND_DATE = '',
DELIVERY_DATE = ''
WHERE (SERIALNO, MANAGE_YEAR, MANAGE_NO) IN
(SELECT MAX(SERIALNO) AS SERIALNO,
MANAGE_YEAR ,
MANAGE_NO
FROM ETAX_VIRTUALACCOUNT
WHERE
MANAGE_YEAR IS NOT NULL
AND MANAGE_NO IS NOT NULL
GROUP BY
MANAGE_YEAR ,
MANAGE_NO
HAVING
count(1) >1)
/*updateVirtualDue*/
UPDATE ETAX_VIRTUALACCOUNT
SET USEDTAG = '0'
, MANAGE_YEAR = ''
, MANAGE_NO = ''
, SEND_DATE = ''
, DELIVERY_DATE = ''
WHERE (SERIALNO, MANAGE_YEAR, MANAGE_NO) IN
(
SELECT MAX(SERIALNO) AS SERIALNO
, MANAGE_YEAR
, MANAGE_NO
FROM ETAX_VIRTUALACCOUNT
WHERE MANAGE_YEAR IS NOT NULL
AND MANAGE_NO IS NOT NULL
GROUP BY MANAGE_YEAR
, MANAGE_NO
HAVING count(1) > 1
)
</update>
<update id="updateCardIncomeAdd" parameterType="cfs.input.vo.InputAfterVO">
UPDATE INCOME_ETAX_INFO SET BANK_KBN = #{bankKbn},
UPDATE INCOME_ETAX_INFO
SET BANK_KBN = #{bankKbn},
SEND_YN = 1,
ETAX_PAY_DATE = #{etaxPayDate},
CITY_TAXES_COUNT = #{cityTaxesCount},
@ -4617,14 +4637,19 @@ WHEN NOT MATCHED THEN
</update>
<update id="insertCashIncomeAdd" parameterType="cfs.input.vo.InputAfterVO">
MERGE INTO INCOME_ETAX_INFO USING dual ON (FARE_OFFICE_ID = #{fareOfficeId}
MERGE INTO INCOME_ETAX_INFO
USING dual ON (FARE_OFFICE_ID = #{fareOfficeId}
and PASS_DATE = #{passDate}
and etax_kbn = #{etaxKbn}) WHEN MATCHED THEN update set CITY_TAXES_COUNT = #{cityTaxesCount},
and etax_kbn = #{etaxKbn})
WHEN MATCHED THEN
update set CITY_TAXES_COUNT = #{cityTaxesCount},
CITY_TAXES_AMONT = #{cityTaxesAmont},
ETAX_PAY_DATE = #{etaxPayDate},
REMARKS = #{remarks},
update_date = sysdate,
updater = #{sessionUserNm} WHEN NOT MATCHED THEN insert (FARE_OFFICE_ID,
updater = #{sessionUserNm}
WHEN NOT MATCHED THEN
insert (FARE_OFFICE_ID,
PASS_DATE,
ETAX_KBN,
MANAGE_YEAR,
@ -4749,9 +4774,9 @@ WHEN NOT MATCHED THEN
</update>
<delete id="deleteEtaxReceiptFare" parameterType="cfs.input.vo.InputAfterVO">
DELETE FROM
DBUSER_CFS.ETAX_RECEIPT_INFO
WHERE (MANAGE_YEAR,MANAGE_NO,ETAX_KBN) IN( SELECT MANAGE_YEAR, MANAGE_NO,ETAX_KBN
DELETE FROM DBUSER_CFS.ETAX_RECEIPT_INFO
WHERE (MANAGE_YEAR, MANAGE_NO, ETAX_KBN) IN (
SELECT MANAGE_YEAR, MANAGE_NO, ETAX_KBN
FROM DBUSER_CFS.ETAX_FARE_INFO
WHERE PASS_DATE = #{passDate}
AND ETAX_KBN = #{etaxKbn})
@ -4952,15 +4977,15 @@ WHEN NOT MATCHED THEN
</delete>
<select id="fineFareEtaxManageList" parameterType="cfs.input.vo.InputAfterVO" resultMap="findAfterPay-resultMap">
SELECT MANAGE_YEAR,
MANAGE_NO
FROM ETAX_FARE_INFO
WHERE PASS_DATE = #{passDate}
AND ETAX_KBN = #{etaxKbn}
SELECT MANAGE_YEAR
, MANAGE_NO
FROM ETAX_FARE_INFO
WHERE PASS_DATE = #{passDate}
AND ETAX_KBN = #{etaxKbn}
</select>
<select id="fineIncomeFareEtaxVirtualList" parameterType="cfs.input.vo.InputAfterVO" resultMap="findAfterPay-resultMap">
SELECT A.MANAGE_YEAR,
SELECT A.MANAGE_YEAR,
A.MANAGE_NO,
PASS_DATE,
TO_CHAR(B.SEND_DATE,'YYYYMMDD') as SEND_DATE,
@ -5125,9 +5150,8 @@ WHEN NOT MATCHED THEN
</select>
<select id="finePenaltyOverRfList" parameterType="cfs.input.vo.InputAfterVO" resultMap="findAfterPay-resultMap">
/* finePenaltyOverRfList*/
SELECT
#{year} AS MANAGE_YEAR,
/* finePenaltyOverRfList*/
SELECT #{year} AS MANAGE_YEAR,
#{month} as MANAGE_NO,
DECODE(NVL(A.FARE_OFFICE_ID,'1'),'1','계',TO_NUMBER(A.FARE_OFFICE_ID)|| '호') AS FARE_OFFICE_ID,
NVL(SUM(B.OVER_CNT),0) AS OVER_CNT,
@ -5202,18 +5226,23 @@ WHEN NOT MATCHED THEN
ETAX_KBN = NULL,
PAYMENTDAY = NULL,
MODDATE = SYSDATE
WHERE SERIALNO = ( SELECT MAX(SERIALNO) FROM ETAX_VIRTUALACCOUNT WHERE (MANAGE_YEAR,MANAGE_NO,ETAX_KBN) IN (
WHERE SERIALNO = ( SELECT MAX(SERIALNO)
FROM ETAX_VIRTUALACCOUNT
WHERE (MANAGE_YEAR,MANAGE_NO,ETAX_KBN) IN (
SELECT MANAGE_YEAR,MANAGE_NO,ETAX_KBN
FROM ( SELECT MANAGE_YEAR,
MANAGE_NO
FROM DBUSER_CFS.ETAX_VIRTUALACCOUNT
WHERE MANAGE_YEAR IS NOT NULL
AND ETAX_KBN = '1'
GROUP BY MANAGE_YEAR,
MANAGE_NO,
ETAX_KBN
HAVING COUNT(1) >1)) )
AND USEDTAG = '1'
FROM ( SELECT MANAGE_YEAR
, MANAGE_NO
FROM DBUSER_CFS.ETAX_VIRTUALACCOUNT
WHERE MANAGE_YEAR IS NOT NULL
AND ETAX_KBN = '1'
GROUP BY MANAGE_YEAR,
MANAGE_NO,
ETAX_KBN
HAVING COUNT(1) >1
)
)
)
AND USEDTAG = '1'
</update>

49
src/main/java/cfs/input/dao/mapper/WorkerFareAdjust_mapper.xml
Unescape Escape View File

@ -2236,22 +2236,21 @@
</resultMap>
<select id="findPrpSendFlagCheck" parameterType="cfs.input.vo.WorkerFareAdjustVO" resultMap="findPrpSendFlagCheck-resultMap">
select zoop_yn,
prp_kbn,
send_flag
from fare_terminal_info
where send_flag not in '9'
and prp_kbn in('0','3')
AND zoop_yn in ('3','4')
and worker_id = #{workerId}
and fare_office_id = #{fareOfficeId}
and booth_id = #{boothId}
and year = #{year}
and month = #{month}
and day = #{day}
and work_times between #{workSttTime}
and #{workEndTime}
FOR UPDATE
SELECT zoop_yn
, prp_kbn
, send_flag
FROM fare_terminal_info
WHERE send_flag not in '9'
AND prp_kbn in('0','3')
AND zoop_yn in ('3','4')
AND worker_id = #{workerId}
AND fare_office_id = #{fareOfficeId}
AND booth_id = #{boothId}
AND year = #{year}
AND month = #{month}
AND day = #{day}
AND work_times between #{workSttTime} AND #{workEndTime}
FOR UPDATE
</select>
<update id="updateFareAdjustPrpKbn" parameterType="cfs.input.vo.WorkerFareAdjustVO" >
@ -2365,15 +2364,15 @@
</insert>
<delete id="deleteDefaultFareReadInfo" parameterType="cfs.input.vo.WorkerFareTerminalInfoVO">
DELETE DEFAULT_FARE_READ_INFO_DAMO
WHERE WORKER_ID = #{workerId}
AND FARE_OFFICE_ID= #{fareOfficeId}
AND BOOTH_ID= #{boothId}
AND YEAR= #{year}
AND MONTH= #{month}
AND DAY= #{day}
AND WORK_TIMES= #{workTimes}
AND SEQNO = #{seqNo}
DELETE DEFAULT_FARE_READ_INFO_DAMO
WHERE WORKER_ID = #{workerId}
AND FARE_OFFICE_ID= #{fareOfficeId}
AND BOOTH_ID= #{boothId}
AND YEAR= #{year}
AND MONTH= #{month}
AND DAY= #{day}
AND WORK_TIMES= #{workTimes}
AND SEQNO = #{seqNo}
</delete>
<select id="selectWorkerFareTerminalInfoCollectTypeCheck" parameterType="cfs.input.vo.WorkerFareTerminalInfoVO" resultType = "java.util.Map">

6
src/main/java/cfs/schd/ExemptCarInfo.java
Unescape Escape View File

@ -19,13 +19,14 @@ import org.springframework.stereotype.Component;
import cfs.common.service.CfsCommonService;
import cfs.common.util.CallWebService;
import cfs.common.util.ResultSmartPlatform;
import cfs.schd.dao.SchdDao;
import cfs.trsmrcv.service.CommSmartPlatformPRPService;
@Component("exemptCarInfo")
public class ExemptCarInfo {
protected Logger logger = LoggerFactory.getLogger(this.getClass());
@Resource(name="cfsCommonService")
private CfsCommonService cfsCommonService;
@ -149,6 +150,7 @@ public class ExemptCarInfo {
}
public boolean getRdcxptInfoNtttnVhcle(String lastDigit) {
ResultSmartPlatform result = new ResultSmartPlatform();
List<Map<String, Object>> ntttnList = new ArrayList<Map<String,Object>>();
@ -253,7 +255,7 @@ public class ExemptCarInfo {
}
try {
//장애인 테스트 데이터 추출
Map<String,String> map = new HashMap<String,String>();
map.put("digit", lastDigit);
dspsnList = commSmartPlatformPRPService.exemptDspsn(map);

2
src/main/java/cfs/trsmrcv/dao/CommSmartPlatformFISDao.java
Unescape Escape View File

@ -30,7 +30,9 @@ public interface CommSmartPlatformFISDao {
public Map<String, Object> selectCarsInfoChgChk(Map<String, String> param);
public String getMaxDefManageNum(Map<String, String> param);
public int updateDefManageNum(Map<String, String> param);
public int updateMaxDefManageNum(Map<String, String> param);
// 모바일고지내역 추가
public int insertMobileNotification(Map<String, String> param);

53
src/main/java/cfs/trsmrcv/dao/mapper/CommSmartPlatformFIS_mapper.xml
Unescape Escape View File

@ -204,9 +204,10 @@
</insert>
<update id="updateDefCodeinfo" parameterType="hashmap">
/*updateDefCodeinfo 차적 상태값 변경*/
UPDATE DEFAULT_FARE_READ_INFO_DAMO SET SYS_NOTICE_ID = #{sysNoticeId}
WHERE WORKER_ID = #{workerId}
/*updateDefCodeinfo 차적 상태값 변경*/
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET SYS_NOTICE_ID = #{sysNoticeId}
WHERE WORKER_ID = #{workerId}
and FARE_OFFICE_ID = #{fareOfficeId}
and BOOTH_ID = #{boothId}
and year = #{year}
@ -377,14 +378,19 @@
AND ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{mberSeNo})
</select>
<select id="getMaxDefManageNum" parameterType="hashmap" resultType="string">
SELECT MANAGE_NO
FROM TB_CFS_YEAR_NUMBERING
WHERE MANAGE_NM = 'DEFAULT_FARE_READ_INFO_DAMO'
AND MANAGE_YEAR = #{year}
FOR UPDATE
</select>
<update id="updateDefManageNum" parameterType="hashmap">
/*updateDefManageNum 관리번호 생성*/
UPDATE DEFAULT_FARE_READ_INFO_DAMO
SET manage_year = #{year}
, MANAGE_NO = (select max(to_number(NVL(manage_no,0))) +1
from default_fare_read_info_damo
where year = #{year}
and manage_year = #{year})
SET MANAGE_YEAR = #{year}
, MANAGE_NO = #{manageNo}
, ETAX_KBN = '1'
, SEND_DATE = SYSDATE
, END_DATE = ( select min(dates)
@ -401,6 +407,13 @@
and seqno = #{seqno}
</update>
<update id="updateMaxDefManageNum" parameterType="hashmap">
UPDATE TB_CFS_YEAR_NUMBERING
SET MANAGE_NO = MANAGE_NO + 1
WHERE MANAGE_NM = 'DEFAULT_FARE_READ_INFO_DAMO'
AND MANAGE_YEAR = #{year}
</update>
<insert id="insertMobileNotification" parameterType="hashmap">
/* 모바일고지내역 추가 */
insert into TB_CFS_MOBI_NOTI (
@ -875,18 +888,17 @@
<select id="selectManageChk" parameterType="hashmap" resultType="hashmap">
/* 관리번호 조회 */
select MANAGE_YEAR as manageYear
, MANAGE_NO as manageNo
from DEFAULT_FARE_READ_INFO_DAMO
where worker_id = #{workerId}
and fare_office_id = #{fareOfficeId}
and booth_id = #{boothId}
and year = #{year}
and month = #{month}
and day = #{day}
and work_times = #{workTimes}
and seqno = #{seqno}
SELECT MANAGE_YEAR AS manageYear
, MANAGE_NO AS manageNo
FROM DEFAULT_FARE_READ_INFO_DAMO
WHERE worker_id = #{workerId}
AND fare_office_id = #{fareOfficeId}
AND booth_id = #{boothId}
AND year = #{year}
AND month = #{month}
AND day = #{day}
AND work_times = #{workTimes}
AND seqno = #{seqno}
</select>
<select id="selectSeizureInfoList" parameterType="hashmap" resultType="hashmap">
@ -1021,7 +1033,6 @@
</set>
where SEIZURE_MANAGE_YEAR = #{seizureManageYear, jdbcType=VARCHAR}
and SEIZURE_MANAGE_NO = to_number(#{seizureManageNo, jdbcType=VARCHAR})
<!-- and SEIZR_MANAGE_NO = #{seizrManageNo, jdbcType=VARCHAR} -->
</update>
<insert id="insertSeizureInfo" parameterType="hashmap">

7
src/main/java/cfs/trsmrcv/dao/mapper/CommSmartPlatformPRP_mapper.xml
Unescape Escape View File

@ -491,9 +491,8 @@ SELECT FUN_GET_GREEN_TUNNEL_NM(#{FARE_OFFICE_ID}) as insttNo
</select>
<update id="updateDefaultFare" parameterType="hashmap">
/* 후납 사전등록 수납 처리 결과 수정 */
update DEFAULT_FARE_READ_INFO_DAMO
/* 후납 사전등록 수납 처리 결과 수정 */
update DEFAULT_FARE_READ_INFO_DAMO
<set>
REMARKS = FUN_ATTACH_REMARKS(REMARKS,'인식 차량번호 수정','바로녹색결제수납(' || to_char(SYSDATE, 'YY.MM.DD') || ')')
, READ_RESULT_ID = '60'
@ -507,7 +506,7 @@ SELECT FUN_GET_GREEN_TUNNEL_NM(#{FARE_OFFICE_ID}) as insttNo
, UPDATER = #{WORKER}
, UPDATE_DATE = SYSDATE
</set>
WHERE WORKER_ID = #{WORKER_ID}
WHERE WORKER_ID = #{WORKER_ID}
AND FARE_OFFICE_ID = #{FARE_OFFICE_ID}
AND BOOTH_ID = #{BOOTH_ID}
AND YEAR = #{YEAR}

5
src/main/java/cfs/trsmrcv/service/impl/CommSmartPlatformFISServiceImpl.java
Unescape Escape View File

@ -951,7 +951,10 @@ public class CommSmartPlatformFISServiceImpl implements CommSmartPlatformFISServ
}
@Override
public int updateDefManageNum(Map<String, String> param) throws Exception {
return commSmartPlatformFISDao.updateDefManageNum(param);
String manageNo = commSmartPlatformFISDao.getMaxDefManageNum(param);
param.put("manageNo", manageNo);
commSmartPlatformFISDao.updateDefManageNum(param);
return commSmartPlatformFISDao.updateMaxDefManageNum(param);
}
@Override
public int insertMobileNotification(Map<String, String> param) throws Exception {

1
src/main/java/cfs/trsmrcv/web/CommSmartPlatformPRPController.java
Unescape Escape View File

@ -20,7 +20,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

1
src/main/java/cfs/trsmrcv/web/CommWebBrowserController.java
Unescape Escape View File

@ -1048,7 +1048,6 @@ public class CommWebBrowserController {
* 원금고지 차적조회
* <pre></pre>
*/
@Transactional
@RequestMapping(value="/cfs/trsmrcv/callNonpayCarInfoList.do", method=RequestMethod.POST)
public @ResponseBody Map<String, Object> callNonpayCarInfoList(@RequestBody List<Map<String, String>> paramList, HttpServletRequest request) throws Exception {
System.out.println("차적조회 찾기 1");

Write Preview
Loading…
Cancel
Save