placeholder 추가

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

@@ -1,10 +1,10 @@
 package cokr.xit.fims.crdn.dao;
 
 import java.util.List;
-import java.util.Map;
 
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
+import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.foundation.component.AbstractMapper;
 import cokr.xit.foundation.data.DataObject;
@@ -43,10 +43,6 @@ public interface Crdn01Mapper extends AbstractMapper {
 	 * </ul>
 	 * @return 저장된 정보수
 	 */
-	int removeCivilComplaint(Map<String, Object> params);
+	int removeCivilComplaint(Crdn crdn);
 
-	default boolean removeCivilComplaint(String... crdnIDs) {
-		if (isEmpty(crdnIDs)) return false;
-		return removeCivilComplaint(params().set("crdnIDs", crdnIDs)) == 1;
-	};
 }

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

@@ -1,7 +1,6 @@
 package cokr.xit.fims.crdn.dao;
 
 import java.util.List;
-import java.util.Map;
 
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
@@ -53,24 +52,10 @@ public interface Crdn06Mapper extends AbstractMapper {
 	List<DataObject> selectTagInformationUndefinedDataList(CrdnQuery req);
 
 	/**표지정보 미확인 자료를 확인 자료로 수정한다.
-	 * @param params 파라미터
+	 * @param crdn 단속 대장
-	 * <ul><li>"crdn" - 단속 대장</li>
-	 *     <li>"currentUser" - 현재 접속한 사용자</li>
-	 * </ul>
 	 * @return 저장된 정보수
 	 */
-	int updateTagInformation(Map<String, Object> params);
+	int updateTagInformation(Crdn crdn);
-
-	/**표지정보 미확인 자료를 확인 자료로 수정한다.
-	 * @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;
-	}
 
 	/**과태료 감경 자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.bean.Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고

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

@@ -4,8 +4,10 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 
+import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.dao.Crdn01Mapper;
 import cokr.xit.foundation.AbstractComponent;
+import cokr.xit.foundation.UserInfo;
 
 /** 민원 관리 Bean
  * @author leebj
@@ -17,7 +19,11 @@ public class Crdn01Bean extends AbstractComponent {
 	private Crdn01Mapper crdn01Mapper;
 
 	public boolean removeCivilComplaint(String... crdnIDs) {
-		return crdn01Mapper.removeCivilComplaint(crdnIDs);
+		if (isEmpty(crdnIDs)) return false;
+		Crdn crdn = new Crdn();
+		crdn.setCrdnIDs(crdnIDs);
+		crdn.setRemovedBy(UserInfo.current().getId());
+		return crdn01Mapper.removeCivilComplaint(crdn) == 1 ? true : false;
 	}
 
 }

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

@@ -27,7 +27,7 @@ public class Crdn06Bean extends AbstractComponent {
 	public boolean update(Crdn crdn) {
 		switch (ifEmpty(crdn.getUpdateInfomation(), () -> "")) {
 			case "tagInformationUndefinedData":
-				return crdn06Mapper.updateTagInformation(crdn);
+				return crdn06Mapper.updateTagInformation(crdn) == 1 ? true : false;
 			default:
 				return false; //crdn06Mapper.update(crdn);
 		}

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

@@ -75,6 +75,18 @@ public class Crdn01Controller extends ApplicationController {
 		return mav;
 	}
 
+	/** 민원내역 원본 보기 팝업 화면을 연다.
+	 * @return fims/crdn/crdn01050-info
+	 */
+	@RequestMapping(name="민원내역 원본 보기", value="/050/info.do")
+	public ModelAndView getCivilComplaintOrgnlInfo() {
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName("fims/crdn/crdn01050-info");
+		mav.addObject("pageName", "crdn01050-info");
+
+		return mav;
+	}
+
 	/**민원접수자료 목록을 조회한다.<br />
 	 * {@link Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고
 	 * @param req 민원접수자료 목록 조회 조건

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

@@ -243,12 +243,12 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 </select>
 
 
-<update id="removeCivilComplaint" parameterType="map">
+<update id="removeCivilComplaint" parameterType="cokr.xit.fims.crdn.Crdn">
     /* 민원자료 삭제(crdn01Mapper.removeCivilComplaint) */
     UPDATE TB_CRDN
        SET DEL_YN = 'Y'
          , DEL_DT = <include refid="utility.now" /> /* 삭제일시 */
-         , DLTR = #{currentUser.id}                   /* 삭제자 */
+         , DLTR = #{removedBy}                   /* 삭제자 */
      WHERE CRDN_ID IN (
      <foreach collection="crdnIDs" item="crdnId" separator=",">#{crdnId}</foreach>
      )

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

@@ -398,13 +398,13 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 <include refid="utility.paging-suffix"/>
 </select>
 
-<update id="updateTagInformation" parameterType="map">
+<update id="updateTagInformation" parameterType="cokr.xit.fims.crdn.Crdn">
     /* 표지정보확인 수정(crdn06Mapper.updateTagInformation) */
     UPDATE TB_CRDN
        SET PARKNG_PSBLTY_RSLT_CD = '1'
          , MDFCN_DT = <include refid="utility.now" /> /* 수정일시 */
-         , MDFR = #{currentUser.id}                   /* 수정자 */
+         , MDFR = #{modifiedBy}                   /* 수정자 */
-     WHERE CRDN_ID = #{crdn.crdnId}                   /* 단속 ID */
+     WHERE CRDN_ID = #{crdnId}                   /* 단속 ID */
 </update>
 
 <select id="selectFineReductionDataList" parameterType="map" resultType="dataobject">

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

@@ -66,7 +66,7 @@
 							</div>
 				            <span class="container-window-btn-right">
 				            	
-				            	<a href="#" id="" class="btn btn-blue" title="민원원본보기">민원원본보기</a>
+				            	<a href="#" id="btnOpenCvlcptOrgnl--${pageName}" class="btn btn-blue" title="민원원본보기">민원원본보기</a>
 				            	<a href="#" id="btnHold--${pageName}" class="btn btn-blue" title="처리 잠시 보류">처리 잠시 보류</a>
 				            </span>
 				        </span>
@@ -367,6 +367,29 @@ $(document).ready(function(){
 		});
 	}
 	
+	$P.fnOpenCvlcptOrgnl = () => {
+		var cur = $P.crdnControl.getCurrent();
+		if(cur == null){
+			return;
+		}
+		
+		var taskSeCd = $("#frmSearch--${pageName} input[name='taskSeCd']:checked").val();
+		
+		ajax.get({
+			url : wctx.url("/"+taskSeCd+"/crdn/crdn01/050/info.do"),
+			data : { crdnId : cur["CRDN_ID"] },
+			success : resp => {	
+				dialog.open({
+					  id : "cvlcptOrgnlDialog--${pageName}"
+					, title : "민원내역 원본"
+					, content : resp
+					, size : "lg"
+					, init : () => {}
+				});
+			}
+		});
+	}
+	
 	/**************************************************************************
 	 * element.on
 	 **************************************************************************/
@@ -376,6 +399,7 @@ $(document).ready(function(){
     $("#btnHold--${pageName}").on("click", () => $P.fnHold());
     $("#btnDelete--${pageName}").on("click", () => $P.fnRemove());
     $("#btnDeleteSameRcptYmd--${pageName}").on("click", () => $P.fnRemoveSameRcptYmd());
+    $("#btnOpenCvlcptOrgnl--${pageName}").on("click", () => $P.fnOpenCvlcptOrgnl());
 	/**************************************************************************
 	 * 초기화
 	 **************************************************************************/

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp

@@ -18,10 +18,11 @@
 				</div>
 				<div class="col-md-4">
 					<label for="crdnTm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end required">
-						(숫자6자리)위반시간
+						위반시간
 					</label>
 		            <input type="text" id="crdnTm--${pageName}" name="crdnTm" data-map="CRDN_TM"
-		            	class="form-control form-time" data-fmt-type="time" maxlength="8" required />
+		            	class="form-control form-time" data-fmt-type="time" maxlength="8" required 
+		            	placeholder="시:분:초" />
 				</div>
 				<div class="col-md-4">
 					<label for="vhrno--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end required">
@@ -93,21 +94,24 @@
 					<button type="button" class="btn btn-sm btn-outline-dark" onclick="">검색</button>
 				</div>
 				<div class="col-md-6">
-					차량명칭/차량색상은 입력항목이 아닙니다.
+
 				</div>
 				<div class="col-md-4">
 					<label for="vin--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">차대번호</label>
-					<input type="text" id="vin--${pageName}" name="vin" data-map="VIN" class="form-control" readonly />
+					<input type="text" id="vin--${pageName}" name="vin" data-map="VIN" class="form-control" readonly 
+						placeholder="입력항목이 아닙니다." />
 				</div>
 				<div class="col-md-4 slot-edit" data-slot-index="2"></div>
 				<div class="col-md-4 slot-edit" data-slot-index="3"></div>
 				<div class="col-md-4">
 					<label for="vhclNm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">차량명칭</label>
-					<input type="text" id="vhclNm--${pageName}" name="vhclNm" data-map="VHCL_NM" class="form-control" readonly />
+					<input type="text" id="vhclNm--${pageName}" name="vhclNm" data-map="VHCL_NM" class="form-control" readonly 
+						placeholder="입력항목이 아닙니다." />
 				</div>
 				<div class="col-md-4">
 					<label for="vhclColor--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">차량색상</label>
-					<input type="text" id="vhclColor--${pageName}" name="vhclColor" data-map="VHCL_COLOR" class="form-control" readonly />
+					<input type="text" id="vhclColor--${pageName}" name="vhclColor" data-map="VHCL_COLOR" class="form-control" readonly 
+						placeholder="입력항목이 아닙니다." />
 				</div>
 				<div class="col-md-4">
 					<label for="useFuelCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">연료구분</label>