diff --git a/src/main/java/cokr/xit/fims/sprt/service/CvlcptDscsnService.java b/src/main/java/cokr/xit/fims/sprt/service/CvlcptDscsnService.java
index 5de6c517..2f348b4b 100644
--- a/src/main/java/cokr/xit/fims/sprt/service/CvlcptDscsnService.java
+++ b/src/main/java/cokr/xit/fims/sprt/service/CvlcptDscsnService.java
@@ -36,12 +36,18 @@ public interface CvlcptDscsnService {
*/
DataObject getCvlcptDscsnNocs(CvlcptDscsnQuery req);
- /**지정한 조건에 따라 민원 상담 내용을 반환한다.
+ /**지정한 조건에 따라 민원 상담 정보를 반환한다.
* @param cvlcptDscsnId 민원 상담 ID
- * @return 부과제외 정보
+ * @return 민원 상담 내용 정보
*/
DataObject getCvlcptDscsnInfo(CvlcptDscsnQuery req);
+ /**지정한 조건에 따라 단속 정보를 반환한다.
+ * @param crdnId 단속 ID
+ * @return 단속 정보
+ */
+ DataObject getCrdnInfo(CvlcptDscsnQuery req);
+
/**민원 상담 내용 정보를 등록한다.
* @param cvlcptDscsnCn 민원 상담 내용
* @return 저장 여부
diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/CvlcptDscsnServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/CvlcptDscsnServiceBean.java
index 6c088aea..145a7d19 100644
--- a/src/main/java/cokr/xit/fims/sprt/service/bean/CvlcptDscsnServiceBean.java
+++ b/src/main/java/cokr/xit/fims/sprt/service/bean/CvlcptDscsnServiceBean.java
@@ -46,13 +46,14 @@ public class CvlcptDscsnServiceBean extends AbstractServiceBean implements Cvlcp
@Override
public DataObject getCvlcptDscsnInfo(CvlcptDscsnQuery req) {
- if (req.getCvlcptDscsnId() != null) {
- return cvlcptDscsnBean.getCvlcptDscsnInfo(req);
- } else {
- return cvlcptDscsnBean.getCrdnInfo(req);
- }
+ return cvlcptDscsnBean.getCvlcptDscsnInfo(req);
}
+ @Override
+ public DataObject getCrdnInfo(CvlcptDscsnQuery req) {
+ return cvlcptDscsnBean.getCrdnInfo(req);
+ }
+
@Override
public String createCvlcptDscsn(CvlcptDscsn cvlcptDscsn) {
return cvlcptDscsnBean.createCvlcptDscsn(cvlcptDscsn);
diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java
index 4de2eac4..cc1a2b91 100644
--- a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java
+++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java
@@ -45,17 +45,17 @@ public class Sprt04Controller extends ApplicationController {
public static final String CLASS_URL = "/sprt/sprt04";
- public class METHOD_URL {
+ public class METHOD_URL {
public static final String
- civilComplaintDiscussionMain = "/010/main.do" // 민원 상담 관리 메인 화면
- , getCvlcptDscsnList = "/010/list.do" // 민원 상담 내용 대장 목록 조회
- , getCvlcptDscsnNocs = "/010/nocs.do" // 민원 상담 내용 건수 조회
- , getCvlcptDscsnInfo = "/020/info.do" // 민원 상담 내용 정보 조회
- , createCvlcptDscsn = "/020/create.do" // 민원 상담 내용 대장 등럭
- , updateCvlcptDscsn = "/020/update.do" // 민원 상담 내용 대장 수정
- , removeCvlcptDscsn = "/010/remove.do" // 민원 상담 내용 대장 삭제
- ;
- }
+ civilComplaintDiscussionMain = "/010/main.do" // 민원 상담 관리 메인 화면
+ , getCivilComplaintDiscussionList = "/010/list.do" // 민원 상담 내용 대장 목록 조회
+ , getCivilComplaintDiscussionNocs = "/010/nocs.do" // 민원 상담 내용 건수 조회
+ , getCivilComplaintDiscussionInfo = "/020/info.do" // 민원 상담 내용 정보 조회
+ , createCivilComplaintDiscussion = "/020/create.do" // 민원 상담 내용 대장 등럭
+ , updateCivilComplaintDiscussion = "/020/update.do" // 민원 상담 내용 대장 수정
+ , removeCivilComplaintDiscussion = "/010/remove.do" // 민원 상담 내용 대장 삭제
+ ;
+ }
/**민원 상담 내용 서비스*/
@Resource(name = "cvlcptDscsnService")
@@ -78,11 +78,11 @@ public class Sprt04Controller extends ApplicationController {
// View(jsp)에서 사용할 공통코드를 조회
Map> commonCodes = getCodesOf("FIM054");
- return mav.addObject("pageName", "sprt04010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix
- .addObject("infoPrefix", "cvlcptDscsn") // prefix
- .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl
- .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD)
- .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054")))
+ return mav
+ .addObject("pageName", "sprt04010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix
+ .addObject("prefixUrl", CLASS_URL) // prefixUrl
+ .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD)
+ .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054")))
;
}
@@ -98,11 +98,11 @@ public class Sprt04Controller extends ApplicationController {
* }
*/
@Task
- @RequestMapping(name="민원 상담 대장 목록 조회", value=METHOD_URL.getCvlcptDscsnList)
- public ModelAndView getCvlcptDscsnList(CvlcptDscsnQuery req) {
+ @RequestMapping(name="민원 상담 대장 목록 조회", value=METHOD_URL.getCivilComplaintDiscussionList)
+ public ModelAndView getCivilComplaintDiscussionList(CvlcptDscsnQuery req) {
if (!"xls".equals(req.getDownload())) {
List result = cvlcptDscsnService.getCvlcptDscsnList(setFetchSize(req));
- return setCollectionInfo(new ModelAndView("jsonView"), result, "cvlcptDscsn");
+ return setPagingInfo(new ModelAndView("jsonView"), result, "");
} else {
// 현재 날짜 구하기
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -152,8 +152,8 @@ public class Sprt04Controller extends ApplicationController {
* }
*/
@Task
- @RequestMapping(name="민원 상담 대장 건수 조회", value=METHOD_URL.getCvlcptDscsnNocs)
- public ModelAndView getCvlcptDscsnNocs(CvlcptDscsnQuery req) {
+ @RequestMapping(name="민원 상담 대장 건수 조회", value=METHOD_URL.getCivilComplaintDiscussionNocs)
+ public ModelAndView getCivilComplaintDiscussionNocs(CvlcptDscsnQuery req) {
DataObject result = cvlcptDscsnService.getCvlcptDscsnNocs(req);
boolean json = jsonResponse();
@@ -170,23 +170,27 @@ public class Sprt04Controller extends ApplicationController {
* }
*/
@Task
- @RequestMapping(name="민원 상담 정보 조회", value=METHOD_URL.getCvlcptDscsnInfo)
- public ModelAndView getCvlcptDscsnInfo(HttpServletRequest hReq, CvlcptDscsnQuery req) {
- DataObject cvlcptDscsnInfo = cvlcptDscsnService.getCvlcptDscsnInfo(req);
-
+ @RequestMapping(name="민원 상담 정보 조회", value=METHOD_URL.getCivilComplaintDiscussionInfo)
+ public ModelAndView getCivilComplaintDiscussionInfo(HttpServletRequest hReq, CvlcptDscsnQuery req) {
boolean json = jsonResponse();
ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt04020-info");
+ DataObject cvlcptDscsnInfo = new DataObject();
+ if (req.getCvlcptDscsnId() != null) {
+ cvlcptDscsnInfo = cvlcptDscsnService.getCvlcptDscsnInfo(req);
+ } else {
+ cvlcptDscsnInfo = cvlcptDscsnService.getCrdnInfo(req);
+ }
+
// View(jsp)에서 사용할 공통코드를 조회
Map> commonCodes = getCodesOf("FIM065");
return mav
- .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName
- .addObject("callPurpose", req.getCallPurpose()) // 호출 용도
- .addObject("pageName", "sprt04020") //
- .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl
- .addObject("FIM065List", commonCodes.get("FIM065")) // 민원 접수 구분 코드(CVLCPT_RCPT_SE_CD)
- .addObject("cvlcptDscsnInfo", json ? cvlcptDscsnInfo : toJson(cvlcptDscsnInfo)) // 민원 상담 정보
+ .addObject("callPurpose", req.getCallPurpose()) // 호출 용도
+ .addObject("pageName", "sprt04020") // jsp pageName
+ .addObject("prefixUrl", CLASS_URL) // prefixUrl
+ .addObject("FIM065List", commonCodes.get("FIM065")) // 민원 접수 구분 코드(CVLCPT_RCPT_SE_CD)
+ .addObject("info", json ? cvlcptDscsnInfo : toJson(cvlcptDscsnInfo)) // 민원 상담 정보
;
}
@@ -198,8 +202,8 @@ public class Sprt04Controller extends ApplicationController {
* }
*/
@Task
- @RequestMapping(name="민원 상담 대장 등록", value=METHOD_URL.createCvlcptDscsn)
- public ModelAndView createCvlcptDscsn(CvlcptDscsn cvlcptDscsn) {
+ @RequestMapping(name="민원 상담 대장 등록", value=METHOD_URL.createCivilComplaintDiscussion)
+ public ModelAndView createCivilComplaintDiscussion(CvlcptDscsn cvlcptDscsn) {
boolean saved = false;
String rtnMsg = cvlcptDscsnService.createCvlcptDscsn(cvlcptDscsn);
@@ -222,8 +226,8 @@ public class Sprt04Controller extends ApplicationController {
* }
*/
@Task
- @RequestMapping(name="민원 상담 대장 수정", value=METHOD_URL.updateCvlcptDscsn)
- public ModelAndView updateCvlcptDscsn(CvlcptDscsn cvlcptDscsn) {
+ @RequestMapping(name="민원 상담 대장 수정", value=METHOD_URL.updateCivilComplaintDiscussion)
+ public ModelAndView updateCivilComplaintDiscussion(CvlcptDscsn cvlcptDscsn) {
boolean saved = false;
String rtnMsg = cvlcptDscsnService.updateCvlcptDscsn(cvlcptDscsn);
@@ -247,8 +251,8 @@ public class Sprt04Controller extends ApplicationController {
* }
*/
@Task
- @RequestMapping(name="민원 상담 대장 삭제", value=METHOD_URL.removeCvlcptDscsn)
- public ModelAndView removeCvlcptDscsn(CvlcptDscsn cvlcptDscsn) {
+ @RequestMapping(name="민원 상담 대장 삭제", value=METHOD_URL.removeCivilComplaintDiscussion)
+ public ModelAndView removeCivilComplaintDiscussion(CvlcptDscsn cvlcptDscsn) {
boolean saved = false;
String rtnMsg = cvlcptDscsnService.removeCvlcptDscsn(cvlcptDscsn);
diff --git a/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml
index b8559936..279eb6ec 100644
--- a/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml
@@ -11,8 +11,8 @@
+
-
@@ -34,9 +34,9 @@
SELECT CD.CVLCPT_DSCSN_ID
, CD.SGG_CD
, CD.TASK_SE_CD
- , CD.CVLCPT_RCPT_SE_CD
- , (SELECT GET_CODE_NM('FIM065', CD.CVLCPT_RCPT_SE_CD) FROM DUAL) AS CVLCPT_RCPT_SE_NM
, CD.CRDN_ID
+ , CD.CVLCPT_RCPT_SE_CD
+ , (GET_CODE_NM('FIM065', CD.CVLCPT_RCPT_SE_CD)) AS CVLCPT_RCPT_SE_NM
, CD.VHRNO
, CD.RTPYR_NO
, CD.DSCSN_YMD
@@ -69,21 +69,75 @@
AND CD.DSCSN_YMD #{schDscsnYmdTo}
- AND CD.VHRNO = #{schVhrno}
+ AND CD.VHRNO = #{schVhrno}
- AND CD.RTPYR_NO = #{schRtpyrNo}
+ AND CD.RTPYR_NO = #{schRtpyrNo}
- AND CD.CVLPR_NM = #{schCvlprNm}
+ AND CD.CVLPR_NM = #{schCvlprNm}
- AND CD.SGG_CD = #{sggCd}
+ AND CD.SGG_CD = #{sggCd}
- AND CD.TASK_SE_CD = #{taskSeCd}
+ AND CD.TASK_SE_CD= #{taskSeCd}
+
+ AND CD.DEL_YN = 'N'
+
+
+
+ AND CD.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000')
+
+
+ AND CD.REG_DT CONCAT(#{schRegDateTo},'235959')
+
+
+
+
+ AND CD.MDFCN_DT =]]> CONCAT(#{schRegDateFrom},'000000')
+
+
+ AND CD.MDFCN_DT CONCAT(#{schRegDateTo},'235959')
+
+
+
+
+
+
+
+
+ AND CD.RGTR = #{schRgtrCd}
+
+
+
+
+ AND CD.MDFR = #{schRgtrCd}
+
+
+
+
+
+
+
+
+
+
+ CD.CVLCPT_RCPT_SE_CD
+ CD.VHRNO
+ CD.RTPYR_NO
+ CD.DSCSN_YMD
+ CD.WEEK_NM
+ CD.CVLPR_NM
+ CD.CVLPR_CTTPC
+ CD.DSCSN_CN
+
+ #{term}
+
+
+
+
- AND CD.DEL_YN = 'N'