diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java index 86f608bf..2a3d7eb6 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java @@ -18,10 +18,10 @@ public interface Crdn05Mapper extends AbstractMapper { /**단속자료 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param req 단속자료 목록 조회 조건 + * @param query 단속자료 목록 조회 조건 * @return 단속자료 목록 */ - List selectCrackdownList(CrdnQuery req); + List selectCrackdownList(CrdnQuery query); /**단속 대장 정보를 등록한다. * @param params 파라미터 diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java index 9680b465..d6ea3e02 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java @@ -7,7 +7,6 @@ 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.component.QueryRequest; import cokr.xit.foundation.data.DataObject; /**단속 관리 DAO @@ -21,35 +20,35 @@ public interface Crdn06Mapper extends AbstractMapper { * @param query 단속자료 목록 조회 조건 * @return 단속자료 목록 */ - List selectCrackdownList(CrdnQuery crdnQuery); + List selectCrackdownList(CrdnQuery query); /**단속사진 검사 자료 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고 * @param query 단속사진 검사 자료 목록 조회 조건 * @return 단속사진 검사 자료 목록 */ - List selectPhotoInspectionDataList(CrdnQuery crdnQuery); + List selectPhotoInspectionDataList(CrdnQuery query); /**동일 차량 단속 그룹 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고 * @param query 동일 차량 단속 그룹 목록 조회 조건 * @return 동일 차량 단속 그룹 목록 */ - List selectSameVehicleMainList(CrdnQuery crdnQuery); + List selectSameVehicleMainList(CrdnQuery query); /**동일 차량 단속 자료 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고 * @param query 동일 차량 단속 자료 목록 조회 조건 * @return 동일 차량 단속 자료 목록 */ - List selectSameVehicleSubList(CrdnQuery crdnQuery); + List selectSameVehicleSubList(CrdnQuery query); /**표지정보 미확인 자료 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고 * @param query 표지정보 미확인 자료 목록 조회 조건 * @return 표지정보 미확인 자료 목록 */ - List selectTagInformationUndefinedDataList(CrdnQuery crdnQuery); + List selectTagInformationUndefinedDataList(CrdnQuery query); /**표지정보 미확인 자료를 확인 자료로 수정한다. * @param crdn 단속 대장 @@ -62,7 +61,7 @@ public interface Crdn06Mapper extends AbstractMapper { * @param query 과태료 감경 자료 목록 조회 조건 * @return 과태료 감경 자료 목록 */ - List selectFineReductionDataList(QueryRequest crdnQuery); + List selectFineReductionDataList(CrdnQuery query); /**단속정보를 변경한다.
* {@link cokr.xit.fims.crdn.service.bean.Crdn06Bean#update(Crdn)} 참고 diff --git a/src/main/java/cokr/xit/fims/crdn/dao/CrdnCvlcptMapper.java b/src/main/java/cokr/xit/fims/crdn/dao/CrdnCvlcptMapper.java index 6da97872..64595f37 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/CrdnCvlcptMapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/CrdnCvlcptMapper.java @@ -59,7 +59,7 @@ public interface CrdnCvlcptMapper extends AbstractMapper { * @param query 민원접수 초기자료 조회 조건 * @return 민원접수 초기자료 */ - DataObject selectCivilComplaintReceiptInitialDataInfo(CrdnQuery req); + DataObject selectCivilComplaintReceiptInitialDataInfo(CrdnQuery query); /**단속민원을 등록한다. * @param cvlcpt 단속민원 diff --git a/src/main/java/cokr/xit/fims/crdn/service/CrdnCvlcptService.java b/src/main/java/cokr/xit/fims/crdn/service/CrdnCvlcptService.java index ab7e60f1..75cad978 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/CrdnCvlcptService.java +++ b/src/main/java/cokr/xit/fims/crdn/service/CrdnCvlcptService.java @@ -5,49 +5,50 @@ import java.util.Map; import cokr.xit.base.file.FileInfo; import cokr.xit.fims.crdn.Crdn; +import cokr.xit.fims.crdn.CrdnCvlcpt; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.foundation.data.DataObject; public interface CrdnCvlcptService { /** 민원 목록을 조회한다. - * @param crdnQuery 조회 요청 + * @param query 조회 요청 * @return 민원 목록 */ - List getCrackdownList(CrdnQuery crdnQuery); + List getCrackdownList(CrdnQuery query); /** 민원 원본 상세정보를 조회한다. - * @param crdnQuery 조회 요청 + * @param query 조회 요청 * @return 민원원본정보 */ - DataObject getCivilComplaintOriginalInfo(CrdnQuery crdnQuery); + DataObject getCivilComplaintOriginalInfo(CrdnQuery query); /** 민원 답변 미리보기 정보를 조회한다. - * @param crdnQuery 조회 요청 + * @param query 조회 요청 * @return 민원 답변 정보 */ - DataObject getAnswerPreview(CrdnQuery crdnQuery); + DataObject getAnswerPreview(CrdnQuery query); /** 민원접수 초기자료 상세정보를 조회한다. - * @param crdnQuery 조회 요청 + * @param query 조회 요청 * @return 민원초기자료 정보 */ - DataObject getCivilComplaintReceiptInitialDataInfo(CrdnQuery crdnQuery); + DataObject getCivilComplaintReceiptInitialDataInfo(CrdnQuery query); /** 한글 서식 출력물을 생성한다. - * @param crdnQuery 출력 요청 + * @param query 출력 요청 * @return map 출력 요청 결과 *
  • filePath: 결과 파일 경로
    • *
  • fileName: 다운로드 파일명
    • *
*/ - Map makeFileFromHwpFormat(CrdnQuery crdnQuery); + Map makeFileFromHwpFormat(CrdnQuery query); /** 단속민원 부과요청을 수용한다. * @param crdn 단속정보, newFileInfoList 업로드 파일 목록 * @return 저장여부 */ - boolean updateCvlcptPrcs(Map nonQueryRequest, Crdn crdn, List newFileInfoList); + boolean updateCvlcptPrcs(Map nonQueryRequest, CrdnCvlcpt crdnCvlcpt, Crdn crdn, List newFileInfoList); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java index ad2ee60b..e8838fe4 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java +++ b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java @@ -11,13 +11,13 @@ import cokr.xit.foundation.data.DataObject; public interface CrdnService { /** 단속자료 목록을 조회한다. - * @param req 단속자료 목록 조회 조건 + * @param query 단속자료 목록 조회 조건 *
  • pageNum: 페이지 번호
    • *
  • fetchSize: 페이지 목록 건수
    • *
* @return 단속자료 목록 */ - List getCrackdownList(CrdnQuery req); + List getCrackdownList(CrdnQuery query); /** 단속자료를 삭제한다. * @param crdnIDs 삭제할 단속자료 ID 목록 diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnCvlcptBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnCvlcptBean.java index 41eb32a3..49675cce 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnCvlcptBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnCvlcptBean.java @@ -41,11 +41,11 @@ public class CrdnCvlcptBean extends AbstractComponent { return crdn05Mapper.removeCrdn(paramMap) == 1 ? true : false; } - public DataObject getCivilComplaintOriginalInfo(CrdnQuery crdnQuery) { - if(ifEmpty(crdnQuery.getViewType(), () -> "").equals("hwp")) { - return crdnCvlcptMapper.selectCivilComplaintOriginalInfoHwp(crdnQuery); + public DataObject getCivilComplaintOriginalInfo(CrdnQuery query) { + if(ifEmpty(query.getViewType(), () -> "").equals("hwp")) { + return crdnCvlcptMapper.selectCivilComplaintOriginalInfoHwp(query); } - return crdnCvlcptMapper.selectCivilComplaintOriginalInfo(crdnQuery); + return crdnCvlcptMapper.selectCivilComplaintOriginalInfo(query); } public boolean updateCvlcptPrcs(CrdnCvlcpt cvlcpt) { diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnCvlcptServiceBean.java index 69efe843..500e9260 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnCvlcptServiceBean.java @@ -54,17 +54,17 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv protected Crdn06Mapper crdn06Mapper; @Override - public List getCrackdownList(CrdnQuery crdnQuery) { + public List getCrackdownList(CrdnQuery query) { List dataObjectList = new ArrayList(); - switch (ifEmpty(crdnQuery.getGridType(), () -> "")) { + switch (ifEmpty(query.getGridType(), () -> "")) { case "receiptData": - dataObjectList = crdnCvlcptMapper.selectCivilComplaintReceiptDataList(crdnQuery.setOrderBy("CVLCPT_RCPT_YMD")); + dataObjectList = crdnCvlcptMapper.selectCivilComplaintReceiptDataList(query.setOrderBy("CVLCPT_RCPT_YMD")); break; case "answerTargetData": - dataObjectList = crdnCvlcptMapper.selectCivilComplaintAnswerTargetDataList(crdnQuery.setOrderBy("CRDN_ID")); + dataObjectList = crdnCvlcptMapper.selectCivilComplaintAnswerTargetDataList(query.setOrderBy("CRDN_ID")); break; default: - dataObjectList = crdnCvlcptMapper.selectCivilComplaintList(crdnQuery.setOrderBy("CRDN_ID")); + dataObjectList = crdnCvlcptMapper.selectCivilComplaintList(query.setOrderBy("CRDN_ID")); break; } @@ -73,12 +73,12 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } @Override - public Map makeFileFromHwpFormat(CrdnQuery crdnQuery) { + public Map makeFileFromHwpFormat(CrdnQuery query) { String baseFormatFilePath = ("classpath:format/cvlcptOrgnl_text.hwp"); String attachFormatFilePath = ("classpath:format/cvlcptOrgnl_photo.hwp"); - crdnQuery.setViewType("hwp"); - DataObject dataObject = crdnCvlcptBean.getCivilComplaintOriginalInfo(crdnQuery); + query.setViewType("hwp"); + DataObject dataObject = crdnCvlcptBean.getCivilComplaintOriginalInfo(query); SimpleDateFormat ymdhmsFormat = new SimpleDateFormat("yyyyMMddHHmmss"); SimpleDateFormat ymdFormat = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat ymdHypenFormat = new SimpleDateFormat("yyyy-MM-dd"); @@ -185,24 +185,24 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } @Override - public DataObject getCivilComplaintOriginalInfo(CrdnQuery req) { - return crdnCvlcptBean.getCivilComplaintOriginalInfo(req); + public DataObject getCivilComplaintOriginalInfo(CrdnQuery query) { + return crdnCvlcptBean.getCivilComplaintOriginalInfo(query); } @Override - public DataObject getAnswerPreview(CrdnQuery req) { - return crdnCvlcptMapper.selectAnswerPreview(req); + public DataObject getAnswerPreview(CrdnQuery query) { + return crdnCvlcptMapper.selectAnswerPreview(query); } @Override - public DataObject getCivilComplaintReceiptInitialDataInfo(CrdnQuery req) { + public DataObject getCivilComplaintReceiptInitialDataInfo(CrdnQuery query) { //민원조회 - DataObject dataObject = crdnCvlcptMapper.selectCivilComplaintReceiptInitialDataInfo(req); + DataObject dataObject = crdnCvlcptMapper.selectCivilComplaintReceiptInitialDataInfo(query); //첨부파일 조회 FileQuery fileQuery = new FileQuery(); fileQuery.setInfoType(Crdn.INF_TYPE); - fileQuery.setInfoKeys(req.getCrdnId()); + fileQuery.setInfoKeys(query.getCrdnId()); List fileList = fileBean.getFileList(fileQuery); if(fileList != null && !fileList.isEmpty()) { dataObject.set("fileList", fileList); @@ -260,9 +260,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv String acceptType = (String)nonQueryRequest.get("acceptType"); - if(acceptType.equals("someAccept")) { - ///call 부과제외 - } else if(acceptType.equals("nonAccept")) { + if(acceptType.equals("someAccept") || acceptType.equals("nonAccept")) { ///call 부과제외 } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java index eae34cbf..76bcaf82 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java @@ -57,37 +57,37 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService protected CrdnSttsHstryBean crdnSttsHstryBean; @Override - public List getCrackdownList(CrdnQuery req) { + public List getCrackdownList(CrdnQuery query) { List dataObjectList = new ArrayList(); - switch (ifEmpty(req.getGridType(), () -> "")) { + switch (ifEmpty(query.getGridType(), () -> "")) { case "tagInformationUndefinedData": - dataObjectList = crdn06Mapper.selectTagInformationUndefinedDataList(req.setOrderBy("CRDN_ID")); + dataObjectList = crdn06Mapper.selectTagInformationUndefinedDataList(query.setOrderBy("CRDN_ID")); break; case "fineReductionData": - dataObjectList = crdn06Mapper.selectFineReductionDataList(req.setOrderBy("CRDN_ID")); + dataObjectList = crdn06Mapper.selectFineReductionDataList(query.setOrderBy("CRDN_ID")); break; case "photo": - dataObjectList = crdn06Mapper.selectPhotoInspectionDataList(req.setOrderBy("VHRNO, CRDN_PLC")); + dataObjectList = crdn06Mapper.selectPhotoInspectionDataList(query.setOrderBy("VHRNO, CRDN_PLC")); break; case "sameVehicleMain": - dataObjectList = crdn06Mapper.selectSameVehicleMainList(req.setOrderBy("VHRNO")); + dataObjectList = crdn06Mapper.selectSameVehicleMainList(query.setOrderBy("VHRNO")); break; case "sameVehicleSub": - dataObjectList = crdn06Mapper.selectSameVehicleSubList(req.setOrderBy("CRDN_ID")); + dataObjectList = crdn06Mapper.selectSameVehicleSubList(query.setOrderBy("CRDN_ID")); break; case "todayInsert": - req.setCurrentUserId(currentUser().getId()); - req.setOrderBy("CRDN_ID"); - dataObjectList = crdn05Mapper.selectCrackdownList(req); + query.setCurrentUserId(currentUser().getId()); + query.setOrderBy("CRDN_ID"); + dataObjectList = crdn05Mapper.selectCrackdownList(query); break; default: - dataObjectList = crdn06Mapper.selectCrackdownList(req.setOrderBy("CRDN_ID")); + dataObjectList = crdn06Mapper.selectCrackdownList(query.setOrderBy("CRDN_ID")); break; } - if(ifEmpty(req.getGridType(), () -> "").equals("tagInformationUndefinedData") - || ifEmpty(req.getGridType(), () -> "").equals("fineReductionData")) { + if(ifEmpty(query.getGridType(), () -> "").equals("tagInformationUndefinedData") + || ifEmpty(query.getGridType(), () -> "").equals("fineReductionData")) { Iterator iterator = dataObjectList.iterator(); while(iterator.hasNext()) { DataObject dataObject = iterator.next(); @@ -100,7 +100,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService dataObject.set("BLNC", crdn06Bean.getBalance(state,advntceLevyAmt,levyAmt,minusAmt,adtnAmt,rcvmtAmt)); } - } else if(ifEmpty(req.getGridType(), () -> "").equals("photo")) { + } else if(ifEmpty(query.getGridType(), () -> "").equals("photo")) { Iterator iterator = dataObjectList.iterator(); while(iterator.hasNext()) { DataObject dataObject = iterator.next(); @@ -110,7 +110,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService dataObject.set("PRCS_MTHD", "해당자료에 사진을 등록하시기 바랍니다."); } else if(dataObject.number("CRDN_CNT").intValue() > 1) { dataObject.set("INSP_RSLT", "중복자료"); - if(req.getTaskSeCd().equals("PVS")) { + if(query.getTaskSeCd().equals("PVS")) { dataObject.set("PRCS_MTHD", "한건을 시간초과로 처리하십시요."); } else { dataObject.set("PRCS_MTHD", "한건을 서손으로 처리하십시요."); @@ -147,11 +147,14 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService crdn.setLevyAmt(basicAmt[0]); crdn.setAdvntceLevyAmt(basicAmt[1]); + if(ifEmpty(crdn.getCrdnSttsCd(), () -> "").equals("")){ + + //if(납부자정보) { + //crdn.setCrdnSttsCd("21"); + //} else { + crdn.setCrdnSttsCd("01"); + //} - if(ifEmpty((String)nonQueryRequest.get("doGuidance"), () -> "").equals("on")) { - crdn.setCrdnSttsCd("83"); - } else { - crdn.setCrdnSttsCd("01"); } 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 ea1babad..1a79d61c 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -19,6 +19,7 @@ import cokr.xit.base.file.FileInfo.Relation; import cokr.xit.base.file.web.FileInfoFactory; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.crdn.Crdn; +import cokr.xit.fims.crdn.CrdnCvlcpt; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.service.CrdnCvlcptService; import cokr.xit.fims.crdn.service.CrdnService; @@ -87,19 +88,19 @@ public class Crdn01Controller extends ApplicationController { * @return fims/crdn/crdn01050-info */ @RequestMapping(name="민원내역 원본 보기", value="/050/info.do") - public ModelAndView getCivilComplaintOriginalInfo(CrdnQuery req, HttpServletRequest request) { + public ModelAndView getCivilComplaintOriginalInfo(HttpServletRequest hReq, CrdnQuery query) { boolean json = jsonResponse(); ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn01050-info"); mav.addObject("pageName", "crdn01050-info"); - String urlTaskSeCd = request.getServletPath().split("/")[1]; + String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); Map> commonCodes = getCodesOf("FIM039"); mav.addObject("FIM039List", commonCodes.get("FIM039")); - DataObject info = crdnCvlcptService.getCivilComplaintOriginalInfo(req); + DataObject info = crdnCvlcptService.getCivilComplaintOriginalInfo(query); mav.addObject("cvlcptInfo", json ? info : toJson(info)); return mav; @@ -107,7 +108,7 @@ public class Crdn01Controller extends ApplicationController { /**민원접수자료 목록을 조회한다.
* {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param req 민원접수자료 목록 조회 조건 + * @param query 민원접수자료 목록 조회 조건 * @return jsonView * 
 {
 	 *     "crdnList": [조회결과 목록],
@@ -117,31 +118,31 @@ public class Crdn01Controller extends ApplicationController {
 	 * }
*/ @RequestMapping(name="민원접수자료 목록", value="/010/list.do") - public ModelAndView getCivilComplaintReceiptDataList(CrdnQuery req) { - req.setGridType("receiptData"); - setFetchSize(req); - return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCrackdownList(req),""); + public ModelAndView getCivilComplaintReceiptDataList(CrdnQuery query) { + query.setGridType("receiptData"); + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCrackdownList(query),""); } /**민원접수 초기자료 상세조회 팝업 화면을 연다.
* @return fims/crdn/crdn01020-info */ @RequestMapping(name="민원접수 초기자료 조회", value="/020/info.do") - public ModelAndView getCivilComplaintReceiptInitialDataInfo(CrdnQuery req, HttpServletRequest request) { + public ModelAndView getCivilComplaintReceiptInitialDataInfo(HttpServletRequest hReq, CrdnQuery query) { boolean json = jsonResponse(); String pageName = "crdn01020-info"; ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/"+pageName); mav.addObject("pageName", pageName); - String urlTaskSeCd = request.getServletPath().split("/")[1]; + String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); - DataObject info = crdnCvlcptService.getCivilComplaintReceiptInitialDataInfo(req); + DataObject info = crdnCvlcptService.getCivilComplaintReceiptInitialDataInfo(query); mav.addObject("crdnInfo", json ? info : toJson(info)); - mav.addObject("openerPageName", request.getParameter("openerPageName")); + mav.addObject("openerPageName", hReq.getParameter("openerPageName")); String vltnByTask = ""; @@ -180,7 +181,7 @@ public class Crdn01Controller extends ApplicationController { /**민원답변대상자료 목록을 조회한다.
* {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param req 민원답변대상자료 목록 조회 조건 + * @param query 민원답변대상자료 목록 조회 조건 * @return jsonView * 
 {
 	 *     "crdnList": [조회결과 목록],
@@ -190,15 +191,15 @@ public class Crdn01Controller extends ApplicationController {
 	 * }
*/ @RequestMapping(name="민원답변대상자료 목록", value="/030/list.do") - public ModelAndView selectCivilComplaintAnswerTargetDataList(CrdnQuery req) { - req.setGridType("answerTargetData"); - setFetchSize(req); - return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCrackdownList(req), ""); + public ModelAndView selectCivilComplaintAnswerTargetDataList(CrdnQuery query) { + query.setGridType("answerTargetData"); + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCrackdownList(query), ""); } /**민원자료 목록을 조회한다.
* {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param req 민원자료 목록 조회 조건 + * @param query 민원자료 목록 조회 조건 * @return jsonView * 
 {
 	 *     "crdnList": [조회결과 목록],
@@ -208,9 +209,9 @@ public class Crdn01Controller extends ApplicationController {
 	 * }
*/ @RequestMapping(name="민원자료 목록", value="/040/list.do") - public ModelAndView getCivilComplaintList(CrdnQuery req) { - setFetchSize(req); - return setCollectionInfo(new ModelAndView("jsonView"),crdnCvlcptService.getCrackdownList(req),""); + public ModelAndView getCivilComplaintList(CrdnQuery query) { + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"),crdnCvlcptService.getCrackdownList(query),""); } /**지정한 민원자료를 제거한다. @@ -239,12 +240,12 @@ public class Crdn01Controller extends ApplicationController { * } */ @RequestMapping(name="민원 정보 수정", value="/020/save.do") - public ModelAndView saveCivilComplaintProcess(HttpServletRequest req, Crdn crdn, MultipartFile[] newFileList, MultipartFile[] modifyFileList) { + public ModelAndView saveCivilComplaintProcess(HttpServletRequest hReq, CrdnCvlcpt crdnCvlcpt, Crdn crdn, MultipartFile[] newFileList, MultipartFile[] modifyFileList) { boolean saved = false; - String[] deleteFileKeyList = req.getParameterValues("deleteFileKeyList"); - String[] modifyFileKeyList = req.getParameterValues("modifyFileKeyList"); + String[] deleteFileKeyList = hReq.getParameterValues("deleteFileKeyList"); + String[] modifyFileKeyList = hReq.getParameterValues("modifyFileKeyList"); List newFileInfoList = new ArrayList(); if(newFileList != null || modifyFileList != null) { @@ -273,9 +274,9 @@ public class Crdn01Controller extends ApplicationController { Map nonQueryRequest = new HashMap(); nonQueryRequest.put("deleteFileKeyList", deleteFileKeyList); - String acceptType = req.getParameter("acceptType"); + String acceptType = hReq.getParameter("acceptType"); nonQueryRequest.put("acceptType", acceptType); - saved = crdnCvlcptService.updateCvlcptPrcs(nonQueryRequest, crdn, newFileInfoList); + saved = crdnCvlcptService.updateCvlcptPrcs(nonQueryRequest, crdnCvlcpt, crdn, newFileInfoList); return new ModelAndView("jsonView") @@ -286,9 +287,9 @@ public class Crdn01Controller extends ApplicationController { * @return hwp파일 */ @RequestMapping(name="민원내역 원본 한글 파일 생성", value="/050/makeFileFromHwpFormat.do") - public ModelAndView makeFileFromHwpFormat(CrdnQuery crdnQuery, HttpServletRequest request) { + public ModelAndView makeFileFromHwpFormat(CrdnQuery query) { - Map result = crdnCvlcptService.makeFileFromHwpFormat(crdnQuery); + Map result = crdnCvlcptService.makeFileFromHwpFormat(query); ModelAndView mav = new ModelAndView("jsonView"); mav.addAllObjects(result); return mav; @@ -298,16 +299,16 @@ public class Crdn01Controller extends ApplicationController { * @return */ @RequestMapping(name="민원답변내용 미리보기", value="/060/info.do") - public ModelAndView answerPreviewInfo(CrdnQuery req, HttpServletRequest request) { + public ModelAndView answerPreviewInfo(HttpServletRequest hReq, CrdnQuery query) { boolean json = jsonResponse(); ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn01060-info"); mav.addObject("pageName", "crdn01060-info"); - String urlTaskSeCd = request.getServletPath().split("/")[1]; + String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); - req.setTaskSeCd(urlTaskSeCd); - DataObject cvlcptInfo = crdnCvlcptService.getAnswerPreview(req); + query.setTaskSeCd(urlTaskSeCd); + DataObject cvlcptInfo = crdnCvlcptService.getAnswerPreview(query); mav.addObject("cvlcptInfo", json ? cvlcptInfo : toJson(cvlcptInfo)); return mav; diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index d6bd45a3..6d91fb45 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -55,7 +55,7 @@ public class Crdn05Controller extends ApplicationController { /**당일 등록한 단속자료 목록을 조회한다. * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param req 단속자료 목록 조회 조건 + * @param query 단속자료 목록 조회 조건 * @return jsonView * 
 {
 	 *     "crdnList": [조회결과 목록],
@@ -65,10 +65,10 @@ public class Crdn05Controller extends ApplicationController {
 	 * }
*/ @RequestMapping(name="당일 입력 단속자료 목록 조회", value="/010/list.do") - public ModelAndView getTodayCrdnDataList(CrdnQuery req) { - setFetchSize(req); - req.setGridType("todayInsert"); - return setCollectionInfo(new ModelAndView("jsonView"),crdnService.getCrackdownList(req),""); + public ModelAndView getTodayCrdnDataList(CrdnQuery query) { + setFetchSize(query); + query.setGridType("todayInsert"); + return setCollectionInfo(new ModelAndView("jsonView"),crdnService.getCrackdownList(query),""); } /**단속자료 수기 등록 팝업화면을 반환한다. @@ -76,11 +76,11 @@ public class Crdn05Controller extends ApplicationController { * @return fims/crdn/crdn05030-info */ @RequestMapping(name="단속자료 수기 등록 화면", value="/030/info.do") - public ModelAndView getManualRegistrationScreen(HttpServletRequest request) { + public ModelAndView getManualRegistrationScreen(HttpServletRequest hReq) { ModelAndView mav = new ModelAndView("fims/crdn/crdn05030-info"); mav.addObject("pageName", "crdn05030-info"); - String urlTaskSeCd = request.getServletPath().split("/")[1]; + String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); String vltnByTask = ""; @@ -126,7 +126,7 @@ public class Crdn05Controller extends ApplicationController { * } */ @PostMapping(name="단속자료 수기 등록", value="/030/create.do") - public ModelAndView createCrdnDataByManual(HttpServletRequest req, Crdn crdn, MultipartFile[] newFileList) { + public ModelAndView createCrdnDataByManual(HttpServletRequest hReq, Crdn crdn, MultipartFile[] newFileList) { boolean saved = false; crdn.setCrdnRegSeCd("01"); @@ -137,10 +137,11 @@ public class Crdn05Controller extends ApplicationController { fileInfoList = new FileInfoFactory().makeFileInfos(null, newFileList); } + String doGuidance = ifEmpty(hReq.getParameter("doGuidance"), () -> ""); + if(doGuidance.equals("on")) { + crdn.setCrdnSttsCd("83"); + } Map nonQueryRequest = new HashMap(); - - nonQueryRequest.put("doGuidance", req.getParameter("doGuidance")); - saved = crdnService.create(nonQueryRequest , crdn, fileInfoList); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index d19c3728..4b3a7397 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -87,7 +87,7 @@ public class Crdn06Controller extends ApplicationController { /**단속자료 목록을 조회한다.
* {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param req 단속자료 목록 조회 조건 + * @param query 단속자료 목록 조회 조건 * @return jsonView * 
 {
 	 *     "crdnList": [조회결과 목록],
@@ -97,14 +97,14 @@ public class Crdn06Controller extends ApplicationController {
 	 * }
*/ @RequestMapping(name="단속자료 목록", value="/010/list.do") - public ModelAndView getCrackdownList(CrdnQuery req) { - setFetchSize(req); - return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(req),""); + public ModelAndView getCrackdownList(CrdnQuery query) { + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } /**검사자료 목록을 조회한다.
* {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param req 검사자료 목록 조회 조건 + * @param query 검사자료 목록 조회 조건 * @return jsonView * 
 {
 	 *     "crdnList": [조회결과 목록],
@@ -114,19 +114,19 @@ public class Crdn06Controller extends ApplicationController {
 	 * }
*/ @RequestMapping(name="검사자료 목록", value="/020/list.do") - public ModelAndView getInspectionDataList(CrdnQuery req) { - switch(req.getInspectionDataType()) { - case "photo" -> req.setGridType("photo"); - case "sameVehicleMain" -> req.setGridType("sameVehicleMain"); - case "sameVehicleSub" -> req.setGridType("sameVehicleSub"); + public ModelAndView getInspectionDataList(CrdnQuery query) { + switch(query.getInspectionDataType()) { + case "photo" -> query.setGridType("photo"); + case "sameVehicleMain" -> query.setGridType("sameVehicleMain"); + case "sameVehicleSub" -> query.setGridType("sameVehicleSub"); } - setFetchSize(req); - return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(req),""); + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } /**감경자료 목록을 조회한다.
* {@link CrdnService#getCrackdownList(CrdnQuery)} 참고 - * @param req 감경자료 목록 조회 조건 + * @param query 감경자료 목록 조회 조건 * @return jsonView * 
 {
 	 *     "crdnList": [조회결과 목록],
@@ -136,9 +136,9 @@ public class Crdn06Controller extends ApplicationController {
 	 * }
*/ @RequestMapping(name="감경자료 목록", value="/040/list.do") - public ModelAndView getFineReductionDataList(CrdnQuery req) { - req.setGridType("fineReductionData"); - setFetchSize(req); - return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(req),""); + public ModelAndView getFineReductionDataList(CrdnQuery query) { + query.setGridType("fineReductionData"); + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } } diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java index 9d3d18de..988ef022 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java @@ -32,9 +32,9 @@ public class Sprt03ServiceBean extends AbstractServiceBean implements Sprt03Serv public DataObject getVideoInfo(String crdnId) { DataObject fileInfo = new DataObject(); - CrdnQuery crdnQuery = new CrdnQuery(); - crdnQuery.setCrdnId(crdnId); - DataObject cvlcptInfo = crdnCvlcptMapper.selectCivilComplaintReceiptInitialDataInfo(crdnQuery); + CrdnQuery query = new CrdnQuery(); + query.setCrdnId(crdnId); + DataObject cvlcptInfo = crdnCvlcptMapper.selectCivilComplaintReceiptInitialDataInfo(query); String linkTblNm = cvlcptInfo.string("LINK_TBL_NM"); if(!linkTblNm.equals("")) { FileQuery fileQuery = new FileQuery(); diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index b3170823..0530f55a 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -47,10 +47,10 @@ public class DpvController { * } */ @RequestMapping(name="장애인과태료업무 표지정보미확인자료 목록", value="/030/list.do") - public ModelAndView getTagInformationUndefinedDataList(CrdnQuery req) { - req.setGridType("tagInformationUndefinedData"); - setFetchSize(req); - return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(req),""); + public ModelAndView getTagInformationUndefinedDataList(CrdnQuery query) { + query.setGridType("tagInformationUndefinedData"); + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } /**표지정보 미확인 자료를 수정한다.