1. 수기 수납 등록 수정.

2. 리스트 조회시 정렬 추가.
main
jjh 12 months ago
parent 9a07507d6f
commit f3d3f21302

@ -52,6 +52,13 @@ public class CrdnReRegBean extends AbstractComponent {
* @return
*/
public List<DataObject> getCrdnReRegList(LevyExclQuery req) {
if (req.getDelYn() == null) {
req.setDelYn("N");
}
if (req.getOrderBy() == null) {
req.setOrderBy("REG_DT");
}
return crdnReRegMapper.selectCrdnReRegList(req);
}
@ -61,7 +68,7 @@ public class CrdnReRegBean extends AbstractComponent {
*/
public List<DataObject> getCrdnReRegs(LevyExclQuery req) {
if (req.getOrderBy() == null) {
req.setOrderBy("CRR.REG_DT DESC, CRR.RE_REG_ID DESC");
req.setOrderBy("CRR.RE_REG_ID DESC");
}
return crdnReRegMapper.selectCrdnReRegs(req);

@ -41,6 +41,13 @@ public class LevyExclBean extends AbstractComponent {
* @return
*/
public List<DataObject> getLevyExclList(LevyExclQuery req) {
if (req.getDelYn() == null) {
req.setDelYn("N");
}
if (req.getOrderBy() == null) {
req.setOrderBy("REG_DT");
}
return levyExclMapper.selectLevyExclList(req);
}
@ -50,7 +57,7 @@ public class LevyExclBean extends AbstractComponent {
*/
public List<DataObject> getLevyExcls(LevyExclQuery req) {
if (req.getOrderBy() == null) {
req.setOrderBy("LE.REG_DT");
req.setOrderBy("LE.LEVY_EXCL_ID DESC");
}
return levyExclMapper.selectLevyExcls(req);

@ -55,6 +55,13 @@ public class OpnnSbmsnBean extends AbstractComponent {
* @return
*/
public List<DataObject> getOpnnSbmsnList(LevyExclQuery req) {
if (req.getDelYn() == null) {
req.setDelYn("N");
}
if (req.getOrderBy() == null) {
req.setOrderBy("REG_DT");
}
return opnnSbmsnMapper.selectOpnnSbmsnList(req);
}
@ -64,7 +71,7 @@ public class OpnnSbmsnBean extends AbstractComponent {
*/
public List<DataObject> getOpnnSbmsns(LevyExclQuery req) {
if (req.getOrderBy() == null) {
req.setOrderBy("OS.REG_DT DESC, OS.OPNN_ID DESC");
req.setOrderBy("OS.OPNN_ID DESC");
}
return opnnSbmsnMapper.selectOpnnSbmsns(req);
@ -84,7 +91,7 @@ public class OpnnSbmsnBean extends AbstractComponent {
*/
public List<DataObject> getOpnnSbmsnDlbrDecsns(LevyExclQuery req) {
if (req.getOrderBy() == null) {
req.setOrderBy("OS.REG_DT DESC, OS.OPNN_ID DESC");
req.setOrderBy("OS.OPNN_ID DESC");
}
return opnnSbmsnMapper.selectOpnnSbmsnDlbrDecsns(req);

@ -41,6 +41,13 @@ public class LevyBean extends AbstractComponent {
* @return
*/
public List<DataObject> getRductLevyTrgtList(LevyQuery req) {
if (req.getDelYn() == null) {
req.setDelYn("N");
}
if (req.getOrderBy() == null) {
req.setOrderBy("REG_DT");
}
return levyMapper.selectRductLevyTrgtList(req);
}
@ -49,6 +56,13 @@ public class LevyBean extends AbstractComponent {
* @return
*/
public List<DataObject> getLevyList(LevyQuery req) {
if (req.getDelYn() == null) {
req.setDelYn("N");
}
if (req.getOrderBy() == null) {
req.setOrderBy("REG_DT");
}
return levyMapper.selectLevyList(req);
}
@ -57,6 +71,10 @@ public class LevyBean extends AbstractComponent {
* @return
*/
public List<DataObject> getLevys(LevyQuery req) {
if (req.getOrderBy() == null) {
req.setOrderBy("L.LEVY_ID DESC");
}
return levyMapper.selectLevys(req);
}

@ -40,6 +40,9 @@ public class RductBean extends AbstractComponent {
* @return
*/
public List<DataObject> getRductList(LevyQuery req) {
if (req.getDelYn() == null) {
req.setDelYn("N");
}
if (req.getOrderBy() == null) {
req.setOrderBy("REG_DT");
}
@ -53,7 +56,7 @@ public class RductBean extends AbstractComponent {
*/
public List<DataObject> getRducts(LevyQuery req) {
if (req.getOrderBy() == null) {
req.setOrderBy("R.REG_DT DESC, R.RDUCT_ID DESC");
req.setOrderBy("R.RDUCT_ID DESC");
}
return rductMapper.selectRducts(req);

@ -50,7 +50,7 @@ public class RcvmtBean extends AbstractComponent {
req.setDelYn("N");
}
if (req.getOrderBy() == null) {
req.setOrderBy("RCVMT_ID");
req.setOrderBy("REG_DT");
}
return rcvmtMapper.selectRcvmtList(req);
@ -61,6 +61,10 @@ public class RcvmtBean extends AbstractComponent {
* @return
*/
public List<DataObject> getRcvmts(RcvmtQuery req) {
if (req.getOrderBy() == null) {
req.setOrderBy("R.RCVMT_ID DESC");
}
return rcvmtMapper.selectRcvmts(req);
}

@ -147,24 +147,24 @@
LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_ID = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N')
LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID)
LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N')
WHERE C.SGG_CD = #{sggCd} /* 시군구 코드 */
AND C.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */
AND C.CRDN_STTS_CD BETWEEN '21' AND '31' /* 단속 상태 코드 */
AND C.RTPYR_ID IS NOT NULL /* 납부자 ID */
AND C.DEL_YN = 'N' /* 삭제 여부 */
WHERE C.SGG_CD = #{sggCd} /* 시군구 코드 */
AND C.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */
AND C.CRDN_STTS_CD BETWEEN '21' AND '31' /* 단속 상태 코드 */
AND C.RTPYR_ID IS NOT NULL /* 납부자 ID */
AND C.DEL_YN = #{delYn} /* 삭제 여부 */
AND (CC.CVLCPT_PRCS_CD IS NULL OR CC.CVLCPT_PRCS_CD <![CDATA[ <> ]]> '00') /* 민원 처리 코드 */
AND L.LEVY_ID IS NULL /* 부과 ID */
AND L.LEVY_ID IS NULL /* 부과 ID */
<if test="schCrdnYmdFrom != null">
AND C.CRDN_YMD <![CDATA[ >= ]]> #{schCrdnYmdFrom} /* 단속 일자 시작 */
AND C.CRDN_YMD <![CDATA[ >= ]]> #{schCrdnYmdFrom} /* 단속 일자 시작 */
</if>
<if test="schCrdnYmdTo != null">
AND C.CRDN_YMD <![CDATA[ <= ]]> #{schCrdnYmdTo} /* 단속 일자 종료 */
AND C.CRDN_YMD <![CDATA[ <= ]]> #{schCrdnYmdTo} /* 단속 일자 종료 */
</if>
<if test="schVhrno != null">
AND C.VHRNO = #{schVhrno} /* 차량번호 */
AND C.VHRNO = #{schVhrno} /* 차량번호 */
</if>
<if test="schRtpyrNm != null">
AND P.RTPYR_NM = #{schRtpyrNm} /* 납부자 명 */
AND P.RTPYR_NM = #{schRtpyrNm} /* 납부자 명 */
</if>
<choose>
<when test="schDetailCrdnRegDtOpt == 'regDt'">
@ -189,12 +189,12 @@
<choose>
<when test="schDetailCrdnRgtrOpt == 'rgtr'">
<if test="schDetailCrdnRgtrCd != null">
AND C.RGTR = #{schDetailCrdnRgtrCd} /* 등록자 코드 */
AND C.RGTR = #{schDetailCrdnRgtrCd} /* 등록자 코드 */
</if>
</when>
<when test="schDetailCrdnRgtrOpt == 'mdfr'">
<if test="schDetailCrdnRgtrCd != null">
AND C.MDFR = #{schDetailCrdnRgtrCd} /* 수정자 코드 */
AND C.MDFR = #{schDetailCrdnRgtrCd} /* 수정자 코드 */
</if>
</when>
<otherwise>
@ -332,7 +332,9 @@
<select id="selectLevyList" parameterType="map" resultType="dataobject">/* 부과 대장 목록 조회(levyMapper.selectLevyList) */
<include refid="utility.paging-prefix" />
<include refid="select" />
<where></where>
<where>
AND L.DEL_YN = #{delYn} /* 삭제 여부 */
</where>
<include refid="utility.orderBy" />
<include refid="utility.paging-suffix" />
</select>

@ -130,17 +130,17 @@
, P.ADDR /* 주소 */
, P.DTL_ADDR /* 상세 주소 */
, (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM /* 납부자 구분 명 */
FROM TB_RCVMT R
INNER JOIN TB_LEVY L ON (R.LEVY_ID = L.LEVY_ID)
INNER JOIN TB_CRDN C ON (L.CRDN_ID = C.CRDN_ID)
LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID)
FROM TB_RCVMT R
INNER JOIN TB_LEVY L ON (R.LEVY_ID = L.LEVY_ID)
INNER JOIN TB_CRDN C ON (L.CRDN_ID = C.CRDN_ID)
LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID)
</sql>
<select id="selectRcvmtList" parameterType="map" resultType="dataobject">/* 수납 대장 목록 조회(rcvmtMapper.selectRcvmtList) */
<include refid="utility.paging-prefix" />
<include refid="select" />
WHERE R.SGG_CD = #{sggCd} /* 시군구 코드 */
AND R.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */
WHERE R.SGG_CD = #{sggCd} /* 시군구 코드 */
AND R.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */
<if test="schPstmrkYmdFrom != null">
AND R.PSTMRK_YMD <![CDATA[ >= ]]> #{schPstmrkYmdFrom} /* 소인 일자 시작 */
</if>
@ -154,7 +154,7 @@
AND R.RCVMT_YMD <![CDATA[ <= ]]> #{schRcvmtYmdTo} /* 소인 일자 종료 */
</if>
<if test="delYn != null">
AND R.DEL_YN = #{delYn} /* 삭제 여부 */
AND R.DEL_YN = #{delYn} /* 삭제 여부 */
</if>
<if test="schCrdnYmdFrom != null">
AND C.CRDN_YMD <![CDATA[ >= ]]> #{schCrdnYmdFrom} /* 단속 일자 시작 */
@ -163,26 +163,26 @@
AND C.CRDN_YMD <![CDATA[ <= ]]> #{schCrdnYmdTo} /* 단속 일자 종료 */
</if>
<if test="schVhrno != null">
AND C.VHRNO = #{schVhrno} /* 차량번호 */
AND C.VHRNO = #{schVhrno} /* 차량번호 */
</if>
<if test="schRtpyrNm != null">
AND P.RTPYR_NM = #{schRtpyrNm} /* 납부자 명 */
AND P.RTPYR_NM = #{schRtpyrNm} /* 납부자 명 */
</if>
<choose>
<when test="schDetailCrdnRegDtOpt == 'regDt'">
<if test="schDetailCrdnRegDtFrom != null">
AND SUBSTR(C.REG_DT,1,8) <![CDATA[ >= ]]> #{schDetailCrdnRegDtFrom} <!-- 등록 일자 시작 -->
AND SUBSTR(C.REG_DT,1,8) <![CDATA[ >= ]]> #{schDetailCrdnRegDtFrom} /* 등록 일자 시작 */
</if>
<if test="schDetailCrdnRegDtTo != null">
AND SUBSTR(C.REG_DT,1,8) <![CDATA[ <= ]]> #{schDetailCrdnRegDtTo} <!-- 등록 일자 종료 -->
AND SUBSTR(C.REG_DT,1,8) <![CDATA[ <= ]]> #{schDetailCrdnRegDtTo} /* 등록 일자 종료 */
</if>
</when>
<when test="schDetailCrdnRegDtOpt == 'mdfcnDt'">
<if test="schDetailCrdnRegDtFrom != null">
AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ >= ]]> #{schDetailCrdnRegDtFrom} <!-- 수정 일자 시작 -->
AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ >= ]]> #{schDetailCrdnRegDtFrom} /* 수정 일자 시작 */
</if>
<if test="schDetailCrdnRegDtTo != null">
AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ <= ]]> #{schDetailCrdnRegDtTo} <!-- 수정 일자 종료 -->
AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ <= ]]> #{schDetailCrdnRegDtTo} /* 수정 일자 종료 */
</if>
</when>
<otherwise>
@ -191,12 +191,12 @@
<choose>
<when test="schDetailCrdnRgtrOpt == 'rgtr'">
<if test="schDetailCrdnRgtrCd != null">
AND C.RGTR = #{schDetailCrdnRgtrCd} <!-- 등록자 코드 -->
AND C.RGTR = #{schDetailCrdnRgtrCd} /* 등록자 코드 */
</if>
</when>
<when test="schDetailCrdnRgtrOpt == 'mdfr'">
<if test="schDetailCrdnRgtrCd != null">
AND C.MDFR = #{schDetailCrdnRgtrCd} <!-- 수정자 코드 -->
AND C.MDFR = #{schDetailCrdnRgtrCd} /* 수정자 코드 */
</if>
</when>
<otherwise>
@ -241,16 +241,16 @@
<include refid="select" />
<where>
<if test="rcvmtId != null">
AND R.RCVMT_ID = #{rcvmtId} /* 수납 ID */
AND R.RCVMT_ID = #{rcvmtId} /* 수납 ID */
</if>
<if test="levyId != null">
AND L.LEVY_ID = #{levyId} /* 부과 ID */
AND L.LEVY_ID = #{levyId} /* 부과 ID */
</if>
<if test="crdnId != null">
AND C.CRDN_ID = #{crdnId} /* 단속 ID */
AND C.CRDN_ID = #{crdnId} /* 단속 ID */
</if>
<if test="delYn != null">
AND R.DEL_YN = #{delYn} /* 삭제 여부 */
AND R.DEL_YN = #{delYn} /* 삭제 여부 */
</if>
</where>
<include refid="utility.orderBy" />
@ -280,29 +280,29 @@
, <include refid="utility.today" /> AS RCVMT_YMD /* 수납 일자 */
, <include refid="utility.today" /> AS PSTMRK_YMD /* 소인 일자 */
, <include refid="utility.today" /> AS ACNTG_YMD /* 회계 일자 */
FROM TB_LEVY L
INNER JOIN TB_CRDN C ON (L.CRDN_ID = C.CRDN_ID)
FROM TB_LEVY L
INNER JOIN TB_CRDN C ON (L.CRDN_ID = C.CRDN_ID)
<choose>
<when test="crdnId != null">
WHERE L.CRDN_ID = #{crdnId} /* 단속 ID */
WHERE L.CRDN_ID = #{crdnId} /* 단속 ID */
</when>
<otherwise>
WHERE L.LEVY_ID = #{levyId} /* 부과 ID */
WHERE L.LEVY_ID = #{levyId} /* 부과 ID */
</otherwise>
</choose>
AND L.DEL_YN = #{delYn} /* 삭제 여부 */
AND L.DEL_YN = #{delYn} /* 삭제 여부 */
<include refid="utility.orderBy" />
</select>
<update id="updateRcvmtRtrcn" parameterType="map">/* 수납 대장 수납취소 정보 수정(rcvmtMapper.updateRcvmtRtrcn) */
UPDATE TB_RCVMT
SET RCVMT_RTRCN_YN = #{rcvmt.rcvmtRtrcnYn} /* 수납 취소 여부 */
, RCVMT_RTRCN_DT = #{rcvmt.rcvmtRtrcnDt} /* 수납 취소 일시 */
, RCVMT_RTRCN_RSN = #{rcvmt.rcvmtRtrcnRsn} /* 수납 취소 사유 */
, MDFCN_DT = #{rcvmt.lastModified} /* 수정 일시 */
, MDFR = #{rcvmt.modifiedBy} /* 수정자 */
WHERE RCVMT_ID = #{rcvmt.rcvmtId} /* 수납 ID */
AND DEL_YN = 'N' /* 삭제 여부 */
SET RCVMT_RTRCN_YN = #{rcvmt.rcvmtRtrcnYn} /* 수납 취소 여부 */
, RCVMT_RTRCN_DT = #{rcvmt.rcvmtRtrcnDt} /* 수납 취소 일시 */
, RCVMT_RTRCN_RSN = #{rcvmt.rcvmtRtrcnRsn} /* 수납 취소 사유 */
, MDFCN_DT = #{rcvmt.lastModified} /* 수정 일시 */
, MDFR = #{rcvmt.modifiedBy} /* 수정자 */
WHERE RCVMT_ID = #{rcvmt.rcvmtId} /* 수납 ID */
AND DEL_YN = 'N' /* 삭제 여부 */
</update>
<insert id="insertRcvmt" parameterType="map">/* 수납 대장 등록(rcvmtMapper.insertRcvmt) */
@ -356,7 +356,6 @@
, #{rcvmt.taskSeCd} /* 업무 구분 코드 */
, #{rcvmt.levyId} /* 부과 ID */
, #{rcvmt.rcvmtInptSeCd} /* 수납 입력 구분 코드 */
, #{rcvmt.spclAcntgBizCd} /* 특별 회계 사업 코드 */
, #{rcvmt.fyr} /* 회계 연도 */
, #{rcvmt.acntgSeCd} /* 회계 구분 코드 */
, #{rcvmt.txitmCd} /* 세목 코드 */

@ -344,7 +344,7 @@
}
// 공시송달 수정 callback
callbackSvbtcInfo${pageName} = (obj) => {
getSvbtcInfo${pageName} = (obj) => {
let taskSeCd = $("input[name='taskSeCd']:checked").val(); // 업무 구분 코드
let svbtcId = ${pageName}Control.dataset.getValue("SVBTC_ID"); // 공시송달 ID
@ -374,7 +374,7 @@
}
// 공시송달 삭제 callback
callbackRemoveSvbtcs${pageName} = (obj) => {
removeSvbtcs${pageName} = (obj) => {
let taskSeCd = $("input[name='taskSeCd']:checked").val(); // 업무 구분 코드
let selected = ${pageName}Control.dataset.getKeys("selected"); // 선택 자료
@ -523,7 +523,9 @@
// 공시송달 수정 버튼 이벤트
fnSvbtcInfo${pageName} = () => {
let callbackFuncName = "callbackSvbtcInfo${pageName}";
let callbackFuncName = "getSvbtcInfo${pageName}";
let taskSeCd = $("input:radio[name='taskSeCd']:checked").val();
let popupWidth = 640;
@ -554,7 +556,7 @@
if (selected.length < 1) return;
let callbackFuncName = "callbackRemoveSvbtcs${pageName}";
let callbackFuncName = "removeSvbtcs${pageName}";
let popupWidth = 640;
let popupHeight = 360;
let popupX = (window.screen.width / 2) - (popupWidth / 2);

@ -12,14 +12,14 @@
<label class="w-px-120 bg-label-danger pe-2 col-form-label text-sm-center">수납 정보</label>
<!-- 버튼 우측 정렬 -->
<span class="container-window-btn-right">
<button type="button" class="btn btn-primary" id="btnCreateRcvmt--${pageName}" title="수기 수납 등록" onclick="fnCreateRcvmt${pageName}();">
기 수납 등록
<button type="button" class="btn btn-primary" id="btnCreateRcvmt--${pageName}" title="수납 등록" onclick="fnCreateRcvmt${pageName}();">
수납 등록
</button>
<button type="button" class="btn btn-primary" id="btnRemoveRcvmt--${pageName}" title="수기 수납 취소" onclick="fnUpdateRcvmtRtrcn${pageName}();">
기 수납 삭제
<button type="button" class="btn btn-primary" id="btnRemoveRcvmt--${pageName}" title="수납 취소" onclick="fnUpdateRcvmtRtrcn${pageName}();">
납 취소
</button>
<button type="button" class="btn btn-primary" id="btnRemoveRcvmt--${pageName}" title="수기 수납 삭제" onclick="fnRemoveRcvmt${pageName}();">
기 수납 삭제
<button type="button" class="btn btn-primary" id="btnRemoveRcvmt--${pageName}" title="수납 삭제" onclick="fnRemoveRcvmt${pageName}();">
수납 삭제
</button>
</span>
</div> <!-- <div class="container-page-btn"> -->
@ -411,7 +411,31 @@
// 수기 수납 취소
fnUpdateRcvmtRtrcn${pageName} = () => {
// 수납 ID
let rcvmtId = ${pageName}Control.dataset.getValue("RCVMT_ID");
// 수납 ID 가 없다면.. return
if (typeof rcvmtId == "undefined" || rcvmtId == null || rcvmtId == "") return;
dialog.alert({
content : "수납 취소시 과오납 대장이 생성됩니다."
, onOK : () => {
let callbackFuncName = "updateRcvmtRtrcn${pageName}";
let popupWidth = 640;
let popupHeight = 360;
let popupX = (window.screen.width / 2) - (popupWidth / 2);
let popupY= (window.screen.height / 2) - (popupHeight / 2);
window.open(
wctx.url("/resources/html/inputRsnDialog.html"
+ "?callbackFuncName=" + callbackFuncName
+ "&CALL_PURPOSE=" + "remove"
)
, "inputDelRsnDialog"
, 'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY
);
}
});
}
// 수기 수납 삭제
@ -432,14 +456,14 @@
return;
}
// 수납 취소 여부가 "Y" 일때만 삭제 가능
if (${pageName}Control.dataset.getValue("RCVMT_RTRCN_YN") != "Y") {
dialog.alert({
content : "수납이 취소된 자료만 삭제 가능합니다."
, onOK : () => { }
});
return;
}
// if (${pageName}Control.dataset.getValue("RCVMT_RTRCN_YN") != "Y") {
// dialog.alert({
// content : "수납이 취소된 자료만 삭제 가능합니다."
// , onOK : () => { }
// });
// return;
// }
let callbackFuncName = "removeRcvmt${pageName}";
let popupWidth = 640;

Loading…
Cancel
Save