표지정보 미확인 자료 수정 기능 추가

src/main/java/cokr/xit/fims/crdn/Crdn.java

@@ -10,6 +10,11 @@ import lombok.Setter;
 @Getter
 @Setter
 public class Crdn extends AbstractEntity {
+	/**
+	 * 수정 처리할 정보
+	 */
+	private String updateInfomation;
+
 	/**
 	 * 단속 ID
 	 */
@@ -314,7 +319,7 @@ public class Crdn extends AbstractEntity {
 	 * 이전 단속 ID
 	 */
 	private String bfrCrdnId;
-	
+
 	/**
 	 * 민원 연계 ID
 	 */

src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java

@@ -1,6 +1,7 @@
 package cokr.xit.fims.crdn.dao;
 
 import java.util.List;
+import java.util.Map;
 
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
@@ -15,32 +16,48 @@ import cokr.xit.foundation.data.DataObject;
  */
 @Mapper("crdn06Mapper")
 public interface Crdn06Mapper extends AbstractMapper {
-	
+
 	/**단속자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고
 	 * @param req 단속자료 목록 조회 조건
 	 * @return 단속자료 목록
 	 */
 	List<DataObject> selectCrackdownList(CrdnQuery req);
-	
+
 	/**표지정보 미확인 자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고
 	 * @param req 표지정보 미확인 자료 목록 조회 조건
 	 * @return 표지정보 미확인 자료 목록
 	 */
 	List<DataObject> selectTagInformationUndefinedDataList(CrdnQuery req);
-	
+
 	/**과태료 감경 자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고
 	 * @param req 과태료 감경 자료 목록 조회 조건
 	 * @return 과태료 감경 자료 목록
 	 */
 	List<DataObject> selectFineReductionDataList(QueryRequest setOrderBy);
-	
+
 	List<DataObject> selectCrackdowns(CrdnQuery req);
 
-	
+	/**표지정보 미확인 자료를 확인 자료로 수정한다.
+	 * @param params 파라미터
+	 * <ul><li>"crdn" - 단속 대장</li>
+	 *     <li>"currentUser" - 현재 접속한 사용자</li>
+	 * </ul>
+	 * @return 저장된 정보수
+	 */
+	int updateTagInformation(Map<String, Object> params);
+
+	/**표지정보 미확인 자료를 확인 자료로 수정한다.
+	 * @param crdn 단속대장
+	 * @return 저장 여부
+	 * <ul><li>저장됐으면 true</li>
+	 *     <li>그렇지 않으면 false</li>
+	 * </ul>
+	 */
+	default boolean updateTagInformation(Crdn crdn) {
+		return crdn != null && updateTagInformation(params().set("crdn", crdn)) == 1;
+	}
 
-	
-	
 }

src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java

@@ -13,7 +13,7 @@ import cokr.xit.foundation.data.DataObject;
  * @author leebj
  */
 public interface Crdn06Service {
-	
+
 	/** 단속자료 목록을 조회한다.
 	 * @param req 단속자료 목록 조회 조건
 	 * <ul><li>pageNum: 페이지 번호</li>
@@ -23,6 +23,12 @@ public interface Crdn06Service {
 	 */
 	List<DataObject> getCrackdownList(CrdnQuery req);
 
-
+	/**단속 대장 정보를 수정한다.
-	
+	 * @param crdn 단속 대장
+	 * @return 저장 여부
+	 * <ul><li>저장됐으면 true</li>
+	 *     <li>그렇지 않으면 false</li>
+	 * </ul>
+	 */
+	boolean update(Crdn crdn);
 }

src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java

@@ -49,4 +49,20 @@ public class Crdn06Bean extends AbstractComponent {
 		}
 	}
 
+	/**단속 대장 정보를 수정한다.
+	 * @param crdn 단속 대장
+	 * @return 저장 여부
+	 * <ul><li>저장됐으면 true</li>
+	 *     <li>그렇지 않으면 false</li>
+	 * </ul>
+	 */
+	public boolean update(Crdn crdn) {
+		switch (ifEmpty(crdn.getUpdateInfomation(), () -> "")) {
+			case "TagInformationUndefinedData":
+				return crdn06Mapper.updateTagInformation(crdn);
+			default:
+				return false; //crdn06Mapper.update(crdn);
+		}
+	}
+
 }

src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java

@@ -6,6 +6,7 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
+import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.service.Crdn06Service;
 import cokr.xit.foundation.component.AbstractServiceBean;
@@ -16,16 +17,19 @@ import cokr.xit.foundation.data.DataObject;
  */
 @Service("crdn06Service")
 public class Crdn06ServiceBean extends AbstractServiceBean implements Crdn06Service {
-	
+
 	/** 단속관리 Bean */
 	@Resource(name="crdn06Bean")
 	protected Crdn06Bean crdn06Bean;
-	
+
 	@Override
 	public List<DataObject> getCrackdownList(CrdnQuery req) {
 		return crdn06Bean.getCrackdownList(req);
 	}
-	
+
-	
+	@Override
-	
+	public boolean update(Crdn crdn) {
+		return crdn06Bean.update(crdn);
+	}
+
 }

src/main/java/cokr/xit/fims/crdn/web/TaskCrdn06Controller.java

@@ -1,10 +1,15 @@
 package cokr.xit.fims.crdn.web;
 
+import javax.annotation.Resource;
+
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
+import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
+import cokr.xit.fims.crdn.service.Crdn06Service;
 
 /**단속 관리 서비스 웹 컨트롤러.<br />
  * {웹 컨텍스트}/crdn/crdn06 로 접근할 수 있다.
@@ -13,6 +18,9 @@ import cokr.xit.fims.crdn.CrdnQuery;
 @Controller
 public class TaskCrdn06Controller extends Crdn06Controller {
 
+	@Resource(name="crdn06Service")
+	private Crdn06Service crdn06Service;
+
 	@RequestMapping(name="주정차과태료업무 단속자료 목록", value="/010/PVS/list.do")
 	public ModelAndView getPvsCrackdownList(CrdnQuery req) {
 		return getCrackdownList(req);
@@ -29,12 +37,27 @@ public class TaskCrdn06Controller extends Crdn06Controller {
 	public ModelAndView getEcaCrackdownList(CrdnQuery req) {
 		return getCrackdownList(req);
 	}
-	
+
 	@RequestMapping(name="장애인과태료업무 표지정보미확인자료 목록", value="/030/DPV/list.do")
 	public ModelAndView getTagInformationUndefinedDataList(CrdnQuery req) {
 		return getCrackdownList(req.setGrid("TagInformationUndefinedData"));
 	}
-	
+
+	/**표지정보 미확인 자료를 수정한다.
+	 * @param crdn 단속 대장 정보
+	 * @return jsonView
+	 * <pre><code> {
+	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
+	 * }</code></pre>
+	 */
+	@PostMapping(name = "단속 대장 수정", value = "/030/DPV/update.do")
+	public ModelAndView update(Crdn crdn) {
+		crdn.setUpdateInfomation("TagInformationUndefinedData");
+		boolean saved = crdn06Service.update(crdn);
+		return new ModelAndView("jsonView")
+			.addObject("saved", saved);
+	}
+
 	@RequestMapping(name="주정차과태료업무 과태료 감경 자료 목록", value="/040/PVS/list.do")
 	public ModelAndView getPvsFineReductionDataList(CrdnQuery req) {
 		return getCrackdownList(req.setGrid("FineReductionData"));

src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml

@@ -244,12 +244,12 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      <!-- 영상매체 -->
      , C.ATCH_FILE_CNT                                <!-- 사진건수 -->
      , C.CRDN_SN                                      <!-- 단속 일련번호 -->
-     <!-- 표지확인 -->
      , C.CRDN_STTS_CD                                 <!-- 단속 상태 코드 -->
 FROM TB_CRDN C
 LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID)
 LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID)
 WHERE C.DEL_YN = 'N'
+AND PARKNG_PSBLTY_RSLT_CD = '0'
 <if test="by != null and by != '' and term != null">
 	<choose>
 		<when test="by == 'crdnInptSeCd'">
@@ -282,9 +282,6 @@ AND C.ATCH_FILE_CNT = #{term}
 		</when>
 		<when test="by == 'crdnSn'">
 AND C.CRDN_SN = #{term}
-		</when>
-		<when test="by == '표지확인'">
-
 		</when>
 		<when test="by == 'crdnSttsCd'">
 AND FN_GET_CODE_NM('FIM010', C.CRDN_STTS_CD) LIKE CONCAT('%', #{term}, '%')
@@ -364,4 +361,13 @@ AND FN_GET_CODE_NM('FIM010', C.CRDN_STTS_CD) LIKE CONCAT('%', #{term}, '%')
 	<include refid="selectCrackdown"/>
 </select>
 
+<update id="updateTagInformation" parameterType="map">
+    /* 표지정보확인 수정(crdn06Mapper.updateTagInformation) */
+    UPDATE TB_CRDN
+       SET PARKNG_PSBLTY_RSLT_CD = '2'
+         , MDFCN_DT = <include refid="utility.now" /> /* 수정일시 */
+         , MDFR = #{currentUser.id}                   /* 수정자 */
+     WHERE CRDN_ID = #{crdn.crdnId}                   /* 단속 ID */
+</update>
+
 </mapper>

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp

@@ -32,16 +32,13 @@
 		                            </span>
 		                        </div>
 		                        <div class="col-6">
-		                            <select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
+		                        	<label class="form-label fw-bold form-search-title">단속일자</label>
-		                                <option value="crdnYmd">단속일자</option>
+		                        	<span class="form-search-linebox">
-		                                <option value="regDt">등록일자</option>
+		                                <input type="text" id="schCrdnYmdFrom--${pageName}" name="schCrdnYmdFrom" class="form-control form-date"
-		                            </select>
-		                            <span class="form-search-linebox">
-		                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" class="form-control form-date"
 		                                	data-fmt-type="day"   title="시작 날짜 선택" />
 		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 		                                ~
-		                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" class="form-control form-date"
+		                                <input type="text" id="schCrdnYmdTo--${pageName}" name="schCrdnYmdTo" class="form-control form-date"
 		                                	data-fmt-type="day" title="종료 날짜 선택">
 		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 		                            </span>
@@ -75,7 +72,7 @@
 				        </div>
 				        <div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
 				            <div class="row">
-					            <div class="col-12">
+					            <div class="col-6">
 					                <label class="form-label fw-bold form-search-title">자료상태</label>
 		                            <select id="crdnSttsCd--${pageName}" name="crdnSttsCd" class="form-select">
 		                            	<option value="">전체</option>
@@ -84,6 +81,21 @@
 		                            	</c:forEach>
 		                            </select>
 					            </div>
+					            <div class="col-6">
+		                        	<select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
+		                                <option value="regDt">등록일자</option>
+		                                <option value="mdfcnDt">수정일자</option>
+		                            </select>
+		                            <span class="form-search-linebox">
+		                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" class="form-control form-date"
+		                                	data-fmt-type="day"   title="시작 날짜 선택" />
+		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+		                                ~
+		                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" class="form-control form-date"
+		                                	data-fmt-type="day" title="종료 날짜 선택">
+		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+		                            </span>
+		                        </div>
 					        </div>
 				        </div>
 				    </form>
@@ -188,6 +200,12 @@ $(document).ready(function(){
 
 	};
 
+	$P.crdnControl.onCurrentChange = item => {
+		if (!item) return;
+
+		let key = item.data.CRDN_ID;
+		$("#crdnTbody--${pageName}").setCurrentRow(key);
+	}
 
 	$P.fnResetAndChangeBiz = taskSeCd => {
 		$("#crdnTbody--${pageName}").html("");
@@ -278,8 +296,8 @@ $(document).ready(function(){
 	//달력 초기화
     initDatepicker("frmSearch--${pageName}");
 
-  	$('#schDateFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date);
+  	$('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date);
-    $('#schDateTo--${pageName}').datepicker('setDate', new Date());
+    $('#schCrdnYmdTo--${pageName}').datepicker('setDate', new Date());
 
 
 

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp

@@ -69,7 +69,7 @@
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','',this.innerText);">영상매체</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','ATCH_FILE_CNT',this.innerText);">사진건수</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','CRDN_SN',this.innerText);">발행번호</th>
-											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','',this.innerText);">표지확인</th>
+											<th width="80">표지확인</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','CRDN_STTS_CD',this.innerText);">처리상태</th>
 										</tr>
 				                    </thead>
@@ -87,7 +87,7 @@
 				                    		<td {onclick} {ondblclick} class="text-center">{매체}</td>
 				                    		<td {onclick} {ondblclick} class="text-end">{ATCH_FILE_CNT}</td>
 				                    		<td {onclick} {ondblclick} class="text-end">{CRDN_SN}</td>
-				                    		<td {onclick} {ondblclick} class="text-start">{표지확인}</td>
+				                    		<td {onclick} {ondblclick} class="text-center"><input type="checkbox" disabled="disabled" /></td>
 				                    		<td {onclick} {ondblclick} class="text-center">{CRDN_STTS_CD}</td>
 										</tr>
 									</template>
@@ -156,6 +156,13 @@ $(document).ready(function(){
 	    });
 	};
 
+	$P.crdnControl.onCurrentChange = item => {
+		if (!item) return;
+
+		let key = item.data.CRDN_ID;
+		$("#crdnTbody--${pageName}").setCurrentRow(key);
+	};
+
 	$P.searchCrdnList = () => {
 		$P.crdnControl.query = $P.getParams();
 	    $P.crdnControl.load(1);
@@ -221,12 +228,15 @@ $(document).ready(function(){
 
     $('#btnUpdateToConfirmData--${pageName}').on('click', () => {
 
-    	$P.crdnControl.getCurrent();
+    	if(!$P.crdnControl.getCurrent()) {
+    		dialog.alert({content:"선택된 자료가 없습니다.",timeout: 0, onOK:()=>{}});
+    		return;
+    	};
 
     	dialog.alert({
     		content:"현 자료를 장애차량 확인된 자료로 변경하겠습니까?",
     		onOK:() => {
-    			$P.crdnControl.save({ '표지정보확인' : 'Y' });
+    			$P.crdnControl.save({ 'crdnId' : $P.crdnControl.getCurrent()["CRDN_ID"] });
     		}
     	});
     });

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp

@@ -157,6 +157,13 @@ $(document).ready(function(){
 
 	};
 
+	$P.crdnControl.onCurrentChange = item => {
+		if (!item) return;
+
+		let key = item.data.CRDN_ID;
+		$("#crdnTbody--${pageName}").setCurrentRow(key);
+	}
+
 	$P.fnReset = () => {
 		$('#schRductYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date);
 	    $('#schRductYmdTo--${pageName}').datepicker('setDate', new Date());