민원 조회 쿼리 수정

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

@@ -27,6 +27,8 @@ public class CrdnQuery extends QueryRequest {
 	private String schDateFrom;
 	private String schDateTo;
 	private String vhrno;
+	private String schCvlcptRcptYmdFrom;
+	private String schCvlcptRcptYmdTo;
 	private String schRductYmdFrom;
 	private String schRductYmdTo;
 	private String schCrdnYmdFrom;
@@ -38,6 +40,7 @@ public class CrdnQuery extends QueryRequest {
 	private String schExclEnd;
 	private String schExclTimeout;
 	private String crdnInptSeCd;
+	private String cvlcptPrcsCd;
 
 	public String getGrid() {
 		return ifEmpty(grid, () -> null);
@@ -138,6 +141,24 @@ public class CrdnQuery extends QueryRequest {
 		return self();
 	}
 
+	public String getSchCvlcptRcptYmdFrom() {
+		return ifEmpty(schCvlcptRcptYmdFrom, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setSchCvlcptRcptYmdFrom(String schCvlcptRcptYmdFrom) {
+		this.schCvlcptRcptYmdFrom = schCvlcptRcptYmdFrom;
+		return self();
+	}
+
+	public String getSchCvlcptRcptYmdTo() {
+		return ifEmpty(schCvlcptRcptYmdTo, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setSchCvlcptRcptYmdTo(String schCvlcptRcptYmdTo) {
+		this.schCvlcptRcptYmdTo = schCvlcptRcptYmdTo;
+		return self();
+	}
+
 	public String getSchRductYmdFrom() {
 		return ifEmpty(schRductYmdFrom, () -> null);
 	}
@@ -237,4 +258,13 @@ public class CrdnQuery extends QueryRequest {
 		return self();
 	}
 
+	public String getCvlcptPrcsCd() {
+		return ifEmpty(cvlcptPrcsCd, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setCvlcptPrcsCd(String cvlcptPrcsCd) {
+		this.cvlcptPrcsCd = cvlcptPrcsCd;
+		return self();
+	}
+
 }

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

@@ -12,7 +12,6 @@ import cokr.xit.base.code.CommonCode;
 import cokr.xit.base.web.ApplicationController;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.service.Crdn01Service;
-import cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean;
 
 /**민원 관리 서비스 웹 컨트롤러.<br />
  * {웹 컨텍스트}/crdn/crdn01 로 접근할 수 있다.
@@ -45,7 +44,8 @@ public class Crdn01Controller extends ApplicationController {
 		mav.setViewName("fims/crdn/crdn01030-main");
 		mav.addObject("pageName", "crdn01030-main");
 
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM022", "FIM026", "FIM054");
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM017","FIM022", "FIM026", "FIM054");
+		mav.addObject("FIM017List", commonCodes.get("FIM017"));
 		mav.addObject("FIM054List", commonCodes.get("FIM054"));
 		addCodes(commonCodes, mav, "FIM022");
 		addCodes(commonCodes, mav, "FIM026");

src/main/java/cokr/xit/fims/task/CmnController.java

@@ -95,6 +95,14 @@ public class CmnController {
 			return super.tagInformationUndefinedDataMain();
 		}
 
+		/** 과태료 감경 자료 메인화면을 연다.
+		 * @return fims/crdn/crdn06040-main
+		 */
+		@Override
+		@RequestMapping(name="과태료 감경 자료 메인", value="/040/main.do")
+		public ModelAndView fineReductionDataMain() {
+			return super.fineReductionDataMain();
+		}
 	}
 
 	@Controller

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

@@ -172,6 +172,10 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
    AND C.CRDN_STTS_CD = '01'
 <if test="by != null and by != '' and term != null">
 
+</if>
+<if test="schCvlcptRcptYmdFrom != null or schCvlcptRcptYmdTo != null">
+	<if test="schCvlcptRcptYmdFrom != null">AND CC.CVLCPT_RCPT_YMD <![CDATA[ >= ]]> #{schCvlcptRcptYmdFrom} </if>
+	<if test="schCvlcptRcptYmdTo != null">AND CC.CVLCPT_RCPT_YMD <![CDATA[ <= ]]> #{schCvlcptRcptYmdTo} </if>
 </if>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix"/>
@@ -204,10 +208,13 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 <if test="by != null and by != '' and term != null">
 
 </if>
+<if test="schCvlcptRcptYmdFrom != null or schCvlcptRcptYmdTo != null">
+	<if test="schCvlcptRcptYmdFrom != null">AND CC.CVLCPT_RCPT_YMD <![CDATA[ >= ]]> #{schCvlcptRcptYmdFrom} </if>
+	<if test="schCvlcptRcptYmdTo != null">AND CC.CVLCPT_RCPT_YMD <![CDATA[ <= ]]> #{schCvlcptRcptYmdTo} </if>
+</if>
+<if test="cvlcptPrcsCd != null">AND CC.CVLCPT_PRCS_CD = #{cvlcptPrcsCd}</if>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix"/>
 </select>
 
-
-
 </mapper>

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

@@ -46,7 +46,6 @@
 									<input type="hidden" id="by--${pageName}" name="by" />
 									<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
 									<input type="text" id="term--${pageName}" name="term" class="form-control" />
-
 		                        </div>
 		                    </div>
 				        </div>

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

@@ -42,11 +42,21 @@
 		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 		                            </span>
 		                        </div>
-		                        <div class="col-12">
+		                        <div class="col-6">
+		                        	<label class="form-label fw-bold form-search-title">처리구분</label>
+		                            <select id="cvlcptPrcsCd--${pageName}" name="cvlcptPrcsCd" class="form-select">
+		                            	<option value="">전체</option>
+		                            	<c:forEach items="${FIM017List}" var="item">
+		                            		<c:if test="${item.code == '02' or item.code == '03' or item.code == '04'}">
+		                            			<option value="${item.code}">${item.value}</option>
+		                            		</c:if>
+		                            	</c:forEach>
+		                            </select>
+		                        </div>
+		                        <div class="col-6">
 									<input type="hidden" id="by--${pageName}" name="by" />
 									<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
 									<input type="text" id="term--${pageName}" name="term" class="form-control" />
-
 		                        </div>
 		                    </div>
 				        </div>