diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java index 4da9c5b9..060a83b9 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java @@ -29,9 +29,9 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements Crdn01Serv public List getCrackdownList(CrdnQuery req) { switch (ifEmpty(req.getGrid(), () -> "")) { - case "접수": + case "receiptData": return crdn01Mapper.selectCivilComplaintReceiptDataList(req.setOrderBy("CRDN_ID")); - case "답변": + case "answerTargetData": return crdn01Mapper.selectCivilComplaintAnswerTargetDataList(req.setOrderBy("CRDN_ID")); default: return crdn01Mapper.selectCivilComplaintList(req.setOrderBy("CRDN_ID")); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java index f84c7982..332f85db 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -24,6 +24,50 @@ public class Crdn01Controller extends ApplicationController { @Resource(name="crdn01Service") private Crdn01Service crdn01Service; + /**민원접수자료 목록을 조회한다.
+ * {@link Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * @param req 민원접수자료 목록 조회 조건 + * @return jsonView + *
 {
+	 *     "crdnList": [조회결과 목록],
+	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
+	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
+	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
+	 * }
+ */ + @RequestMapping(name="민원접수자료 목록", value="/010/list.do") + public ModelAndView getCivilComplaintReceiptDataList(CrdnQuery req) { + req.setGrid("receiptData"); + setFetchSize(req); + return setCollectionInfo( + new ModelAndView("jsonView"), + crdn01Service.getCrackdownList(req), + "crdn" + ); + } + + /**민원답변대상자료 목록을 조회한다.
+ * {@link Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * @param req 민원답변대상자료 목록 조회 조건 + * @return jsonView + *
 {
+	 *     "crdnList": [조회결과 목록],
+	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
+	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
+	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
+	 * }
+ */ + @RequestMapping(name="민원답변대상자료 목록", value="/030/list.do") + public ModelAndView selectCivilComplaintAnswerTargetDataList(CrdnQuery req) { + req.setGrid("answerTargetData"); + setFetchSize(req); + return setCollectionInfo( + new ModelAndView("jsonView"), + crdn01Service.getCrackdownList(req), + "crdn" + ); + } + /**민원자료 목록을 조회한다.
* {@link Crdn01Service#getCrackdownList(CrdnQuery)} 참고 * @param req 민원자료 목록 조회 조건 @@ -35,8 +79,8 @@ public class Crdn01Controller extends ApplicationController { * "crdnTotal": 조회 결과 찾은 전체 건 수 * } */ - @RequestMapping(name="민원자료 목록", value="/010/list.do") - public ModelAndView getCivilComplaintListList(CrdnQuery req) { + @RequestMapping(name="민원자료 목록", value="/040/list.do") + public ModelAndView getCivilComplaintList(CrdnQuery req) { setFetchSize(req); return setCollectionInfo( new ModelAndView("jsonView"), diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml index 5052e8dc..edf61ffb 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -110,7 +110,7 @@ SELECT C.CRDN_ID , C.DEL_DT , C.DEL_RSN FROM TB_CRDN C -LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID) +INNER 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) LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID) LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID) @@ -171,7 +171,7 @@ SELECT C.CRDN_ID , C.VHRNO FROM TB_CRDN C - LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID) + INNER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID) WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} @@ -198,7 +198,7 @@ SELECT C.CRDN_ID FROM TB_CRDN C - LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID) + INNER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID) WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd}