1. 수기 수납 등록 수정.

2. 리스트 조회시 정렬 추가.

src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java

@@ -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);

src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java

@@ -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);

src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java

@@ -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);

src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java

@@ -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);
 	}
 

src/main/java/cokr/xit/fims/levy/service/bean/RductBean.java

@@ -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);

src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtBean.java

@@ -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);
 	}
 

src/main/resources/sql/mapper/fims/levy/levy-mapper.xml

@@ -151,7 +151,7 @@
            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'                                          /* 삭제 여부 */
+           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 */
         <if test="schCrdnYmdFrom != null">
@@ -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>

src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml

@@ -171,18 +171,18 @@
         <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>
@@ -356,7 +356,6 @@
              , #{rcvmt.taskSeCd}            /* 업무 구분 코드 */
              , #{rcvmt.levyId}              /* 부과 ID */
              , #{rcvmt.rcvmtInptSeCd}       /* 수납 입력 구분 코드 */
-             , #{rcvmt.spclAcntgBizCd}      /* 특별 회계 사업 코드 */
              , #{rcvmt.fyr}                 /* 회계 연도 */
              , #{rcvmt.acntgSeCd}           /* 회계 구분 코드 */
              , #{rcvmt.txitmCd}             /* 세목 코드 */

src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp

@@ -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);

src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp

@@ -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") {
+// 		if (${pageName}Control.dataset.getValue("RCVMT_RTRCN_YN") != "Y") {
-			dialog.alert({
+// 			dialog.alert({
-				  content : "수납이 취소된 자료만 삭제 가능합니다."
+// 				  content : "수납이 취소된 자료만 삭제 가능합니다."
-				, onOK : () => { }
+// 				, onOK : () => { }
-			});
+// 			});
-
+
-			return;
+// 			return;
-		}
+// 		}
 
 		let callbackFuncName = "removeRcvmt${pageName}";
 		let popupWidth = 640;