diff --git a/src/main/java/cokr/xit/fims/base/web/LoggingController.java b/src/main/java/cokr/xit/fims/base/web/LoggingController.java index e165186e..8aa8fe0a 100644 --- a/src/main/java/cokr/xit/fims/base/web/LoggingController.java +++ b/src/main/java/cokr/xit/fims/base/web/LoggingController.java @@ -121,5 +121,4 @@ public class LoggingController extends cokr.xit.base.syslog.web.LoggingControlle .setFilename("시스템 로그 목록.xlsx") ); } - } \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/web/CrdnPayerHstryController.java b/src/main/java/cokr/xit/fims/cmmn/web/CrdnPayerHstryController.java index 82d44231..f0aa227b 100644 --- a/src/main/java/cokr/xit/fims/cmmn/web/CrdnPayerHstryController.java +++ b/src/main/java/cokr/xit/fims/cmmn/web/CrdnPayerHstryController.java @@ -8,10 +8,10 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import cokr.xit.foundation.web.AbstractController; import cokr.xit.fims.cmmn.CrdnPayerAddrHstry; import cokr.xit.fims.cmmn.CrdnPayerHstryQuery; import cokr.xit.fims.cmmn.service.CrdnPayerAddrHstryService; +import cokr.xit.foundation.web.AbstractController; /**단속 납부자 이력 서비스의 웹 컨트롤러 * @@ -72,5 +72,4 @@ public class CrdnPayerHstryController extends AbstractController { return new ModelAndView("jsonView") .addObject("saved", saved); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/web/CrdnSttsHstryController.java b/src/main/java/cokr/xit/fims/cmmn/web/CrdnSttsHstryController.java index e04af5ef..20c4b648 100644 --- a/src/main/java/cokr/xit/fims/cmmn/web/CrdnSttsHstryController.java +++ b/src/main/java/cokr/xit/fims/cmmn/web/CrdnSttsHstryController.java @@ -8,11 +8,10 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import cokr.xit.foundation.web.AbstractController; - import cokr.xit.fims.cmmn.CrdnSttsHstry; import cokr.xit.fims.cmmn.CrdnSttsHstryQuery; import cokr.xit.fims.cmmn.service.CrdnSttsHstryService; +import cokr.xit.foundation.web.AbstractController; /**단속 상태 이력 서비스의 웹 컨트롤러 * @@ -101,4 +100,4 @@ public class CrdnSttsHstryController extends AbstractController { return new ModelAndView("jsonView") .addObject("saved", saved); } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/web/InterfaceController.java b/src/main/java/cokr/xit/fims/cmmn/web/InterfaceController.java index 09dae5e9..e546a579 100644 --- a/src/main/java/cokr/xit/fims/cmmn/web/InterfaceController.java +++ b/src/main/java/cokr/xit/fims/cmmn/web/InterfaceController.java @@ -35,6 +35,6 @@ public class InterfaceController extends ApplicationController { return new ModelAndView("jsonView") .addObject("received", !empty) .addObject("affected", affected) - .addObject("saved", true); + .addObject("saved", affected > 0); } } \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/web/LinkController.java b/src/main/java/cokr/xit/fims/cmmn/web/LinkController.java index ccb1e91c..668548ed 100644 --- a/src/main/java/cokr/xit/fims/cmmn/web/LinkController.java +++ b/src/main/java/cokr/xit/fims/cmmn/web/LinkController.java @@ -17,23 +17,17 @@ import cokr.xit.foundation.web.AbstractController; @Controller @RequestMapping(name = "연계 처리", value = "/link") public class LinkController extends AbstractController { - @Resource(name = "linkBean") private LinkBean linkBean; - @Resource(name = "linkService") private LinkService linkService; - @Resource(name = "ogdpBean") private OgdpBean ogdpBean; - @Resource(name = "extrStngMapper") private ExtrStngMapper extrStngMapper; @RequestMapping(name = "파일 처리", value = "/fileProcess.do") public ModelAndView fileProcess(String filePath, String job, String param) { - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = false; UserInfo userInfo = currentUser(); ogdpBean.initUserInfo(userInfo); @@ -43,20 +37,15 @@ public class LinkController extends AbstractController { DataObject dataObject = fromJson(param, DataObject.class); - //차세대 세외수입 pdf파일 정보 추출 - if(job.equals("01")) { + if("01".equals(job)) { String taskSeCd = dataObject.string("taskSeCd"); String tmplatId = dataObject.string("tmplatId"); linkService.insertElectronicNoticeSndng(filePath, sggCd, taskSeCd, tmplatId); - - } - mav.addObject("saved", saved); - return mav; + return new ModelAndView("jsonView") + .addObject("saved", saved); } - -} - +} \ No newline at end of file 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 c7bf7907..1cabe682 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -13,7 +13,6 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.ftp.RemoteSystemInfo; import cokr.xit.fims.cmmn.service.bean.StngBean; @@ -30,7 +29,6 @@ import cokr.xit.foundation.data.DataObject; @Controller @RequestMapping(name="장비단속 레이아웃 설정 관리", value=Crdn01Controller.CLASS_URL) public class Crdn01Controller extends ApplicationController { - public static final String CLASS_URL = "/crdn/crdn01"; public class METHOD_URL { @@ -46,10 +44,8 @@ public class Crdn01Controller extends ApplicationController { @Resource(name = "stngBean") private StngBean stngBean; - @Resource(name = "userMapper") private UserMapper userMapper; - @Resource(name = "crdnStngService") private CrdnStngService crdnStngService; @@ -58,18 +54,15 @@ public class Crdn01Controller extends ApplicationController { */ @RequestMapping(name="장비단속 레이아웃 설정 관리 메인", value=METHOD_URL.linkFileLayoutMain) public ModelAndView linkFileLayoutMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn01010-main"); - mav.addObject("pageName", "crdn01010"); - Map> commonCodes = getCodesOf("FIM002", "FIM003","FIM054"); - mav.addObject("FIM002List", commonCodes.get("FIM002")); - mav.addObject("FIM003List", commonCodes.get("FIM003")); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); - addCodes(commonCodes, mav, "FIM002", "FIM003"); - return mav; + ModelAndView mav = new ModelAndView("fims/crdn/crdn01010-main") + .addObject("pageName", "crdn01010") + .addObject("FIM002List", commonCodes.get("FIM002")) + .addObject("FIM003List", commonCodes.get("FIM003")) + .addObject("FIM054List", commonCodes.get("FIM054")) + .addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); + return addCodes(commonCodes, mav, "FIM002", "FIM003"); } /**장비단속 레이아웃 목록을 조회한다.
@@ -80,14 +73,11 @@ public class Crdn01Controller extends ApplicationController { @Task @RequestMapping(name="장비단속파일 레이아웃 목록 조회", value=METHOD_URL.getLinkFileLayoutMetadataList) public ModelAndView getLinkFileLayoutMetadataList(CrdnQuery query) { - ModelAndView mav = new ModelAndView("jsonView"); setFetchSize(query); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - query.setSggCd(sggCd); + query.setSggCd(currentUser().getOrgID()); List list = crdnStngService.getLinkFileLayoutMetadataList(query); - return setPagingInfo(mav, list,""); + + return setPagingInfo(new ModelAndView("jsonView"), list,""); } /**장비단속 레이아웃 상세정보를 조회한다.
@@ -97,26 +87,15 @@ public class Crdn01Controller extends ApplicationController { @Task @RequestMapping(name="장비단속파일 레이아웃 상세정보 조회", value=METHOD_URL.getLinkFileLayoutMetadataInfo) public ModelAndView getLinkFileLayoutMetadataInfo(HttpServletRequest hReq, String fileLayoutId) { + String urlTaskSeCd = hReq.getServletPath().split("/")[1]; + DataObject info = !isEmpty(fileLayoutId) ? crdnStngService.getLinkFileLayoutMetadataInfo(fileLayoutId) : null; boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn01020-info"); - mav.addObject("pageName", "crdn01020"); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - mav.addObject("sggCd", sggCd); - - DataObject info = new DataObject(); - if(!ifEmpty(fileLayoutId, ()->"").equals("")) { - info = crdnStngService.getLinkFileLayoutMetadataInfo(fileLayoutId); - } else { - info = null; - } - mav.addObject("layoutInfo", json ? info : toJson(info)); - - String urlTaskSeCd = hReq.getServletPath().split("/")[1]; - mav.addObject("taskSeCd", urlTaskSeCd); - return mav; + return new ModelAndView(json ? "jsonView" : "fims/crdn/crdn01020-info") + .addObject("pageName", "crdn01020") + .addObject("sggCd", currentUser().getOrgID()) + .addObject("layoutInfo", json ? info : toJson(info)) + .addObject("taskSeCd", urlTaskSeCd); } /**장비단속파일 레이아웃을 등록한다.
@@ -126,16 +105,9 @@ public class Crdn01Controller extends ApplicationController { @Task @RequestMapping(name="장비단속파일 레이아웃 등록", value=METHOD_URL.createLinkFileLayoutMetadata) public ModelAndView createLinkFileLayoutMetadata(LayoutDescriptor layoutDescriptor, RemoteSystemInfo remoteSystemInfo) { - - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = false; - String rtnMsg = crdnStngService.createLinkFileLayoutMetadata(layoutDescriptor,remoteSystemInfo); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /**장비단속파일 레이아웃을 수정한다.
@@ -145,16 +117,9 @@ public class Crdn01Controller extends ApplicationController { @Task @RequestMapping(name="장비단속파일 레이아웃 수정", value=METHOD_URL.updateLinkFileLayoutMetadata) public ModelAndView updateLinkFileLayoutMetadata(LayoutDescriptor layoutDescriptor, RemoteSystemInfo remoteSystemInfo) { - - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = false; - String rtnMsg = crdnStngService.updateLinkFileLayoutMetadata(layoutDescriptor,remoteSystemInfo); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /**장비단속파일 레이아웃을 삭제한다.
@@ -164,16 +129,8 @@ public class Crdn01Controller extends ApplicationController { @Task @RequestMapping(name="장비단속파일 레이아웃 삭제", value=METHOD_URL.removeLinkFileLayoutMetadata) public ModelAndView removeLinkFileLayoutMetadata(String fileLayoutId) { - - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = false; - String rtnMsg = crdnStngService.removeLinkFileLayoutMetadata(fileLayoutId); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java index 5edd0c6a..c19bbb03 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -18,7 +18,6 @@ import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -50,16 +49,12 @@ public class Crdn02Controller extends ApplicationController { @Resource(name="crdnService") private CrdnService crdnService; - @Resource(name="crdnStngService") private CrdnStngService crdnStngService; - @Resource(name="crdnInfoMapper") private CrdnInfoMapper crdnInfoMapper; - @Resource(name="userMapper") protected UserMapper userMapper; - @Resource(name = "stngBean") private StngBean stngBean; @@ -68,19 +63,16 @@ public class Crdn02Controller extends ApplicationController { */ @RequestMapping(name="단속 자료 검사 메인", value=METHOD_URL.crackdownDataInspectionMain) public ModelAndView crackdownDataInspectionMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn02010-main"); - mav.addObject("pageName", "crdn02010"); - Map> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026","FIM054"); - mav.addObject("FIM002List", commonCodes.get("FIM002")); - mav.addObject("FIM003List", commonCodes.get("FIM003")); - mav.addObject("FIM010List", commonCodes.get("FIM010")); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); - addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); - - return mav; + + ModelAndView mav = new ModelAndView("fims/crdn/crdn02010-main") + .addObject("pageName", "crdn02010") + .addObject("FIM002List", commonCodes.get("FIM002")) + .addObject("FIM003List", commonCodes.get("FIM003")) + .addObject("FIM010List", commonCodes.get("FIM010")) + .addObject("FIM054List", commonCodes.get("FIM054")) + .addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); + return addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); } /**검사자료 목록을 조회한다.
@@ -96,11 +88,8 @@ public class Crdn02Controller extends ApplicationController { case "sameVehicleMain" -> query.setGridType("sameVehicleMain"); case "sameVehicleSub" -> query.setGridType("sameVehicleSub"); } - setFetchSize(query); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - query.setSggCd(sggCd); + setFetchSize(query) + .setSggCd(currentUser().getOrgID()); if("xls".equals(query.getDownload())) { @@ -153,15 +142,12 @@ public class Crdn02Controller extends ApplicationController { @Task("PVS") @RequestMapping(name="2시간 초과 처리 화면 호출", value=METHOD_URL.getOverTimeInfo) public ModelAndView getOverTimeInfo(String savedCallbackFuncName, String crdnId) { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn02050-info"); - mav.addObject("pageName","crdn02050"); - DataObject crdnInfo = crdnInfoMapper.selectCrdnInfo(crdnId); - mav.addObject("crdnInfo", toJson(crdnInfo)); - mav.addObject("savedCallbackFuncName", savedCallbackFuncName); - return mav; + return new ModelAndView("fims/crdn/crdn02050-info") + .addObject("pageName","crdn02050") + .addObject("crdnInfo", toJson(crdnInfo)) + .addObject("savedCallbackFuncName", savedCallbackFuncName); } /**단속자료의 2시간 초과여부를 변경하고, 금액을 수정한다.
@@ -174,12 +160,8 @@ public class Crdn02Controller extends ApplicationController { @Task("PVS") @RequestMapping(name="2시간 초과 정보 수정", value=METHOD_URL.updateOverTimeInfo) public ModelAndView updateOverTimeInfo(String chgAmtSe, String crdnId) { - boolean saved = false; String rtnMsg = crdnService.updateOverTimeInfo(chgAmtSe, crdnId); - if(rtnMsg.contains("[S]")) { - saved = true; - } return new ModelAndView("jsonView") - .addObject("saved", saved); + .addObject("saved", rtnMsg.contains("[S]")); } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java index 50572025..55fa3795 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -18,7 +18,6 @@ import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; import cokr.xit.fims.crdn.Crdn; @@ -48,10 +47,8 @@ public class Crdn03Controller extends ApplicationController { @Resource(name="crdnService") private CrdnService crdnService; - @Resource(name="crdnStngService") private CrdnStngService crdnStngService; - @Resource(name="userMapper") protected UserMapper userMapper; @@ -60,13 +57,10 @@ public class Crdn03Controller extends ApplicationController { */ @RequestMapping(name="표지정보 미확인 자료 메인", value=METHOD_URL.tagInformationUndefinedDataMain) public ModelAndView tagInformationUndefinedDataMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn03010-main"); - mav.addObject("pageName","crdn03010"); - Map> commonCodes = getCodesOf("FIM003", "FIM010"); - addCodes(commonCodes, mav, "FIM003", "FIM010"); - return mav; + + ModelAndView mav = new ModelAndView("fims/crdn/crdn03010-main").addObject("pageName","crdn03010"); + return addCodes(commonCodes, mav, "FIM003", "FIM010"); } /**표지정보미확인자료 목록을 조회한다.
@@ -77,12 +71,11 @@ public class Crdn03Controller extends ApplicationController { @Task("DPV") @RequestMapping(name="표지정보미확인자료 목록", value=METHOD_URL.getTagInformationUndefinedDataList) public ModelAndView getTagInformationUndefinedDataList(CrdnQuery query) { - query.setGridType("tagInformationUndefinedData"); - setFetchSize(query); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - query.setSggCd(sggCd); + setFetchSize( + query + .setGridType("tagInformationUndefinedData") + .setSggCd(currentUser().getOrgID()) + ); if("xls".equals(query.getDownload())) { @@ -127,13 +120,9 @@ public class Crdn03Controller extends ApplicationController { @Task("DPV") @RequestMapping(name="표지정보 미확인 자료 수정", value=METHOD_URL.updateTagInfo) public ModelAndView updateTagInfo(Crdn crdn) { - boolean saved = false; String rtnMsg = crdnService.updateTagInfo(crdn); - if(rtnMsg.contains("[S]")) { - saved = true; - } return new ModelAndView("jsonView") - .addObject("saved", saved); + .addObject("saved", rtnMsg.contains("[S]")); } -} +} \ No newline at end of file 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 75e05f38..cc42572a 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -248,8 +248,8 @@ public class Crdn05Controller extends ApplicationController { @RequestMapping(name="장비업체 단속파일 목록 조회", value=METHOD_URL.getEquipmentFileInfoList) public ModelAndView getEquipmentFileInfoList(HttpServletRequest hReq) { String taskSeCd = hReq.getParameter("taskSeCd"); - String institute = currentUser().getInstitute(); UserInfo currentUser = currentUser(); + String institute = currentUser.getInstitute(); String deptCd = currentUser.getDeptCode(); String sggCd = currentUser.getOrgID(); @@ -268,7 +268,7 @@ public class Crdn05Controller extends ApplicationController { try { //폴더는 제외하고 파일만 필터링 fileList = Files.walk(Paths.get(workPath)).filter(Files::isRegularFile).toList(); } catch (IOException e) { - throw new RuntimeException("파일 조회 오류."+e); + throw new RuntimeException("파일 조회 오류." + e); } if (isEmpty(fileList)) continue; @@ -356,8 +356,7 @@ public class Crdn05Controller extends ApplicationController { @RequestMapping(name="단속자료 수기 등록 화면", value=METHOD_URL.getManualRegistrationScreen) public ModelAndView getManualRegistrationScreen(HttpServletRequest hReq) { String urlTaskSeCd = hReq.getServletPath().split("/")[1]; - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); + String sggCd = currentUser().getOrgID(); List stdgNmList = crdnStngMapper.selectStdgNmList(sggCd); ModelAndView mav = new ModelAndView("fims/crdn/crdn05030-info") @@ -415,9 +414,8 @@ public class Crdn05Controller extends ApplicationController { List fileInfoList = !isEmpty(newFileList) ? new FileInfoFactory().makeFileInfos(null, newFileList) : Collections.emptyList(); String rtnMsg = crdnService.create(nonQueryRequest, crdn, fileInfoList); - boolean saved = rtnMsg.contains("[S]"); return new ModelAndView("jsonView") - .addObject("saved", saved); + .addObject("saved", rtnMsg.contains("[S]")); } } \ No newline at end of file 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 d6a1c9d7..607757ef 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -30,7 +30,6 @@ import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.base.file.web.FileInfoFactory; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -117,10 +116,7 @@ public class Crdn06Controller extends ApplicationController { @Task @RequestMapping(name="단속자료 목록", value=METHOD_URL.getCrackdownList) public ModelAndView getCrackdownList(CrdnQuery query) { - setFetchSize(query); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - query.setSggCd(currentUser.getOrgID()); + setFetchSize(query.setSggCd(currentUser().getOrgID())); if("xls".equals(query.getDownload())) { List cellDefs = fromJson(query.getCellDefs(), CellDef.listType()); @@ -179,11 +175,10 @@ public class Crdn06Controller extends ApplicationController { xlsx.cell(3, 0).rowValues(CellDef.header(cellDefs, () -> StyleMaker.headerStyle(xlsx))); xlsx.cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); - ModelAndView mav = new ModelAndView("downloadView"); - mav.addObject("download", xlsx.getDownloadable().setFilename("단속자료 목록.xlsx")); - mav.addObject("downloadData", list); - mav.addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); - return mav; + return new ModelAndView("downloadView") + .addObject("download", xlsx.getDownloadable().setFilename("단속자료 목록.xlsx")) + .addObject("downloadData", list) + .addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } return setPagingInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); @@ -200,17 +195,10 @@ public class Crdn06Controller extends ApplicationController { @Task @RequestMapping(name="단속자료 삭제", value=METHOD_URL.removeCrackdown) public ModelAndView removeCrackdown(Crdn crdn) { - boolean saved = false; String rtnMsg = crdnService.removeCrackdown(crdn); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) + .addObject("saved", rtnMsg.contains("[S]")) .addObject("rtnMsg", rtnMsg); } @@ -255,14 +243,12 @@ public class Crdn06Controller extends ApplicationController { @Task @RequestMapping(name="단속자료 상세 조회", value=METHOD_URL.getCrackdownInfo) public ModelAndView getCrackdownInfo(HttpServletRequest hReq, CrdnQuery query) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn06020-info"); - // 법정동 - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - List stdgNmList = crdnStngMapper.selectStdgNmList(sggCd); - mav.addObject("stdgNmList", stdgNmList); + List stdgNmList = crdnStngMapper.selectStdgNmList(currentUser().getOrgID()); + + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn06020-info") + .addObject("stdgNmList", stdgNmList); // 공통코드 - 위반 내역 코드 TaskProcessor taskProcessor = TaskProcessor.get(); @@ -289,9 +275,9 @@ public class Crdn06Controller extends ApplicationController { DataObject crdnInfo = crdnService.getCrackdownInfo(query); return mav - .addObject("pageName", "crdn06020") // jsp pageName - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("Info", json ? crdnInfo : toJson(crdnInfo)) + .addObject("pageName", "crdn06020") // jsp pageName + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("Info", json ? crdnInfo : toJson(crdnInfo)) ; } @@ -357,9 +343,8 @@ public class Crdn06Controller extends ApplicationController { @PostMapping(name= "단속 사진 추가", value = "/insertCrdnImageFile.do") public ModelAndView insertCrdnImageFile(String crdnId, int atchFileCnt, MultipartFile[] newFileList) { String retMessage = "[F] "; - if(newFileList == null || newFileList.length == 0 || newFileList[0] == null || newFileList[0].isEmpty()) { + if(newFileList == null || newFileList.length == 0 || newFileList[0] == null || newFileList[0].isEmpty()) throw new RuntimeException("파일 업로드 오류"); - } Relation relation = new Relation().setInfoType(Crdn.INF_TYPE).setInfoKey(crdnId); List newFileInfoList = new FileInfoFactory().makeFileInfos(relation, newFileList); @@ -384,13 +369,9 @@ public class Crdn06Controller extends ApplicationController { } @PostMapping(name= "단속 사진 수정", value = "/updateCrdnImageFile.do") - public ModelAndView updateCrdnImageFile(String crdnId, int atchFileCnt, - String beforeKey, int beforeOrder, MultipartFile modifyFile) { - String retMessage = "[F] "; - - if(modifyFile == null || modifyFile.isEmpty()) { + public ModelAndView updateCrdnImageFile(String crdnId, int atchFileCnt, String beforeKey, int beforeOrder, MultipartFile modifyFile) { + if(isEmpty(modifyFile)) throw new RuntimeException("파일 업로드 오류"); - } Relation relation = new Relation().setInfoType(Crdn.INF_TYPE).setInfoKey(crdnId); FileInfo modifyFileInfo = new FileInfoFactory().make(relation, modifyFile); @@ -403,7 +384,7 @@ public class Crdn06Controller extends ApplicationController { Crdn crdn = new Crdn(); crdn.setCrdnId(crdnId); crdn.setAtchFileCnt(atchFileCnt); - retMessage = crdnService.changeCrdnImageFile(crdn, processList); + String retMessage = crdnService.changeCrdnImageFile(crdn, processList); return new ModelAndView("jsonView") .addObject("saved", retMessage.contains("[S]")) @@ -412,11 +393,8 @@ public class Crdn06Controller extends ApplicationController { @PostMapping(name= "단속 사진 삭제", value = "/deleteCrdnImageFile.do") public ModelAndView deleteCrdnImageFile(String crdnId, int atchFileCnt, String[] deleteKeys) { - String retMessage = "[F] "; - - if(deleteKeys == null || deleteKeys.length == 0 || deleteKeys[0] == null || deleteKeys[0].isEmpty()) { + if(deleteKeys == null || deleteKeys.length == 0 || deleteKeys[0] == null || deleteKeys[0].isEmpty()) throw new RuntimeException("파일 삭제 오류"); - } List> processList = new ArrayList<>(); for(String deleteKey : deleteKeys) { @@ -426,7 +404,7 @@ public class Crdn06Controller extends ApplicationController { Crdn crdn = new Crdn(); crdn.setCrdnId(crdnId); crdn.setAtchFileCnt(atchFileCnt); - retMessage = crdnService.changeCrdnImageFile(crdn, processList); + String retMessage = crdnService.changeCrdnImageFile(crdn, processList); return new ModelAndView("jsonView") .addObject("saved", retMessage.contains("[S]")) @@ -435,8 +413,6 @@ public class Crdn06Controller extends ApplicationController { @PostMapping(name= "단속 사진 순서 변경", value = "/changeOrderCrdnImageFile.do") public ModelAndView changeOrderCrdnImageFile(String crdnId, int atchFileCnt, String[] orderedKeys) { - String retMessage = "[F] "; - if(orderedKeys == null || orderedKeys.length == 0 || orderedKeys[0] == null || orderedKeys[0].isEmpty()) throw new RuntimeException("파일 순서 변경 오류"); @@ -448,18 +424,15 @@ public class Crdn06Controller extends ApplicationController { Crdn crdn = new Crdn(); crdn.setCrdnId(crdnId); crdn.setAtchFileCnt(atchFileCnt); - retMessage = crdnService.changeCrdnImageFile(crdn, processList); + String retMessage = crdnService.changeCrdnImageFile(crdn, processList); return new ModelAndView("jsonView") .addObject("saved", retMessage.contains("[S]")) .addObject("retMessage", retMessage); - } @RequestMapping(name= "단속 사진 목록", value = "/fileList.do") public ModelAndView getFileList(FileQuery req) { - ModelAndView mav = new ModelAndView("jsonView"); - String infoType = ifEmpty(req.getInfoType(), () -> ""); boolean singleKey = (req.getInfoKeys() != null && req.getInfoKeys().length == 1); @@ -483,14 +456,10 @@ public class Crdn06Controller extends ApplicationController { } else { fileInfo.set("MOSAIC", ""); } - } - mav = setPagingInfo(mav, fileInfoList, "file"); - //민원 동영상파일 첨부 여부 String cvlcptVideoExistYn = "N"; if(infoType.equals(Crdn.INF_TYPE) && singleKey) { - DataObject dataObject = crdnInfoMapper.selectCrdnInfo(req.getInfoKeys()[0]); String linkTblNm = dataObject.string("LINK_TBL_NM"); @@ -516,8 +485,7 @@ public class Crdn06Controller extends ApplicationController { } } } - mav.addObject("cvlcptVideoExistYn", cvlcptVideoExistYn); - - return mav; + return setPagingInfo(new ModelAndView("jsonView"), fileInfoList, "file") + .addObject("cvlcptVideoExistYn", cvlcptVideoExistYn); } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java index 26c34f9d..e37e7c8e 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java @@ -12,7 +12,6 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.Team; @@ -42,10 +41,8 @@ public class Crdn07Controller extends ApplicationController { @Resource(name="crdnStngService") private CrdnStngService crdnStngService; - @Resource(name="userMapper") protected UserMapper userMapper; - @Resource(name = "stngBean") private StngBean stngBean; @@ -54,19 +51,17 @@ public class Crdn07Controller extends ApplicationController { */ @RequestMapping(name="단속팀 관리 메인", value=METHOD_URL.crackdownTeamManagementMain) public ModelAndView crackdownTeamManagementMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn07010-main"); - mav.addObject("pageName", "crdn07010"); - Map> commonCodes = getCodesOf("FIM054","FIM071","FIM002"); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); - mav.addObject("FIM071List", commonCodes.get("FIM071")); - mav.addObject("FIM002List", commonCodes.get("FIM002")); + + ModelAndView mav = new ModelAndView("fims/crdn/crdn07010-main") + .addObject("pageName", "crdn07010") + .addObject("FIM054List", commonCodes.get("FIM054")) + .addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) + .addObject("FIM071List", commonCodes.get("FIM071")) + .addObject("FIM002List", commonCodes.get("FIM002")); addCodes(commonCodes, mav, "FIM054"); addCodes(commonCodes, mav, "FIM071"); - addCodes(commonCodes, mav, "FIM002"); - return mav; + return addCodes(commonCodes, mav, "FIM002"); } /**단속팀 목록을 조회한다.
@@ -77,12 +72,8 @@ public class Crdn07Controller extends ApplicationController { @Task({"PVS","BPV"}) @RequestMapping(name="단속팀 목록 조회", value=METHOD_URL.getTeamList) public ModelAndView getTeamList(CrdnQuery query) { - ModelAndView mav = new ModelAndView("jsonView"); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - query.setSggCd(sggCd); - return setPagingInfo(mav, crdnStngService.getTeamList(query),""); + query.setSggCd(currentUser().getOrgID()); + return setPagingInfo(new ModelAndView("jsonView"), crdnStngService.getTeamList(query),""); } /**비사용 단속팀 목록을 조회한다.
@@ -93,13 +84,9 @@ public class Crdn07Controller extends ApplicationController { @Task({"PVS","BPV"}) @RequestMapping(name="비사용 단속팀 목록 조회", value=METHOD_URL.getRemovedTeamList) public ModelAndView getRemovedTeamList(CrdnQuery query) { - ModelAndView mav = new ModelAndView("jsonView"); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - query.setSggCd(sggCd); + query.setSggCd(currentUser().getOrgID()); - return setPagingInfo(mav, crdnStngService.getRemovedTeamList(query),""); + return setPagingInfo(new ModelAndView("jsonView"), crdnStngService.getRemovedTeamList(query),""); } /** 단속팀 정보를 삭제한다. @@ -113,16 +100,9 @@ public class Crdn07Controller extends ApplicationController { @Task({"PVS","BPV"}) @RequestMapping(name="단속팀 정보 삭제", value=METHOD_URL.removeTeamInfo) public ModelAndView removeTeamInfo(String teamId) { - - boolean saved = false; - String rtnMsg = crdnStngService.removeTeamInfo(teamId); - if(rtnMsg.contains("[S]")) { - saved = true; - } return new ModelAndView("jsonView") - .addObject("saved", saved); - + .addObject("saved", rtnMsg.contains("[S]")); } /** 단속팀 정보를 저장한다. @@ -136,20 +116,11 @@ public class Crdn07Controller extends ApplicationController { @Task({"PVS","BPV"}) @RequestMapping(name="단속팀 정보 저장", value=METHOD_URL.saveTeamInfo) public ModelAndView saveTeamInfo(Team team) { - - boolean saved = false; - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - team.setSggCd(sggCd); - + team.setSggCd(currentUser().getOrgID()); String rtnMsg = crdnStngService.saveTeamInfo(team); - if(rtnMsg.contains("[S]")) { - saved = true; - } - return new ModelAndView("jsonView") - .addObject("saved", saved); + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /**단속팀 정보를 조회한다.
@@ -160,9 +131,7 @@ public class Crdn07Controller extends ApplicationController { @Task({"PVS","BPV"}) @RequestMapping(name="단속팀 정보 조회", value=METHOD_URL.getTeamInfo) public ModelAndView getTeamInfo(String teamId) { - ModelAndView mav = new ModelAndView("jsonView"); - mav.addObject("teamInfo", crdnStngService.getTeamInfo(teamId)); - return mav; + return new ModelAndView("jsonView") + .addObject("teamInfo", crdnStngService.getTeamInfo(teamId)); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java index b7fe47e7..2c22dbc6 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java @@ -18,7 +18,6 @@ import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; import cokr.xit.fims.crdn.CrdnQuery; @@ -60,13 +59,11 @@ public class Crdn08Controller extends ApplicationController { */ @RequestMapping(name="면제차량 관리", value=METHOD_URL.exemptionVehicleManagementMain) public ModelAndView exemptionVehicleManagementMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn08010-main"); - mav.addObject("pageName", "crdn08010"); - Map> commonCodes = getCodesOf("NTR034"); - addCodes(commonCodes, mav, "NTR034"); - return mav; + + ModelAndView mav = new ModelAndView("fims/crdn/crdn08010-main") + .addObject("pageName", "crdn08010"); + return addCodes(commonCodes, mav, "NTR034"); } /**면제차량 목록을 조회한다.
@@ -77,10 +74,7 @@ public class Crdn08Controller extends ApplicationController { @Task("BPV") @RequestMapping(name="면제차량 목록 조회", value=METHOD_URL.getExemptionVehicleList) public ModelAndView getExemptionVehicleList(CrdnQuery query) { - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - query.setSggCd(sggCd); + query.setSggCd(currentUser().getOrgID()); if("xls".equals(query.getDownload())) { List cellDefs = fromJson(query.getCellDefs(), CellDef.listType()); @@ -113,8 +107,10 @@ public class Crdn08Controller extends ApplicationController { .cell(3, 0).rowValues(CellDef.header(cellDefs, () -> StyleMaker.headerStyle(xlsx))) .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); - return new ModelAndView("downloadView").addObject("download", xlsx.getDownloadable().setFilename("면제차량 목록.xlsx")) - .addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); + return new ModelAndView("downloadView") + .addObject("download", xlsx.getDownloadable().setFilename("면제차량 목록.xlsx")) + .addObject("downloadData", list) + .addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } setFetchSize(query); @@ -127,18 +123,11 @@ public class Crdn08Controller extends ApplicationController { @Task("BPV") @RequestMapping(name="면제차량 정보 조회", value=METHOD_URL.getExemptionVehicleInfo) public ModelAndView getExemptionVehicleInfo(String exmptnVhclId) { + DataObject info = !isEmpty(exmptnVhclId) ? crdnStngService.getExemptionVehicleInfo(exmptnVhclId) : new DataObject(); - ModelAndView mav = new ModelAndView("fims/crdn/crdn08020-info"); - mav.addObject("pageName", "crdn08020"); - - DataObject info = new DataObject(); - - if(!ifEmpty(exmptnVhclId, () -> "").equals("")) { - info = crdnStngService.getExemptionVehicleInfo(exmptnVhclId); - } - mav.addObject("exmptnVhclInfo", toJson(info)); - - return mav; + return new ModelAndView("fims/crdn/crdn08020-info") + .addObject("pageName", "crdn08020") + .addObject("exmptnVhclInfo", toJson(info)); } /** 면제차량 정보를 등록한다. @@ -152,20 +141,11 @@ public class Crdn08Controller extends ApplicationController { @Task("BPV") @RequestMapping(name="면제차량 정보 등록", value=METHOD_URL.createExemptionVehicleInfo) public ModelAndView createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { - ModelAndView mav = new ModelAndView("jsonView"); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - exmptnVhcl.setSggCd(currentUser.getOrgID()); - - boolean saved = false; - + exmptnVhcl.setSggCd(currentUser().getOrgID()); String rtnMsg = crdnStngService.createExemptionVehicleInfo(exmptnVhcl); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /** 면제차량 정보를 수정한다. @@ -179,20 +159,10 @@ public class Crdn08Controller extends ApplicationController { @Task("BPV") @RequestMapping(name="면제차량 정보 수정", value=METHOD_URL.updateExemptionVehicleInfo) public ModelAndView updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { - ModelAndView mav = new ModelAndView("jsonView"); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - exmptnVhcl.setSggCd(currentUser.getOrgID()); - - boolean saved = false; - + exmptnVhcl.setSggCd(currentUser().getOrgID()); String rtnMsg = crdnStngService.updateExemptionVehicleInfo(exmptnVhcl); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; - + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /** 면제차량 정보를 삭제한다. @@ -206,17 +176,9 @@ public class Crdn08Controller extends ApplicationController { @Task("BPV") @RequestMapping(name="면제차량 정보 삭제", value=METHOD_URL.removeExemptionVehicleInfo) public ModelAndView removeExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { - ModelAndView mav = new ModelAndView("jsonView"); - - boolean saved = false; - String rtnMsg = crdnStngService.removeExemptionVehicleInfo(exmptnVhcl); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; - + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /**면제차량 이력을 조회한다.
@@ -227,16 +189,13 @@ public class Crdn08Controller extends ApplicationController { @Task("BPV") @RequestMapping(name="면제차량 이력 조회", value=METHOD_URL.getExemptionVehicleHistoryList) public ModelAndView getExemptionVehicleHistoryList(String exmptnVhclId) { - - ModelAndView mav = new ModelAndView("fims/crdn/crdn08030-info"); - mav.addObject("pageName", "crdn08030"); - List list = crdnStngService.getExemptionVehicleHistoryList(exmptnVhclId); - mav.addObject("list", toJson(list)); + ModelAndView mav = new ModelAndView("fims/crdn/crdn08030-info") + .addObject("pageName", "crdn08030") + .addObject("list", toJson(list)); Map> commonCodes = getCodesOf("NTR034"); - addCodes(commonCodes, mav, "NTR034"); - return mav; + return addCodes(commonCodes, mav, "NTR034"); } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java index db4c9d06..45a68312 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -106,9 +106,7 @@ public class Cvlc01Controller extends ApplicationController { @RequestMapping(name="민원접수자료 목록 조회", value=METHOD_URL.getCivilComplaintReceiptDataList) public ModelAndView getCivilComplaintReceiptDataList(CrdnQuery query) { setFetchSize(query.setGridType("receiptData")); - - FimsUser currentUser = (FimsUser)currentUser().getUser(); - query.setSggCd(currentUser.getOrgID()); + query.setSggCd(currentUser().getOrgID()); if("xls".equals(query.getDownload())) { List cellDefs = fromJson(query.getCellDefs(), CellDef.listType()); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index b1a2304c..942f841e 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -22,7 +22,6 @@ import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -57,16 +56,12 @@ public class Cvlc02Controller extends ApplicationController { @Resource(name="crdnService") private CrdnService crdnService; - @Resource(name="crdnCvlcptService") private CrdnCvlcptService crdnCvlcptService; - @Resource(name="userMapper") protected UserMapper userMapper; - @Resource(name = "stngBean") private StngBean stngBean; - @Resource(name = "fileBean") private FileBean fileBean; @@ -75,17 +70,15 @@ public class Cvlc02Controller extends ApplicationController { */ @RequestMapping(name="민원 답변 대상 자료 메인", value=METHOD_URL.civilComplaintAnswerTargetDataMain) public ModelAndView civilComplaintAnswerTargetDataMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/cvlc/cvlc02010-main"); - mav.addObject("pageName", "cvlc02010"); - Map> commonCodes = getCodesOf("FIM017","FIM022", "FIM026", "FIM054"); - mav.addObject("FIM017List", commonCodes.get("FIM017")); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); + + ModelAndView mav = new ModelAndView("fims/cvlc/cvlc02010-main") + .addObject("pageName", "cvlc02010") + .addObject("FIM017List", commonCodes.get("FIM017")) + .addObject("FIM054List", commonCodes.get("FIM054")) + .addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); addCodes(commonCodes, mav, "FIM022"); - addCodes(commonCodes, mav, "FIM026"); - return mav; + return addCodes(commonCodes, mav, "FIM026"); } /**민원답변대상자료 목록을 조회한다.
@@ -96,12 +89,8 @@ public class Cvlc02Controller extends ApplicationController { @Task @RequestMapping(name="민원답변대상자료 목록", value=METHOD_URL.selectCivilComplaintAnswerTargetDataList) public ModelAndView selectCivilComplaintAnswerTargetDataList(CrdnQuery query) { - query.setGridType("answerTargetData"); - setFetchSize(query); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - query.setSggCd(sggCd); + setFetchSize(query.setGridType("answerTargetData")); + query.setSggCd(currentUser().getOrgID()); if("xls".equals(query.getDownload())) { List cellDefs = fromJson(query.getCellDefs(), CellDef.listType()); @@ -159,11 +148,10 @@ public class Cvlc02Controller extends ApplicationController { xlsx.cell(3, 0).rowValues(CellDef.header(cellDefs, () -> StyleMaker.headerStyle(xlsx))); xlsx.cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); - ModelAndView mav = new ModelAndView("downloadView"); - mav.addObject("download", xlsx.getDownloadable().setFilename("민원답변대상자료 목록.xlsx")); - mav.addObject("downloadData", list); - mav.addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); - return mav; + return new ModelAndView("downloadView") + .addObject("download", xlsx.getDownloadable().setFilename("민원답변대상자료 목록.xlsx")) + .addObject("downloadData", list) + .addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } return setPagingInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query),""); @@ -175,20 +163,18 @@ public class Cvlc02Controller extends ApplicationController { @Task @RequestMapping(name="민원답변내용 미리보기", value=METHOD_URL.answerPreviewInfo) public ModelAndView answerPreviewInfo(HttpServletRequest hReq, CrdnQuery query) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/cvlc/cvlc02060-info"); - - mav.addObject("pageName", "cvlc02060"); String urlTaskSeCd = hReq.getServletPath().split("/")[1]; - mav.addObject("taskSeCd", urlTaskSeCd); - - query.setTaskSeCd(urlTaskSeCd); - query.setSggCd(currentUser().getOrgID()); - query.setCurrentUserAcnt(currentUser().getAccount()); + query + .setCurrentUserAcnt(currentUser().getAccount()) + .setTaskSeCd(urlTaskSeCd) + .setSggCd(currentUser().getOrgID()); DataObject cvlcptInfo = crdnCvlcptService.getAnswerPreview(query); - mav.addObject("cvlcptInfo", json ? cvlcptInfo : toJson(cvlcptInfo)); - return mav; + boolean json = jsonResponse(); + return new ModelAndView(json ? "jsonView" : "fims/cvlc/cvlc02060-info") + .addObject("pageName", "cvlc02060") + .addObject("taskSeCd", urlTaskSeCd) + .addObject("cvlcptInfo", json ? cvlcptInfo : toJson(cvlcptInfo)); } /**지정한 민원 자료의 답변 내용을 저장한다. @@ -202,15 +188,9 @@ public class Cvlc02Controller extends ApplicationController { @Task @RequestMapping(name="답변 내용 저장", value=METHOD_URL.updateAnswerContent) public ModelAndView updateAnswerContent(CrdnCvlcpt crdnCvlcpt) { - - boolean saved = false; - String rtnMsg = crdnCvlcptService.updateAnswerContent(crdnCvlcpt); - if(rtnMsg.contains("[S]")) { - saved = true; - } return new ModelAndView("jsonView") - .addObject("saved", saved); + .addObject("saved", rtnMsg.contains("[S]")); } /**민원 답변 대상 자료의 처리 상태를 변경한다. @@ -224,16 +204,12 @@ public class Cvlc02Controller extends ApplicationController { @Task @RequestMapping(name="답변 대상 처리상태 변경", value=METHOD_URL.updateAnswerTargetProcessStatus) public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIds) { - - boolean saved = false; String currentSggCd = currentUser().getOrgID(); String currentUserAcnt = currentUser().getAccount(); String rtnMsg = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, currentSggCd, currentUserAcnt, crdnIds); - if(rtnMsg.contains("[S]")) { - saved = true; - } + return new ModelAndView("jsonView") - .addObject("saved", saved); + .addObject("saved", rtnMsg.contains("[S]")); } /**지정한 단속자료에 대해 표지정보조회 실행 후 장애인차량이 아닌 건은 서손 처리한다. @@ -247,13 +223,8 @@ public class Cvlc02Controller extends ApplicationController { @Task("DPV") @RequestMapping(name="표지 정보 조회 실행", value=METHOD_URL.executeDisabledTagInfoInquire) public ModelAndView executeDisabledTagInfoInquire(String... crdnIds) { - boolean saved = false; - String rtnMsg = crdnCvlcptService.executeDisabledTagInfoInquire(crdnIds); - if(rtnMsg.contains("[S]")) { - saved = true; - } return new ModelAndView("jsonView") - .addObject("saved", saved); + .addObject("saved", rtnMsg.contains("[S]")); } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java index f3cf3c60..611ca3e6 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -18,7 +18,6 @@ import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -48,13 +47,10 @@ public class Cvlc03Controller extends ApplicationController { @Resource(name="crdnService") private CrdnService crdnService; - @Resource(name="crdnCvlcptService") private CrdnCvlcptService crdnCvlcptService; - @Resource(name="userMapper") protected UserMapper userMapper; - @Resource(name = "stngBean") private StngBean stngBean; @@ -63,17 +59,14 @@ public class Cvlc03Controller extends ApplicationController { */ @RequestMapping(name="민원 관리 메인", value=METHOD_URL.civilComplaintManagementMain) public ModelAndView civilComplaintManagementMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/cvlc/cvlc03010-main"); - mav.addObject("pageName", "cvlc03010"); - Map> commonCodes = getCodesOf("FIM022","FIM026", "FIM054"); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); - addCodes(commonCodes, mav, "FIM022", "FIM026"); - mav.addObject("currentUserName", UserInfo.current().getName()); - return mav; + ModelAndView mav = new ModelAndView("fims/cvlc/cvlc03010-main") + .addObject("pageName", "cvlc03010") + .addObject("FIM054List", commonCodes.get("FIM054")) + .addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); + return addCodes(commonCodes, mav, "FIM022", "FIM026") + .addObject("currentUserName", UserInfo.current().getName()); } /**민원자료 목록을 조회한다.
@@ -84,11 +77,7 @@ public class Cvlc03Controller extends ApplicationController { @Task @RequestMapping(name="민원자료 목록 조회", value=METHOD_URL.getCivilComplaintList) public ModelAndView getCivilComplaintList(CrdnQuery query) { - setFetchSize(query); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - query.setSggCd(sggCd); + setFetchSize(query.setSggCd(currentUser().getOrgID())); if("xls".equals(query.getDownload())) { List cellDefs = fromJson(query.getCellDefs(), CellDef.listType()); @@ -122,11 +111,12 @@ public class Cvlc03Controller extends ApplicationController { xlsx.cell(3, 0).rowValues(CellDef.header(cellDefs, () -> StyleMaker.headerStyle(xlsx))); xlsx.cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); - ModelAndView mav = new ModelAndView("downloadView"); - mav.addObject("download", xlsx.getDownloadable().setFilename("민원자료 목록.xlsx")); - return mav.addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); + return new ModelAndView("downloadView") + .addObject("download", xlsx.getDownloadable().setFilename("민원자료 목록.xlsx")) + .addObject("downloadData", list) + .addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } return setPagingInfo(new ModelAndView("jsonView"),crdnCvlcptService.getCivilComplaintList(query),""); } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java index 9862df23..b280b887 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java @@ -12,7 +12,6 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.service.CrdnService; @@ -41,13 +40,10 @@ public class Cvlc04Controller extends ApplicationController { @Resource(name="crdnService") private CrdnService crdnService; - @Resource(name="crdnCvlcptService") private CrdnCvlcptService crdnCvlcptService; - @Resource(name="userMapper") private UserMapper userMapper; - @Resource(name = "stngBean") private StngBean stngBean; @@ -56,15 +52,13 @@ public class Cvlc04Controller extends ApplicationController { */ @RequestMapping(name="민원 개별 등록 메인", value=METHOD_URL.civilComplaintIndividualRegistrationMain) public ModelAndView civilComplaintIndividualRegistrationMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/cvlc/cvlc04010-main"); - mav.addObject("pageName", "cvlc04010"); - Map> commonCodes = getCodesOf("FIM054","FIM063"); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); - addCodes(commonCodes, mav, "FIM063"); - return mav; + + ModelAndView mav = new ModelAndView("fims/cvlc/cvlc04010-main") + .addObject("pageName", "cvlc04010") + .addObject("FIM054List", commonCodes.get("FIM054")) + .addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); + return addCodes(commonCodes, mav, "FIM063"); } /** 새올 요청자료 목록을 조회한다. @@ -75,12 +69,8 @@ public class Cvlc04Controller extends ApplicationController { @Task @RequestMapping(name="새올요청자료 목록 조회", value=METHOD_URL.getDmndDataList) public ModelAndView getDmndDataList(CrdnQuery query) { - FimsUser currentUser = (FimsUser) currentUser().getUser(); - query.setSggCd(currentUser.getOrgID()); - - setFetchSize(query); + setFetchSize(query.setSggCd(currentUser().getOrgID())); return setPagingInfo(new ModelAndView("jsonView"), crdnCvlcptService.getDmndDataList(query),""); - } /** 새올 요청자료를 생성한다. @@ -94,19 +84,11 @@ public class Cvlc04Controller extends ApplicationController { @Task @RequestMapping(name="새올요청자료 등록", value=METHOD_URL.createDmndDataInfo) public ModelAndView createDmndDataInfo(CrdnCvlcpt crdnCvlcpt) { - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - crdnCvlcpt.setSggCd(currentUser.getOrgID()); - - boolean saved = false; - + crdnCvlcpt.setSggCd(currentUser().getOrgID()); String rtnMsg = crdnCvlcptService.createDmndDataInfo(crdnCvlcpt); - if(rtnMsg.contains("[S]")) { - saved = true; - } - return new ModelAndView("jsonView") - .addObject("saved", saved); + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /**새올 요청자료를 제거한다. @@ -120,13 +102,8 @@ public class Cvlc04Controller extends ApplicationController { @Task @RequestMapping(name="새올요청자료 삭제", value=METHOD_URL.removeDmndDataInfo) public ModelAndView removeDmndDataInfo(String[] indivIds) { - - boolean saved = false; String rtnMsg = crdnCvlcptService.removeDmndDataInfo(indivIds); - if(rtnMsg.contains("[S]")) { - saved = true; - } return new ModelAndView("jsonView") - .addObject("saved", saved); + .addObject("saved", rtnMsg.contains("[S]")); } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java index 2ce6c7a2..ec8cfc59 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java @@ -56,20 +56,19 @@ public class Cvlc05Controller extends ApplicationController { */ @RequestMapping(name="민원신고답변 문구 관리 메인", value=METHOD_URL.cvlcptAnswerWordsManageMain) public ModelAndView cvlcptAnswerWordsManageMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/cvlc/cvlc05010-main"); - mav.addObject("pageName", "cvlc05010"); - - mav.addObject("currentUserName", UserInfo.current().getName()); - DataObject params = new DataObject().set("account", UserInfo.current().getAccount()).set("orgID", UserInfo.current().getOrgID()); + UserInfo user = currentUser(); + DataObject params = new DataObject() + .set("account", user.getAccount()) + .set("orgID", user.getOrgID()); FimsUser currentUser = userMapper.getUser(params); - mav.addObject("currentUserTelno", currentUser.getPhoneNo()); - Map> commonCodes = getCodesOf("FIM054"); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); - return mav; + return new ModelAndView("fims/cvlc/cvlc05010-main") + .addObject("pageName", "cvlc05010") + .addObject("currentUserName", UserInfo.current().getName()) + .addObject("currentUserTelno", currentUser.getPhoneNo()) + .addObject("FIM054List", commonCodes.get("FIM054")) + .addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); } /** 민원신고 답변 문구 설정을 조회한다. @@ -78,12 +77,7 @@ public class Cvlc05Controller extends ApplicationController { @Task @RequestMapping(name="민원신고 답변 문구 설정 조회", value=METHOD_URL.getCvlcptAnswerWordsInfo) public ModelAndView getCvlcptAnswerWordsInfo(CrdnQuery crdnQuery) { - ModelAndView mav = new ModelAndView(); - mav.setViewName("jsonView"); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String currentSggCd = currentUser.getOrgID(); - crdnQuery.setSggCd(currentSggCd); + crdnQuery.setSggCd(currentUser().getOrgID()); Map info = crdnCvlcptService.getCvlcptAnswerWordsInfo(crdnQuery); DataObject basicInfo = (DataObject) info.get("basic"); @@ -91,19 +85,12 @@ public class Cvlc05Controller extends ApplicationController { List warningCaseList = CmmnUtil.getDataObjectListFromMap(info,"warningCaseList"); List nonlevyCaseList = CmmnUtil.getDataObjectListFromMap(info,"nonlevyCaseList"); - if(basicInfo == null){ - mav.addObject("headerCn", ""); - mav.addObject("footerCn", ""); - } else { - mav.addObject("headerCn", basicInfo.string("HEADER_CN")); - mav.addObject("footerCn", basicInfo.string("FOOTER_CN")); - } - - mav.addObject("levyCaseList", levyCaseList); - mav.addObject("warningCaseList", warningCaseList); - mav.addObject("nonlevyCaseList", nonlevyCaseList); - - return mav; + return new ModelAndView("jsonView") + .addObject("headerCn", basicInfo == null ? "" : basicInfo.string("HEADER_CN")) + .addObject("footerCn", basicInfo == null ? "" : basicInfo.string("FOOTER_CN")) + .addObject("levyCaseList", levyCaseList) + .addObject("warningCaseList", warningCaseList) + .addObject("nonlevyCaseList", nonlevyCaseList); } /** 민원신고 답변 문구 설정을 저장한다. @@ -117,13 +104,10 @@ public class Cvlc05Controller extends ApplicationController { @Task @RequestMapping(name="민원신고 답변 문구 설정 저장", value=METHOD_URL.saveCvlcptAnswerWordsInfo) public ModelAndView saveCvlcptAnswerWordsInfo(HttpServletRequest hReq, CrdnCvlcpt crdnCvlcpt) { - boolean saved = false; - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String currentSggCd = currentUser.getOrgID(); - crdnCvlcpt.setSggCd(currentSggCd); + crdnCvlcpt.setSggCd(currentUser().getOrgID()); String saveData = hReq.getParameter("saveData"); + boolean saved = false; if(saveData.equals("basic") || saveData.equals("body")) { String rtnMsg = crdnCvlcptService.saveAnswerWordsInfo(saveData, crdnCvlcpt); if(rtnMsg.contains("[S]")) { @@ -132,7 +116,7 @@ public class Cvlc05Controller extends ApplicationController { } return new ModelAndView("jsonView") - .addObject("saved", saved); + .addObject("saved", saved); } /** 미부과처리건 답변 문구를 삭제한다. @@ -146,13 +130,8 @@ public class Cvlc05Controller extends ApplicationController { @Task @RequestMapping(name="민원신고 답변 문구 설정 삭제", value=METHOD_URL.removeCvlcptAnswerWordsInfo) public ModelAndView removeCvlcptAnswerWordsInfo(String ansWordsId) { - boolean saved = false; - String rtnMsg = crdnCvlcptService.removeCvlcptAnswerWordsInfo(ansWordsId); - if(rtnMsg.contains("[S]")) { - saved = true; - } return new ModelAndView("jsonView") - .addObject("saved", saved); + .addObject("saved", rtnMsg.contains("[S]")); } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java index af43d4c2..096b3ed5 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java @@ -12,7 +12,6 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.cvlc.CrdnCvlcpt; @@ -39,10 +38,8 @@ public class Cvlc06Controller extends ApplicationController { @Resource(name="crdnCvlcptService") private CrdnCvlcptService crdnCvlcptService; - @Resource(name = "stngBean") private StngBean stngBean; - @Resource(name="userMapper") private UserMapper userMapper; @@ -51,15 +48,12 @@ public class Cvlc06Controller extends ApplicationController { */ @RequestMapping(name="계도문 문구 관리 메인", value=METHOD_URL.warningWordsManageMain) public ModelAndView warningWordsManageMain() { - - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/cvlc/cvlc06010-main"); - mav.addObject("pageName", "cvlc06010"); - Map> commonCodes = getCodesOf("FIM054"); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); - return mav; + + return new ModelAndView("fims/cvlc/cvlc06010-main") + .addObject("pageName", "cvlc06010") + .addObject("FIM054List", commonCodes.get("FIM054")) + .addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); } /** 계도문 문구 설정 목록을 조회한다. @@ -68,9 +62,7 @@ public class Cvlc06Controller extends ApplicationController { @Task @RequestMapping(name="계도문 문구 설정 목록", value=METHOD_URL.getWarningWordsList) public ModelAndView getWarningWordsList(CrdnQuery crdnQuery) { - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String currentSggCd = currentUser.getOrgID(); - crdnQuery.setSggCd(currentSggCd); + crdnQuery.setSggCd(currentUser().getOrgID()); return setPagingInfo(new ModelAndView("jsonView"), crdnCvlcptService.getWarningWordsList(crdnQuery),""); } @@ -85,18 +77,10 @@ public class Cvlc06Controller extends ApplicationController { @Task @RequestMapping(name="계도문 문구 설정 저장", value=METHOD_URL.saveCvlcptAnswerWordsInfo) public ModelAndView saveCvlcptAnswerWordsInfo(CrdnCvlcpt crdnCvlcpt) { - boolean saved = false; - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String currentSggCd = currentUser.getOrgID(); - crdnCvlcpt.setSggCd(currentSggCd); - + crdnCvlcpt.setSggCd(currentUser().getOrgID()); String rtnMsg = crdnCvlcptService.saveWarningWordsInfo(crdnCvlcpt); - if(rtnMsg.contains("[S]")) { - saved = true; - } + return new ModelAndView("jsonView") - .addObject("saved", saved); + .addObject("saved", rtnMsg.contains("[S]")); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java b/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java index 795314a6..588f2d7b 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java @@ -69,18 +69,10 @@ public class Epst01Controller extends ApplicationController { * } */ public ModelAndView removeEpostReceiptRegistration(EpostRcptReg epostRcptReg) { - boolean saved = false; String rtnMsg = epostRcptRegService.remove(epostRcptReg); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java index 19c6945a..48d8faa2 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java @@ -19,7 +19,6 @@ import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -71,19 +70,15 @@ public class Epst02Controller extends ApplicationController { /**전자우편 안내문 서비스*/ @Resource(name="epostGdntcService") private EpostGdntcService epostGdntcService; - /**전자우편 접수 등록 서비스*/ @Resource(name="epostRcptRegService") private EpostRcptRegService epostRcptRegService; - /**전자우편 접수 상세 서비스*/ @Resource(name="epostRcptDtlService") private EpostRcptDtlService epostRcptDtlService; - /**전자우편 접수 결과 서비스*/ @Resource(name="epostRcptRsltService") private EpostRcptRsltService epostRcptRsltService; - @Resource(name="stngBean") private StngBean stngBean; @@ -93,21 +88,16 @@ public class Epst02Controller extends ApplicationController { */ @RequestMapping(name="안내문관리", value=METHOD_URL.epostGuidanceNoticeMain) public ModelAndView epostGuidanceNoticeMain() { - ModelAndView mav = new ModelAndView("fims/epst/epst02010-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM047", "FIM054"); - return mav - .addObject("pageName", "epst02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) - .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) - .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) + return new ModelAndView("fims/epst/epst02010-main") + .addObject("pageName", "epst02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) + .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) + .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) ; } @@ -162,7 +152,7 @@ public class Epst02Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("우편통합안내문" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("우편통합안내문" + "_목록_" + dateTime + ".xlsx")); } } @@ -176,22 +166,19 @@ public class Epst02Controller extends ApplicationController { @Task @RequestMapping(name="전자우편 안내문 정보 조회", value=METHOD_URL.getEpostGuidanceNoticeInfo) public ModelAndView getEpostGuidanceNoticeInfo(HttpServletRequest hReq, EpostQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/epst/epst02020-info"); - // 상세 정보 조회 DataObject epostGdntcInfo = epostGdntcService.getEpostGdntcInfo(req); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM047", "FIM054"); - return mav - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "epst02020") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) - .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) - .addObject("Info", json ? epostGdntcInfo : toJson(epostGdntcInfo)) // 전자우편 안내문 정보 + boolean json = jsonResponse(); + return new ModelAndView(json ? "jsonView" : "fims/epst/epst02020-info") + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "epst02020") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) + .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) + .addObject("Info", json ? epostGdntcInfo : toJson(epostGdntcInfo)) // 전자우편 안내문 정보 ; } @@ -205,18 +192,11 @@ public class Epst02Controller extends ApplicationController { @Task @RequestMapping(name="전자우편 안내문 등록", value=METHOD_URL.createEpostGuidanceNotice) public ModelAndView createEpostGuidanceNotice(EpostGdntc epostGdntc) { - boolean saved = false; String rtnMsg = epostGdntcService.createEpostGdntc(epostGdntc); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**전자우편 안내문 정보를 수정한다. @@ -229,18 +209,11 @@ public class Epst02Controller extends ApplicationController { @Task @RequestMapping(name="전자우편 안내문 수정", value=METHOD_URL.updateEpostGuidanceNotice) public ModelAndView updateEpostGuidanceNotice(EpostGdntc epostGdntc) { - boolean saved = false; String rtnMsg = epostGdntcService.updateEpostGdntc(epostGdntc); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**지정한 전자우편 안내문를 제거한다. @@ -254,18 +227,11 @@ public class Epst02Controller extends ApplicationController { @Task @RequestMapping(name="전자우편 안내문 삭제", value=METHOD_URL.removeEpostGuidanceNotice) public ModelAndView removeEpostGuidanceNotice(EpostGdntc epostGdntc) { - boolean saved = false; String rtnMsg = epostGdntcService.removeEpostGdntc(epostGdntc); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**전자우편 접수 등록 관리 메인화면(fims/epst/epst02030-main)을 연다. @@ -273,23 +239,18 @@ public class Epst02Controller extends ApplicationController { */ @RequestMapping(name="전자우편 발송 현황", value=METHOD_URL.epostReceiptRegistrationMain) public ModelAndView epostReceiptRegistrationMain() { - ModelAndView mav = new ModelAndView("fims/epst/epst02030-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); // 부서 정보 DataObject deptInfo = stngBean.getStng("dept"); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM054"); - return mav - .addObject("pageName", "epst02030") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) - .addObject("deptCd", deptInfo.string("DEPT_CD")) // 부서 코드 7자리 - .addObject("conOrg", deptInfo.string("EGP_CON_ORG")) // E그린 외부기관구분코드 + return new ModelAndView("fims/epst/epst02030-main") + .addObject("pageName", "epst02030") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) + .addObject("deptCd", deptInfo.string("DEPT_CD")) // 부서 코드 7자리 + .addObject("conOrg", deptInfo.string("EGP_CON_ORG")) // E그린 외부기관구분코드 ; } @@ -344,7 +305,7 @@ public class Epst02Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("우편통합우편발송" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("우편통합우편발송" + "_목록_" + dateTime + ".xlsx")); } } @@ -359,18 +320,17 @@ public class Epst02Controller extends ApplicationController { @RequestMapping(name="전자우편 발송 상세 화면", value=METHOD_URL.getEpostReceiptRegistrationDetailInfo) public ModelAndView getEpostReceiptRegistrationDetailInfo(HttpServletRequest hReq, EpostQuery req) { ModelAndView mav = getEpostReceiptRegistrationDetailList(req); - mav.setViewName("fims/epst/epst02040-info"); return mav - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "epst02040") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) - .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) - .addObject("mainQuery", toJson(req)) // 검색 조건 - .addObject("List", toJson(mav.getModel().get("List"))) // 데이터 - .addObject("Paging", toJson(mav.getModel().get("Paging"))) // 페이징 + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "epst02040") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) + .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) + .addObject("mainQuery", toJson(req)) // 검색 조건 + .addObject("List", toJson(mav.getModel().get("List"))) // 데이터 + .addObject("Paging", toJson(mav.getModel().get("Paging"))) // 페이징 ; } @@ -426,7 +386,7 @@ public class Epst02Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("우편통합발송상세" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("우편통합발송상세" + "_목록_" + dateTime + ".xlsx")); } } @@ -440,18 +400,11 @@ public class Epst02Controller extends ApplicationController { @Task @RequestMapping(name="전자우편 발송 우편처리상태코드 수정", value=METHOD_URL.updateEpostSendingProcessStatus) public ModelAndView updateEpostSendingProcessStatus(EpostRcptReg epostRcptReg) { - boolean saved = false; String rtnMsg = epostRcptRegService.updatePostPrcsSttsCd(epostRcptReg); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**지정한 전자우편 접수 등록 정보를 제거한다. @@ -465,18 +418,11 @@ public class Epst02Controller extends ApplicationController { @Task @RequestMapping(name="전자우편 발송 삭제", value=METHOD_URL.removeEpostSendingStatus) public ModelAndView removeEpostSendingStatus(EpostRcptReg epostRcptReg) { - boolean saved = false; String rtnMsg = epostRcptRegService.remove(epostRcptReg); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**전자우편 접수 결과 관리 메인화면(epostRcptRslt/epostRcptRslt-main)을 연다. @@ -485,25 +431,20 @@ public class Epst02Controller extends ApplicationController { */ @RequestMapping(name="접수결과 메인", value=METHOD_URL.epostReceiptResultMain) public ModelAndView epostReceiptResultMain() { - ModelAndView mav = new ModelAndView("fims/epst/epst02050-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); // 부서 정보 DataObject deptInfo = stngBean.getStng("dept"); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("EGP002", "FIM054", "FIM082"); - return mav - .addObject("pageName", "epst02050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) - .addObject("deptCd", deptInfo.string("DEPT_CD")) // 부서 코드 7자리 - .addObject("conOrg", deptInfo.string("EGP_CON_ORG")) // E그린 외부기관구분코드 - .addObject("EGP002List", commonCodes.get("EGP002")) // 취급 구분(DIV_KB) - .addObject("FIM082List", commonCodes.get("FIM082")) // 작업 코드 3(JOB_CD) + return new ModelAndView("fims/epst/epst02050-main") + .addObject("pageName", "epst02050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) + .addObject("deptCd", deptInfo.string("DEPT_CD")) // 부서 코드 7자리 + .addObject("conOrg", deptInfo.string("EGP_CON_ORG")) // E그린 외부기관구분코드 + .addObject("EGP002List", commonCodes.get("EGP002")) // 취급 구분(DIV_KB) + .addObject("FIM082List", commonCodes.get("FIM082")) // 작업 코드 3(JOB_CD) ; } @@ -527,9 +468,7 @@ public class Epst02Controller extends ApplicationController { // 합계 금액 정보 List sumAmt = epostRcptRsltService.getEpostRcptRsltSum(req); - mav.addObject("sumAmt", sumAmt); - - return mav; + return mav.addObject("sumAmt", sumAmt); } else { // 현재 날짜 구하기 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); @@ -567,8 +506,7 @@ public class Epst02Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("우편통합접수결과" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("우편통합접수결과" + "_목록_" + dateTime + ".xlsx")); } } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index 8a7d4562..ac8a1c33 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -19,7 +19,6 @@ import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -59,7 +58,6 @@ public class Excl01Controller extends ApplicationController { /**부과제외 대장 서비스*/ @Resource(name = "levyExclService") protected LevyExclService levyExclService; - /**설정 정보 Bean */ @Resource(name = "stngBean") private StngBean stngBean; @@ -70,22 +68,16 @@ public class Excl01Controller extends ApplicationController { */ @RequestMapping(name = "부과제외 관리 메인", value=METHOD_URL.levyExclusionMain) public ModelAndView levyExclusionMain() { - ModelAndView mav = new ModelAndView("fims/excl/excl01010-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM021", "FIM022", "FIM054"); - addCodes(commonCodes, mav, "FIM021", "FIM022"); - return mav - .addObject("pageName", "excl01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) - .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) - .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) + return addCodes(commonCodes, new ModelAndView("fims/excl/excl01010-main"), "FIM021", "FIM022") + .addObject("pageName", "excl01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) + .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) + .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) ; } @@ -161,7 +153,7 @@ public class Excl01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> { if(i.getValue() instanceof Format) { i.setField(null); }; return i; }).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("부과제외" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("부과제외" + "_목록_" + dateTime + ".xlsx")); } } @@ -180,34 +172,30 @@ public class Excl01Controller extends ApplicationController { if (req.getCallPurpose().equals("create")) { // 등록 if (!levyExclInfo.string("LEVY_EXCL_ID").equals("")) { - ModelAndView mav = new ModelAndView("jsonView"); - return mav.addObject("rtnMsg", "이미 등록된 부과제외 정보가 있습니다.") - .addObject("message", "이미 등록된 부과제외 정보가 있습니다."); + return new ModelAndView("jsonView") + .addObject("rtnMsg", "이미 등록된 부과제외 정보가 있습니다.") + .addObject("message", "이미 등록된 부과제외 정보가 있습니다."); } } else if (req.getCallPurpose().equals("update")) { if (levyExclInfo.string("LEVY_EXCL_ID").equals("")) { // 수정 - ModelAndView mav = new ModelAndView("jsonView"); - return mav.addObject("rtnMsg", "조회된 부과제외 정보가 없습니다.") - .addObject("message", "조회된 부과제외 정보가 없습니다."); + return new ModelAndView("jsonView") + .addObject("rtnMsg", "조회된 부과제외 정보가 없습니다.") + .addObject("message", "조회된 부과제외 정보가 없습니다."); } } - - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl01020-info"); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM021", "FIM022"); - addCodes(commonCodes, mav, "FIM021", "FIM022"); - return mav - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "excl01020") // jsp pageName - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) - .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) - .addObject("Info", json ? levyExclInfo : toJson(levyExclInfo)) - .addObject("saveCallbackFuncName", hReq.getParameter("saveCallbackFuncName")) - .addObject("savedCallbackFuncName", hReq.getParameter("savedCallbackFuncName")) + boolean json = jsonResponse(); + return addCodes(commonCodes, new ModelAndView(json ? "jsonView" : "fims/excl/excl01020-info"), "FIM021", "FIM022") + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "excl01020") // jsp pageName + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) + .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) + .addObject("Info", json ? levyExclInfo : toJson(levyExclInfo)) + .addObject("saveCallbackFuncName", hReq.getParameter("saveCallbackFuncName")) + .addObject("savedCallbackFuncName", hReq.getParameter("savedCallbackFuncName")) ; } @@ -221,18 +209,11 @@ public class Excl01Controller extends ApplicationController { @Task @RequestMapping(name = "부과제외 대장 등록", value=METHOD_URL.createLevyExclusion) public ModelAndView createLevyExclusion(LevyExcl levyExcl) { - boolean saved = false; String rtnMsg = levyExclService.createLevyExcl(levyExcl); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**부과제외 대장 정보를 수정한다. @@ -245,18 +226,11 @@ public class Excl01Controller extends ApplicationController { @Task @RequestMapping(name = "부과제외 대장 수정", value=METHOD_URL.updateLevyExclusion) public ModelAndView updateLevyExclusion(LevyExcl levyExcl) { - boolean saved = false; String rtnMsg = levyExclService.updateLevyExcl(levyExcl); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**지정한 부과제외 ID에 해당하는 부과제외 대장를 제거한다. @@ -270,7 +244,6 @@ public class Excl01Controller extends ApplicationController { @Task @RequestMapping(name = "부과제외 대장 삭제", value=METHOD_URL.removeLevyExclusion) public ModelAndView removeLevyExclusion(LevyExcl levyExcl) { - boolean saved = false; String rtnMsg = ""; // 부과제외(levyExclId) 단건 삭제 @@ -290,15 +263,8 @@ public class Excl01Controller extends ApplicationController { } } - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index 95cf96d3..b26f408f 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -25,7 +25,6 @@ import cokr.xit.base.file.FileInfo; import cokr.xit.base.file.service.FileService; import cokr.xit.base.file.web.FileInfoFactory; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.cmmn.FimsPrintOption; import cokr.xit.fims.cmmn.hwp.format.DlbrDecsnList; @@ -77,19 +76,15 @@ public class Excl02Controller extends ApplicationController { /** 의견제출 대장 서비스 */ @Resource(name="opnnSbmsnService") protected OpnnSbmsnService opnnSbmsnService; - /**의견제출 심의 회원 서비스*/ @Resource(name = "opnnDlbrMbrService") private OpnnDlbrMbrService opnnDlbrMbrService; - /** 파일 정보 서비스 서비스 */ @Resource(name="fileService") private FileService fileService; - /**설정 정보 Bean */ @Resource(name="stngBean") private StngBean stngBean; - @Resource(name = "ogdpBean") private OgdpBean ogdpBean; @@ -99,23 +94,18 @@ public class Excl02Controller extends ApplicationController { */ @RequestMapping(name="의견제출 관리 메인", value = METHOD_URL.opinionSubmissionMain) public ModelAndView opinionSubmissionMain() { - ModelAndView mav = new ModelAndView("fims/excl/excl02010-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM029", "FIM030", "FIM031", "FIM033", "FIM054"); - return mav - .addObject("pageName", "excl02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) - .addObject("FIM029List", commonCodes.get("FIM029")) // 의견제출 접수 방법(RCPT_SE_CD) - .addObject("FIM030List", commonCodes.get("FIM030")) // 의견제출 결과 통보 방법(NTFCTN_SE_CD) - .addObject("FIM031List", commonCodes.get("FIM031")) // 의견 제출 답변 결과(OPNN_SBMSN_STTS_CD) - .addObject("FIM033List", commonCodes.get("FIM033")) // 의견제출 구분 코드(OPNN_SBMSN_SE_CD) + return new ModelAndView("fims/excl/excl02010-main") + .addObject("pageName", "excl02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) + .addObject("FIM029List", commonCodes.get("FIM029")) // 의견제출 접수 방법(RCPT_SE_CD) + .addObject("FIM030List", commonCodes.get("FIM030")) // 의견제출 결과 통보 방법(NTFCTN_SE_CD) + .addObject("FIM031List", commonCodes.get("FIM031")) // 의견 제출 답변 결과(OPNN_SBMSN_STTS_CD) + .addObject("FIM033List", commonCodes.get("FIM033")) // 의견제출 구분 코드(OPNN_SBMSN_SE_CD) ; } @@ -200,7 +190,7 @@ public class Excl02Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("의견제출" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("의견제출" + "_목록_" + dateTime + ".xlsx")); } } @@ -214,25 +204,22 @@ public class Excl02Controller extends ApplicationController { @Task @RequestMapping(name="의견제출 정보 조회", value=METHOD_URL.getOpinionSubmissionInfo) public ModelAndView getOpinionSubmissionInfo(HttpServletRequest hReq, LevyExclQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl02020-info"); - // 상세 정보 조회 DataObject opnnSbmsnInfo = opnnSbmsnService.getOpnnSbmsnInfo(req); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM019", "FIM029", "FIM030", "FIM032", "FIM033", "FIM054"); - return mav - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "excl02020") // jsp pageName - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDCT_RSN_CD) - .addObject("FIM029List", commonCodes.get("FIM029")) // 접수 구분 코드(RCPT_SE_CD) - .addObject("FIM030List", commonCodes.get("FIM030")) // 통보 구분 코드(NTFCTN_SE_CD) - .addObject("FIM032List", commonCodes.get("FIM032")) // 소유주 관계 구분 코드(OWNR_REL_CD) - .addObject("FIM033List", commonCodes.get("FIM033")) // 의견 제출 구분 코드(OPNN_SBMSN_SE_CD) - .addObject("Info", json ? opnnSbmsnInfo : toJson(opnnSbmsnInfo)) // 의견제출 정보 + boolean json = jsonResponse(); + return new ModelAndView(json ? "jsonView" : "fims/excl/excl02020-info") + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "excl02020") // jsp pageName + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDCT_RSN_CD) + .addObject("FIM029List", commonCodes.get("FIM029")) // 접수 구분 코드(RCPT_SE_CD) + .addObject("FIM030List", commonCodes.get("FIM030")) // 통보 구분 코드(NTFCTN_SE_CD) + .addObject("FIM032List", commonCodes.get("FIM032")) // 소유주 관계 구분 코드(OWNR_REL_CD) + .addObject("FIM033List", commonCodes.get("FIM033")) // 의견 제출 구분 코드(OPNN_SBMSN_SE_CD) + .addObject("Info", json ? opnnSbmsnInfo : toJson(opnnSbmsnInfo)) // 의견제출 정보 ; } @@ -246,8 +233,6 @@ public class Excl02Controller extends ApplicationController { @Task @RequestMapping(name="의견제출 대장 등록", value=METHOD_URL.createOpinionSubmission) public ModelAndView createOpinionSubmission(OpnnSbmsn opnnSbmsn, MultipartFile[] uploadFiles) { - boolean saved = false; - // 첨부 파일 List fileInfoList = new ArrayList(); if (uploadFiles != null && uploadFiles.length > 0) { @@ -256,14 +241,8 @@ public class Excl02Controller extends ApplicationController { String rtnMsg = opnnSbmsnService.createOpnnSbmsn(opnnSbmsn, fileInfoList); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) + .addObject("saved", rtnMsg.contains("[S]")) .addObject("rtnMsg", rtnMsg); } @@ -277,25 +256,16 @@ public class Excl02Controller extends ApplicationController { @Task @RequestMapping(name="의견제출 대장 수정", value=METHOD_URL.updateOpinionSubmission) public ModelAndView updateOpinionSubmission(OpnnSbmsn opnnSbmsn, MultipartFile[] uploadFiles) { - boolean saved = false; - // 첨부 파일 List fileInfoList = new ArrayList(); if (uploadFiles != null && uploadFiles.length > 0) { fileInfoList = new FileInfoFactory().makeFileInfos(null, uploadFiles); } - String rtnMsg = opnnSbmsnService.updateOpnnSbmsn(opnnSbmsn, fileInfoList); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**의견제출 심의 정보를 조회하여 반환한다. @@ -308,23 +278,20 @@ public class Excl02Controller extends ApplicationController { @Task @RequestMapping(name="의견제출 대장 심의 정보 조회", value=METHOD_URL.getOpinionSubmissionAnswerInfo) public ModelAndView getOpinionSubmissionAnswerInfo(HttpServletRequest hReq, LevyExclQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl02030-info"); - DataObject opnnSbmsnInfo = opnnSbmsnService.getOpnnSbmsnInfo(req); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM019", "FIM030", "FIM031", "FIM033", "FIM054"); - return mav - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "excl02030") // jsp pageName - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDCT_RSN_CD) - .addObject("FIM030List", commonCodes.get("FIM030")) // 통보 구분 코드(NTFCTN_SE_CD) - .addObject("FIM031List", commonCodes.get("FIM031")) // 의견 제출 상태 코드(OPNN_SBMSN_STTS_CD) - .addObject("FIM033List", commonCodes.get("FIM033")) // 의견 제출 구분 코드(OPNN_SBMSN_SE_CD) - .addObject("Info", json ? opnnSbmsnInfo : toJson(opnnSbmsnInfo)) // 의견제출 정보 + boolean json = jsonResponse(); + return new ModelAndView(json ? "jsonView" : "fims/excl/excl02030-info") + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "excl02030") // jsp pageName + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDCT_RSN_CD) + .addObject("FIM030List", commonCodes.get("FIM030")) // 통보 구분 코드(NTFCTN_SE_CD) + .addObject("FIM031List", commonCodes.get("FIM031")) // 의견 제출 상태 코드(OPNN_SBMSN_STTS_CD) + .addObject("FIM033List", commonCodes.get("FIM033")) // 의견 제출 구분 코드(OPNN_SBMSN_SE_CD) + .addObject("Info", json ? opnnSbmsnInfo : toJson(opnnSbmsnInfo)) // 의견제출 정보 ; } @@ -338,18 +305,11 @@ public class Excl02Controller extends ApplicationController { @Task @RequestMapping(name="의견제출 대장 심의정보 수정", value=METHOD_URL.updateOpinionSubmissionAnswer) public ModelAndView updateOpinionSubmissionAnswer(OpnnSbmsn opnnSbmsn) { - boolean saved = false; String rtnMsg = opnnSbmsnService.updateOpnnSbmsnAnswer(opnnSbmsn); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**지정한 조건에 따라 의견제출 심의 의결서를 출력한다. @@ -375,10 +335,9 @@ public class Excl02Controller extends ApplicationController { DlbrDecsnList hwpFormat = new DlbrDecsnList(print, printOption, dataObjectList); HashMap result = hwpFormat.makeFile().andDownload(); - ModelAndView mav = new ModelAndView("downloadView"); - mav.addAllObjects(result); - return mav; + return new ModelAndView("downloadView") + .addAllObjects(result); } /**지정한 의견제출 대장을 제거한다. @@ -392,7 +351,6 @@ public class Excl02Controller extends ApplicationController { @Task @RequestMapping(name="의견제출 대장 삭제", value=METHOD_URL.removeOpinionSubmission) public ModelAndView removeOpinionSubmission(OpnnSbmsn opnnSbmsn) { - boolean saved = false; String rtnMsg = ""; if (opnnSbmsn.getOpnnIds() == null || opnnSbmsn.getOpnnIds().length < 1) { @@ -411,14 +369,8 @@ public class Excl02Controller extends ApplicationController { } } - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) + .addObject("saved", rtnMsg.contains("[S]")) .addObject("rtnMsg", rtnMsg); } @@ -432,16 +384,14 @@ public class Excl02Controller extends ApplicationController { @Task @RequestMapping(name="의견제출 심의 회원 정보 조회", value=METHOD_URL.getOpinionDeliberationMemberInfo) public ModelAndView getOpinionDeliberationMemberInfo(HttpServletRequest hReq, LevyExclQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl02040-info"); - DataObject opnnDlbrMbrinfo = opnnDlbrMbrService.getOpnnDlbrMbrInfo(req); - return mav - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "excl02040") // jsp pageName - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("Info", json ? opnnDlbrMbrinfo : toJson(opnnDlbrMbrinfo)) // 의견제출 심의 회원 정보 + boolean json = jsonResponse(); + return new ModelAndView(json ? "jsonView" : "fims/excl/excl02040-info") + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "excl02040") // jsp pageName + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("Info", json ? opnnDlbrMbrinfo : toJson(opnnDlbrMbrinfo)) // 의견제출 심의 회원 정보 ; } @@ -455,18 +405,11 @@ public class Excl02Controller extends ApplicationController { @Task @RequestMapping(name="의견제출 심의 회원 등록", value=METHOD_URL.createOpinionDeliberationMember) public ModelAndView create(OpnnDlbrMbr opnnDlbrMbr) { - boolean saved = false; String rtnMsg = opnnDlbrMbrService.createOpnnDlbrMbr(opnnDlbrMbr); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**의견제출 심의 회원 정보를 수정한다. @@ -479,18 +422,10 @@ public class Excl02Controller extends ApplicationController { @Task @RequestMapping(name="의견제출 심의 회원 수정", value=METHOD_URL.updateOpinionDeliberationMember) public ModelAndView update(OpnnDlbrMbr opnnDlbrMbr) { - boolean saved = false; String rtnMsg = opnnDlbrMbrService.updateOpnnDlbrMbr(opnnDlbrMbr); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java index 7f116cbc..ba113b42 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java @@ -19,7 +19,6 @@ import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -56,7 +55,6 @@ public class Excl03Controller extends ApplicationController { /**단속 재등록 서비스*/ @Resource(name="crdnReRegService") private CrdnReRegService crdnReRegService; - /**설정 정보 Bean */ @Resource(name="stngBean") private StngBean stngBean; @@ -67,19 +65,14 @@ public class Excl03Controller extends ApplicationController { */ @RequestMapping(name="단속 재등록 관리 메인", value=METHOD_URL.crackdownReRegistrationMain) public ModelAndView crackdownReRegistrationMain() { - ModelAndView mav = new ModelAndView("fims/excl/excl03010-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM054"); - return mav - .addObject("pageName", "excl03010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) + return new ModelAndView("fims/excl/excl03010-main") + .addObject("pageName", "excl03010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) ; } @@ -148,7 +141,7 @@ public class Excl03Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> { if(i.getValue() instanceof Format) { i.setField(null); }; return i; }).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("단속재등록" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("단속재등록" + "_목록_" + dateTime + ".xlsx")); } } @@ -162,18 +155,10 @@ public class Excl03Controller extends ApplicationController { @Task @PostMapping(name="단속 재등록 등록", value=METHOD_URL.createCrackdownReRegistration) public ModelAndView createCrackdownReRegistration(CrdnReReg crdnReReg) { - boolean saved = false; String rtnMsg = crdnReRegService.createCrdnReReg(crdnReReg); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java index 7c7d768a..b718db88 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java @@ -19,7 +19,6 @@ import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; @@ -27,6 +26,7 @@ import cokr.xit.fims.cmmn.xls.StyleMaker; import cokr.xit.fims.levy.LevyQuery; import cokr.xit.fims.levy.service.LevyService; import cokr.xit.fims.mngt.service.bean.TaskBean; +import cokr.xit.fims.mngt.service.bean.TaskProcessor; import cokr.xit.fims.task.Task; import cokr.xit.foundation.data.DataObject; @@ -60,11 +60,9 @@ public class Levy01Controller extends ApplicationController { /**부과 대장 서비스*/ @Resource(name="levyService") private LevyService levyService; - /**업무 정보 서비스 */ @Resource(name="taskBean") private TaskBean taskBean; - /**설정 정보 Bean */ @Resource(name="stngBean") private StngBean stngBean; @@ -74,20 +72,17 @@ public class Levy01Controller extends ApplicationController { */ @RequestMapping(name="사전 감경부과 등록 메인", value=METHOD_URL.reductionLevyTargetMain) public ModelAndView reductionLevyTargetMain() { - ModelAndView mav = new ModelAndView("fims/levy/levy01010-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 - Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM054", "FIM061", "FIM064"); - addCodes(commonCodes, mav, "FIM004", "FIM005", "FIM006", "FIM061", "FIM064"); - - return mav - .addObject("pageName", "levy01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) + List cdGrps = TaskProcessor.get().getVltnCdGrps(); + cdGrps.add("FIM054"); + String[] groupIDs = cdGrps.toArray(new String[cdGrps.size()]); + + Map> commonCodes = getCodesOf(groupIDs); + return addCodes(commonCodes, new ModelAndView("fims/levy/levy01010-main"), groupIDs) + .addObject("pageName", "levy01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) ; } @@ -158,7 +153,7 @@ public class Levy01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("사전감경부과대상" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("사전감경부과대상" + "_목록_" + dateTime + ".xlsx")); } } @@ -176,20 +171,18 @@ public class Levy01Controller extends ApplicationController { DataObject info = taskBean.getAdvntceYmdInfo(new CmmnQuery().setSggCd(req.getSggCd()) .setTaskSeCd(req.getTaskSeCd())); - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/levy/levy01020-info"); - // 이전에 조회되었던 총건수, 금액 info.put("TNOCS", req.getTnocs()); info.put("GRAMT_FFNLG_AMT", req.getGramtFfnlgAmt()); info.put("GRAMT_ADVNTCE_AMT", req.getGramtAdvntceAmt()); - return mav - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "levy01020") // jsp pageName - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("mainQuery", json ? req : toJson(req)) // 검색 조건 - .addObject("Info", json ? info : toJson(info)) + boolean json = jsonResponse(); + return new ModelAndView(json ? "jsonView" : "fims/levy/levy01020-info") + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "levy01020") // jsp pageName + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("mainQuery", json ? req : toJson(req)) // 검색 조건 + .addObject("Info", json ? info : toJson(info)) ; } @@ -203,17 +196,10 @@ public class Levy01Controller extends ApplicationController { @Task({"PVS","BPV"}) @RequestMapping(name="사전 감경부과 대장 등록", value=METHOD_URL.createReductionLevyList) public ModelAndView createReductionLevyList(LevyQuery req) { - boolean saved = false; String rtnMsg = levyService.createRdctLevyList(req); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) + .addObject("saved", rtnMsg.contains("[S]")) .addObject("rtnMsg", rtnMsg); } @@ -222,21 +208,16 @@ public class Levy01Controller extends ApplicationController { */ @RequestMapping(name="부과 관리 메인", value=METHOD_URL.levyMain) public ModelAndView levyMain() { - ModelAndView mav = new ModelAndView("fims/levy/levy01050-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM010", "FIM046", "FIM054"); - return mav - .addObject("pageName", "levy01050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) - .addObject("FIM010List", commonCodes.get("FIM010")) // 단속 상태 코드(CRDN_STTS_CD) - .addObject("FIM046List", commonCodes.get("FIM046")) // 감경 구분 코드(RDCT_SE_CD) + return new ModelAndView("fims/levy/levy01050-main") + .addObject("pageName", "levy01050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) + .addObject("FIM010List", commonCodes.get("FIM010")) // 단속 상태 코드(CRDN_STTS_CD) + .addObject("FIM046List", commonCodes.get("FIM046")) // 감경 구분 코드(RDCT_SE_CD) ; } @@ -335,8 +316,7 @@ public class Levy01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("부과" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("부과" + "_목록_" + dateTime + ".xlsx")); } } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java index f72b5489..6d19713e 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java @@ -20,7 +20,6 @@ import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -60,10 +59,8 @@ public class Levy02Controller extends ApplicationController { /**과태료 감경 대장 서비스*/ @Resource(name="rdctService") private RdctService rdctService; - @Resource(name="stngBean") private StngBean stngBean; - @Resource(name="userMapper") protected UserMapper userMapper; @@ -73,20 +70,15 @@ public class Levy02Controller extends ApplicationController { */ @RequestMapping(name="과태료 감경 관리 대장 메인", value=METHOD_URL.reductionMain) public ModelAndView reductionMain() { - ModelAndView mav = new ModelAndView("fims/levy/levy02010-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM019", "FIM054"); - return mav - .addObject("pageName", "levy02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) - .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDCT_RSN_CD) + return new ModelAndView("fims/levy/levy02010-main") + .addObject("pageName", "levy02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) + .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDCT_RSN_CD) ; } @@ -156,7 +148,7 @@ public class Levy02Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("과태료감경" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("과태료감경" + "_목록_" + dateTime + ".xlsx")); } } @@ -175,31 +167,29 @@ public class Levy02Controller extends ApplicationController { if (req.getCallPurpose().equals("create")) { // 등록 if (!rdctInfo.string("RDCT_ID").equals("")) { - ModelAndView mav = new ModelAndView("jsonView"); - return mav.addObject("rtnMsg", "이미 등록된 과태료 감경 정보가 있습니다."); + return new ModelAndView("jsonView") + .addObject("rtnMsg", "이미 등록된 과태료 감경 정보가 있습니다."); } else if (rdctInfo.string("RTPYR_ID").equals("")) { - ModelAndView mav = new ModelAndView("jsonView"); - return mav.addObject("rtnMsg", "납부자 정보가 없습니다."); + return new ModelAndView("jsonView") + .addObject("rtnMsg", "납부자 정보가 없습니다."); } } else if (req.getCallPurpose().equals("update")) { // 수정 if (rdctInfo.string("RDCT_ID").equals("")) { - ModelAndView mav = new ModelAndView("jsonView"); - return mav.addObject("rtnMsg", "조회된 과태료 감경 정보가 없습니다."); + return new ModelAndView("jsonView") + .addObject("rtnMsg", "조회된 과태료 감경 정보가 없습니다."); } } - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/levy/levy02020-info"); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM019"); - return mav - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "levy02020") // jsp pageName - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDCT_RSN_CD) - .addObject("Info", json ? rdctInfo : toJson(rdctInfo)) + boolean json = jsonResponse(); + return new ModelAndView(json ? "jsonView" : "fims/levy/levy02020-info") + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "levy02020") // jsp pageName + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDCT_RSN_CD) + .addObject("Info", json ? rdctInfo : toJson(rdctInfo)) ; } @@ -213,17 +203,10 @@ public class Levy02Controller extends ApplicationController { @Task @RequestMapping(name="과태료 감경 대장 등록", value=METHOD_URL.createReduction) public ModelAndView createRdct(Rdct rdct) { - boolean saved = false; String rtnMsg = rdctService.createRdct(rdct); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) + .addObject("saved", rtnMsg.contains("[S]")) .addObject("rtnMsg", rtnMsg); } @@ -237,18 +220,11 @@ public class Levy02Controller extends ApplicationController { @Task @RequestMapping(name="과태료 감경 대장 수정", value=METHOD_URL.updateReduction) public ModelAndView updateRdct(Rdct rdct) { - boolean saved = false; String rtnMsg = rdctService.updateRdct(rdct); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**지정한 과태료 감경 대장를 제거한다. @@ -262,7 +238,6 @@ public class Levy02Controller extends ApplicationController { @Task @RequestMapping(name="과태료 감경 대장 삭제", value=METHOD_URL.removeReduction) public ModelAndView removeRdct(Rdct rdct) { - boolean saved = false; String rtnMsg = ""; if (rdct.getRdctIds() == null || rdct.getRdctIds().length < 1) { @@ -281,15 +256,8 @@ public class Levy02Controller extends ApplicationController { } } - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) + .addObject("saved", rtnMsg.contains("[S]")) .addObject("rtnMsg", rtnMsg); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/mngt/service/bean/TaskProcessor.java b/src/main/java/cokr/xit/fims/mngt/service/bean/TaskProcessor.java index 1706c80d..252fc5a6 100644 --- a/src/main/java/cokr/xit/fims/mngt/service/bean/TaskProcessor.java +++ b/src/main/java/cokr/xit/fims/mngt/service/bean/TaskProcessor.java @@ -1,6 +1,9 @@ package cokr.xit.fims.mngt.service.bean; +import java.util.ArrayList; +import java.util.List; import java.util.function.Supplier; +import java.util.stream.Collectors; import javax.annotation.Resource; @@ -23,22 +26,32 @@ public class TaskProcessor extends AbstractBean { return ifEmpty(proc, () -> proc = supplier.get()); } + protected DataObject vltnCdGrps = new DataObject() + .set("PVS", "FIM004") + .set("BPV", "FIM005") + .set("DPV", "FIM006") + .set("ECA", "FIM061") + .set("PES", "FIM064") + .set("DVS", "FIM066"); + @Resource(name = "crdnStngMapper") protected CrdnStngMapper crdnStngMapper; + /**모든 위반내역 코드그룹을 반환한다. + * @return 모든 위반내역 코드그룹 + */ + public List getVltnCdGrps() { + return vltnCdGrps.entrySet().stream() + .map(entry -> (String)entry.getValue()) + .collect(Collectors.toCollection(ArrayList::new)); + } + /**지정하는 업무의 위반내역 코드그룹을 반환한다. * @param taskSeCd 업무코드 * @return 위반내역 코드그룹 */ public String getVltnCdGrp(String taskSeCd) { - return switch (taskSeCd) { - case "PVS" -> "FIM004"; - case "BPV" -> "FIM005"; - case "DPV" -> "FIM006"; - case "ECA" -> "FIM061"; - case "PES" -> "FIM064"; - default -> ""; - }; + return blankIfEmpty(vltnCdGrps.get(taskSeCd)); } /**지정하는 업무의 기타 코드그룹을 반환한다. diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java index 98d904f2..f2bcb05a 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java @@ -40,31 +40,23 @@ public class Mngt01Controller extends ApplicationController { @Resource(name="ntcService") private NtcService ntcService; - @Resource(name="sigunguDepartmentService") private SigunguDepartmentService sggDeptService; - /** 공지사항 메인화면을 연다. * @return fims/mngt/mngt01010-main */ @RequestMapping(name="공지사항 메인", value=METHOD_URL.ntcMain) public ModelAndView ntcMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/mngt/mngt01010-main"); - mav.addObject("pageName", "mngt01010"); - + ModelAndView mav = new ModelAndView("fims/mngt/mngt01010-main") + .addObject("pageName", "mngt01010"); FimsUser currentUser = (FimsUser) currentUser().getUser(); - if(currentUser.getCntnSeCd().equals("01")) { - mav.addObject("isPublicOfficer", true); - } else { - mav.addObject("isPublicOfficer", false); - } + boolean publicOfficer = "01".equals(currentUser.getCntnSeCd()); + mav.addObject("isPublicOfficer", publicOfficer); List sggList = null; - if(currentUser.getCntnSeCd().equals("01")){ - + if(publicOfficer){ sggList = sggDeptService.getSigunguList(new SigunguQuery()); if(!currentUser.getOrgID().equals("ADMIN")) { @@ -92,9 +84,7 @@ public class Mngt01Controller extends ApplicationController { } } - mav.addObject("sggList", sggList); - - return mav; + return mav.addObject("sggList", sggList); } /**공지사항 목록을 조회하여 반환한다.
@@ -110,21 +100,18 @@ public class Mngt01Controller extends ApplicationController { */ @RequestMapping(name="공지사항 목록 조회", value=METHOD_URL.getNtcList) public ModelAndView getNtcList(NtcQuery req) { - ModelAndView mav = new ModelAndView("jsonView"); setFetchSize(req); - FimsUser currentUser = (FimsUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser)currentUser().getUser(); - if(!currentUser.getOrgID().equals("ADMIN")) { + if(!"ADMIN".equals(currentUser.getOrgID())) { req.setUserSggCd(currentUser.getOrgID()); req.setUserCntnSeCd(currentUser.getCntnSeCd()); } List list = ntcService.getNtcList(req); - return setPagingInfo(mav, list, ""); - - + return setPagingInfo(new ModelAndView("jsonView"), list, ""); } /**공지사항 상세 내용을 조회하여 반환한다.
@@ -135,29 +122,21 @@ public class Mngt01Controller extends ApplicationController { @RequestMapping(name="공지사항 상세 조회", value=METHOD_URL.getNtcInfo) public ModelAndView getNtcInfo(String ntcId, String cntnSeCd) { boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/mngt/mngt01020-info"); - mav.addObject("pageName", "mngt01020"); - DataObject info = new DataObject(); - if(!ifEmpty(ntcId, ()->"").equals("")) { - info = ntcService.getNtcInfo(ntcId); - } else { - info = null; - } + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/mngt/mngt01020-info") + .addObject("pageName", "mngt01020"); + + DataObject info = !isEmpty(ntcId) ? ntcService.getNtcInfo(ntcId) : null; mav.addObject("ntcInfo", json ? info : toJson(info)); FimsUser currentUser = (FimsUser) currentUser().getUser(); - if(currentUser.getCntnSeCd().equals("01")) { - mav.addObject("isPublicOfficer", true); - } else { - mav.addObject("isPublicOfficer", false); - } - + boolean publicOfficer = "01".equals(currentUser.getCntnSeCd()); + mav.addObject("isPublicOfficer", publicOfficer); List allSggList = sggDeptService.getSigunguList(new SigunguQuery()); mav.addObject("allSggList", allSggList); List selectableSggList = null; - if(currentUser.getCntnSeCd().equals("01")) { + if(publicOfficer) { selectableSggList = sggDeptService.getSigunguList(new SigunguQuery()); if(!currentUser.getOrgID().equals("ADMIN")) { String upSggCd = ""; @@ -184,12 +163,9 @@ public class Mngt01Controller extends ApplicationController { }).toList(); } } - mav.addObject("selectableSggList", toJson(selectableSggList)); - - - mav.addObject("cntnSeCd", cntnSeCd); - - return mav; + return mav + .addObject("selectableSggList", toJson(selectableSggList)) + .addObject("cntnSeCd", cntnSeCd); } /**공지사항를 등록한다. @@ -201,16 +177,10 @@ public class Mngt01Controller extends ApplicationController { */ @RequestMapping(name="공지사항 등록", value=METHOD_URL.create) public ModelAndView create(Ntc ntc) { - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = false; - String rtnMsg = ntcService.create(ntc); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /**공지사항 정보를 수정한다. @@ -222,16 +192,10 @@ public class Mngt01Controller extends ApplicationController { */ @RequestMapping(name="공지사항 수정", value=METHOD_URL.update) public ModelAndView update(Ntc ntc) { - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = false; - String rtnMsg = ntcService.update(ntc); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /**지정한 공지사항를 제거한다. @@ -244,16 +208,9 @@ public class Mngt01Controller extends ApplicationController { */ @RequestMapping(name="공지사항 삭제", value=METHOD_URL.remove) public ModelAndView remove(Ntc ntc) { - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = false; - String rtnMsg = ntcService.remove(ntc); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; - + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt02Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt02Controller.java index b6694578..7dea1c5f 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt02Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt02Controller.java @@ -43,11 +43,8 @@ public class Mngt02Controller extends ApplicationController { */ @RequestMapping(name="일정관리", value=METHOD_URL.schdlMain) public ModelAndView schdlMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/mngt/mngt02010-main"); - mav.addObject("pageName", "mngt02010"); - - return mav; + return new ModelAndView("fims/mngt/mngt02010-main") + .addObject("pageName", "mngt02010"); } /**일정관리 목록을 조회하여 반환한다.
@@ -63,12 +60,10 @@ public class Mngt02Controller extends ApplicationController { */ @RequestMapping(name="일정 목록 조회", value=METHOD_URL.getSchdlList) public ModelAndView getSchdlList(SchdlQuery req) { - ModelAndView mav = new ModelAndView("jsonView"); + List list = schdlService.getSchdlList(req.setUserId(currentUser().getId())); - req.setUserId(currentUser().getId()); - List list = schdlService.getSchdlList(req); - mav.addObject("list", list); - return mav; + return new ModelAndView("jsonView") + .addObject("list", list); } /**일정관리를 조회하여 반환한다.
@@ -78,22 +73,14 @@ public class Mngt02Controller extends ApplicationController { */ @RequestMapping(name="일정 조회", value=METHOD_URL.getSchdlInfo) public ModelAndView getSchdlInfo(String schdlId, String schdlBgngYmd, String schdlEndYmd) { + DataObject info = !isEmpty(schdlId) ? schdlService.getSchdlInfo(schdlId) : null; boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/mngt/mngt02020-info"); - mav.addObject("pageName", "mngt02020"); - DataObject info = new DataObject(); - - if(!ifEmpty(schdlId, ()->"").equals("")) { - info = schdlService.getSchdlInfo(schdlId); - } else { - info = null; - } - mav.addObject("schdlInfo", json ? info : toJson(info)); - - mav.addObject("schdlBgngYmd", schdlBgngYmd); - mav.addObject("schdlEndYmd", schdlEndYmd); - return mav; + return new ModelAndView(json ? "jsonView" : "fims/mngt/mngt02020-info") + .addObject("pageName", "mngt02020") + .addObject("schdlInfo", json ? info : toJson(info)) + .addObject("schdlBgngYmd", schdlBgngYmd) + .addObject("schdlEndYmd", schdlEndYmd); } /**일정을 등록한다. @@ -105,17 +92,12 @@ public class Mngt02Controller extends ApplicationController { */ @RequestMapping(name="일정 추가", value=METHOD_URL.create) public ModelAndView create(Schdl schdl) { - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = false; schdl.setUserId(currentUser().getId()); String rtnMsg = schdlService.create(schdl); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - mav.addObject("schdlId", schdl.getSchdlId()); - return mav; + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("schdlId", schdl.getSchdlId()); } /**일정을 수정한다. @@ -127,16 +109,11 @@ public class Mngt02Controller extends ApplicationController { */ @RequestMapping(name="일정 수정", value=METHOD_URL.update) public ModelAndView update(Schdl schdl) { - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = false; schdl.setUserId(currentUser().getId()); String rtnMsg = schdlService.update(schdl); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /**지정한 일정을 제거한다. @@ -149,15 +126,10 @@ public class Mngt02Controller extends ApplicationController { */ @RequestMapping(name="일정 삭제", value=METHOD_URL.remove) public ModelAndView remove(Schdl schdl) { - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = false; schdl.setUserId(currentUser().getId()); String rtnMsg = schdlService.remove(schdl); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index 198fd1c4..e69c6619 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -23,7 +23,6 @@ import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.FimsPrintOption; @@ -40,6 +39,7 @@ import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.mngt.service.bean.TaskBean; +import cokr.xit.fims.mngt.service.bean.TaskProcessor; import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.Sndng; import cokr.xit.fims.sndb.SndngDtl; @@ -136,44 +136,32 @@ public class Sndb01Controller extends ApplicationController { /**발송 대장 서비스*/ @Resource(name="sndngService") private SndngService sndngService; - /**발송 상세 서비스*/ @Resource(name="sndngDtlService") private SndngDtlService sndngDtlService; - /**공시송달 대장 서비스*/ @Resource(name="svbtcService") private SvbtcService svbtcService; - /**업무 정보 서비스*/ @Resource(name="taskBean") private TaskBean taskBean; - /**통합 조회 서비스*/ @Resource(name="integrationSearchService") private IntegrationSearchService integrationSearchService; - @Resource(name="stngBean") private StngBean stngBean; - @Resource(name="fileBean") private FileBean fileBean; - @Resource(name = "ogdpBean") private OgdpBean ogdpBean; - @Resource(name="svbtcBean") private SvbtcBean svbtcBean; - @Resource(name="mediaBean") private MediaBean mediaBean; - @Resource(name="otptStngMapper") private OtptStngMapper otptStngMapper; - @Resource(name="outsourcingStngBean") protected OutsourcingStngBean outsourcingStngBean; - @Resource(name="integrationSearchMapper") private IntegrationSearchMapper integrationSearchMapper; @@ -182,29 +170,22 @@ public class Sndb01Controller extends ApplicationController { */ @RequestMapping(name = "계도장 발송 대상 메인", value = METHOD_URL.warningTargetMain) public ModelAndView warningTargetMain() { - ModelAndView mav = new ModelAndView("fims/sndb/sndb01010-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 - Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM022", "FIM054", "FIM061", "FIM064", "FIM066"); - addCodes(commonCodes, mav, "FIM022", "FIM004", "FIM005", "FIM006", "FIM061", "FIM064", "FIM066"); // 위반 코드(VLTN_CD) + List cdGrps = TaskProcessor.get().getVltnCdGrps(); + cdGrps.add("FIM022"); // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) + cdGrps.add("FIM054"); // 업무구분 코드(TASE_SE_CD) + String[] groupIDs = cdGrps.toArray(new String[cdGrps.size()]); + Map> commonCodes = getCodesOf(groupIDs); - return mav - .addObject("pageName", "sndb01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 - .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) - .addObject("FIM004List", commonCodes.get("FIM004")) // 주정차위반 내역 코드(VLTN_ID) - .addObject("FIM005List", commonCodes.get("FIM005")) // 전용차로위반 내역 코드(VLTN_ID) - .addObject("FIM006List", commonCodes.get("FIM006")) // 장애인주차위반 내역 코드(VLTN_ID) - .addObject("FIM061List", commonCodes.get("FIM061")) // 전기차 충전구역 및 충전방해 위반 코드(VLTN_ID) - .addObject("FIM064List", commonCodes.get("FIM064")) // 화물자동차 밤샘주차 위반 코드(VLTN_ID) - .addObject("FIM066List", commonCodes.get("FIM066")) // 미세먼지 위반 코드(VLTN_ID) + ModelAndView mav = new ModelAndView("fims/sndb/sndb01010-main") + .addObject("pageName", "sndb01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); // 시군구에서 사용하는 업무 목록 - ; + commonCodes.forEach((grpID, codes) -> mav.addObject(grpID + "List", codes)); + + return addCodes(commonCodes, mav, groupIDs); } /**계고장 발송 대상 목록을 조회하여 반환한다. @@ -278,7 +259,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("계고장발송대상" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("계고장발송대상" + "_목록_" + dateTime + ".xlsx")); } } @@ -292,10 +273,9 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="계고장 발송 대상 상세 조회", value=METHOD_URL.getWarningTargetInfo) public ModelAndView getWarningTargetInfo(HttpServletRequest hReq, SndbQuery req) { - boolean json = jsonResponse(); ModelAndView mav = getWarningTargetList(req); - if (json) { + if (jsonResponse()) { mav.setViewName("jsonView"); } else { mav.setViewName("fims/sndb/sndb01020-info"); @@ -325,18 +305,11 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="계고장 발송 등록", value=METHOD_URL.createWarningSendingList) public ModelAndView createWarningSendingList(SndbQuery req, Sndng sndng) { - boolean saved = false; String rtnMsg = sndngService.createWrngSndngList(req, sndng); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**계도장 발송 현황 메인화면(sndb/sndb01/030-main)을 연다. @@ -344,20 +317,15 @@ public class Sndb01Controller extends ApplicationController { */ @RequestMapping(name = "계도장 발송 현황 메인", value = METHOD_URL.warningSendingMain) public ModelAndView warningSendingMain() { - ModelAndView mav = new ModelAndView("fims/sndb/sndb01030-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM054", "FIM067"); - return mav - .addObject("pageName", "sndb01030") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 - .addObject("FIM067List", commonCodes.get("FIM067")) // 발송 등록 구분 코드(SNDNG_REG_SE_CD) + return new ModelAndView("fims/sndb/sndb01030-main") + .addObject("pageName", "sndb01030") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 + .addObject("FIM067List", commonCodes.get("FIM067")) // 발송 등록 구분 코드(SNDNG_REG_SE_CD) ; } @@ -416,7 +384,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("계고장발송현황" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("계고장발송현황" + "_목록_" + dateTime + ".xlsx")); } } @@ -430,10 +398,9 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="계고장 발송 현황 상세 화면", value=METHOD_URL.getWarningSendingDetailInfo) public ModelAndView getWarningSendingDetailInfo(HttpServletRequest hReq, SndbQuery req) { - boolean json = jsonResponse(); ModelAndView mav = getWarningSendingDetailList(req); - if (json) { + if (jsonResponse()) { mav.setViewName("jsonView"); } else { mav.setViewName("fims/sndb/sndb01040-info"); @@ -517,7 +484,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("계도장 발송상세" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("계도장 발송상세" + "_목록_" + dateTime + ".xlsx")); } } @@ -531,7 +498,6 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="계고장 발송 대장 제거", value=METHOD_URL.removeWarningSending) public ModelAndView removeWarningSending(Sndng sndng) { - boolean saved = false; String rtnMsg = ""; // 발송 ID 단건 삭제 @@ -551,15 +517,9 @@ public class Sndb01Controller extends ApplicationController { } } - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**사전통지 발송 대상 자료 메인화면(sndb/sndb01/050-main)을 연다. @@ -567,27 +527,19 @@ public class Sndb01Controller extends ApplicationController { */ @RequestMapping(name = "사전통지 발송 대상 메인", value = METHOD_URL.advanceNoticeTargetMain) public ModelAndView advanceNoticeTargetMain() { - ModelAndView mav = new ModelAndView("fims/sndb/sndb01050-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 - Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM054", "FIM061", "FIM064", "FIM066"); - addCodes(commonCodes, mav, "FIM004", "FIM005", "FIM006", "FIM061", "FIM064", "FIM066"); - - return mav - .addObject("pageName", "sndb01050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 - .addObject("FIM004List", commonCodes.get("FIM004")) // 주정차위반 내역 코드(VLTN_CD) - .addObject("FIM005List", commonCodes.get("FIM005")) // 전용차로위반 내역 코드(VLTN_CD) - .addObject("FIM006List", commonCodes.get("FIM006")) // 장애인주차위반 내역 코드(VLTN_CD) - .addObject("FIM061List", commonCodes.get("FIM061")) // 전기차 충전구역 및 충전방해 위반 코드(VLTN_CD) - .addObject("FIM064List", commonCodes.get("FIM064")) // 화물자동차 밤샘주차 위반 코드(VLTN_CD) - .addObject("FIM066List", commonCodes.get("FIM066")) // 미세먼지 위반 코드(VLTN_ID) - ; + List cdGrps = TaskProcessor.get().getVltnCdGrps(); + cdGrps.add("FIM054"); + String[] groupIDs = cdGrps.toArray(new String[cdGrps.size()]); + Map> commonCodes = getCodesOf(groupIDs); + + ModelAndView mav = new ModelAndView("fims/sndb/sndb01050-main") + .addObject("pageName", "sndb01050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); // 시군구에서 사용하는 업무 목록 + commonCodes.forEach((grpID, codes) -> mav.addObject(grpID + "List", codes)); + return addCodes(commonCodes, mav, groupIDs); } /**사전통지 발송 대상 목록을 조회하여 반환한다. @@ -659,7 +611,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("사전통지발송대상" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("사전통지발송대상" + "_목록_" + dateTime + ".xlsx")); } } @@ -673,10 +625,9 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="사전통지 발송 대상 상세 조회", value=METHOD_URL.getAdvanceNoticeTargetInfo) public ModelAndView getAdvanceNoticeTargetInfo(HttpServletRequest hReq, SndbQuery req) { - boolean json = jsonResponse(); ModelAndView mav = getAdvanceNoticeTargetList(req); - if (json) { + if (jsonResponse()) { mav.setViewName("jsonView"); } else { mav.setViewName("fims/sndb/sndb01060-info"); @@ -714,18 +665,11 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="사전통지 발송 등록", value=METHOD_URL.createAdvanceNoticeSendingList) public ModelAndView createAdvanceNoticeSendingList(SndbQuery req, Sndng sndng) { - boolean saved = false; String rtnMsg = sndngService.createAdvntceSndngList(req, sndng); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**사전통지 발송 현황 메인화면(sndb/sndb01/070-main)을 연다. @@ -734,20 +678,15 @@ public class Sndb01Controller extends ApplicationController { */ @RequestMapping(name = "사전통지 발송 현황 메인", value = METHOD_URL.advanceNoticeSendingMain) public ModelAndView advanceNoticeSendingMain() { - ModelAndView mav = new ModelAndView("fims/sndb/sndb01070-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM054", "FIM067"); - return mav - .addObject("pageName", "sndb01070") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 - .addObject("FIM067List", commonCodes.get("FIM067")) // 발송 등록 구분 코드(SNDNG_REG_SE_CD) + return new ModelAndView("fims/sndb/sndb01070-main") + .addObject("pageName", "sndb01070") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 + .addObject("FIM067List", commonCodes.get("FIM067")) // 발송 등록 구분 코드(SNDNG_REG_SE_CD) ; } @@ -806,7 +745,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("사전통지발송현황" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("사전통지발송현황" + "_목록_" + dateTime + ".xlsx")); } } @@ -820,7 +759,6 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="사전통지 발송 대장 제거", value=METHOD_URL.removeAdvanceNoticeSending) public ModelAndView removeAdvanceNoticeSending(Sndng sndng) { - boolean saved = false; String rtnMsg = ""; // 발송 ID 단건 삭제 @@ -840,15 +778,9 @@ public class Sndb01Controller extends ApplicationController { } } - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**사전통지 발송 현황 - 발송상세 화면(sndb/sndb01/080-info)을 연다. @@ -861,10 +793,9 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="사전통지 발송 현황 상세 화면", value=METHOD_URL.getAdvanceNoticeSendingDetailInfo) public ModelAndView getAdvanceNoticeSendingDetailInfo(HttpServletRequest hReq, SndbQuery req) { - boolean json = jsonResponse(); ModelAndView mav = getAdvanceNoticeSendingDetailList(req); - if (json) { + if (jsonResponse()) { mav.setViewName("jsonView"); } else { mav.setViewName("fims/sndb/sndb01080-info"); @@ -955,7 +886,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("사전통지 발송상세" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("사전통지 발송상세" + "_목록_" + dateTime + ".xlsx")); } } @@ -964,27 +895,20 @@ public class Sndb01Controller extends ApplicationController { */ @RequestMapping(name = "고지서 발송 대상 메인", value = METHOD_URL.noticeSheetTargetMain) public ModelAndView noticeSheetTargetMain() { - ModelAndView mav = new ModelAndView("fims/sndb/sndb01090-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM054", "FIM061", "FIM064"); - addCodes(commonCodes, mav, "FIM004", "FIM005", "FIM006", "FIM061", "FIM064"); - - return mav - .addObject("pageName", "sndb01090") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("infoPrefix", "nhtTrgt") // prefix - .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 - .addObject("FIM004List", commonCodes.get("FIM004")) // 주정차위반 내역 코드(VLTN_CD) - .addObject("FIM005List", commonCodes.get("FIM005")) // 전용차로위반 내역 코드(VLTN_CD) - .addObject("FIM006List", commonCodes.get("FIM006")) // 장애인주차위반 내역 코드(VLTN_CD) - .addObject("FIM061List", commonCodes.get("FIM061")) // 전기차 충전구역 및 충전방해 위반 코드(VLTN_CD) - .addObject("FIM064List", commonCodes.get("FIM064")) // 화물자동차 밤샘주차 위반 코드(VLTN_CD) + return addCodes(commonCodes, new ModelAndView("fims/sndb/sndb01090-main"), "FIM004", "FIM005", "FIM006", "FIM061", "FIM064") + .addObject("pageName", "sndb01090") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("infoPrefix", "nhtTrgt") // prefix + .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 + .addObject("FIM004List", commonCodes.get("FIM004")) // 주정차위반 내역 코드(VLTN_CD) + .addObject("FIM005List", commonCodes.get("FIM005")) // 전용차로위반 내역 코드(VLTN_CD) + .addObject("FIM006List", commonCodes.get("FIM006")) // 장애인주차위반 내역 코드(VLTN_CD) + .addObject("FIM061List", commonCodes.get("FIM061")) // 전기차 충전구역 및 충전방해 위반 코드(VLTN_CD) + .addObject("FIM064List", commonCodes.get("FIM064")) // 화물자동차 밤샘주차 위반 코드(VLTN_CD) ; } @@ -1057,7 +981,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("사전통지발송대상" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("사전통지발송대상" + "_목록_" + dateTime + ".xlsx")); } } @@ -1071,22 +995,18 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="고지서 발송 대상 상세 화면", value=METHOD_URL.getNoticeSheetTargetInfo) public ModelAndView getNoticeSheetTargetInfo(HttpServletRequest hReq, SndbQuery req) { - ModelAndView mav = new ModelAndView("fims/sndb/sndb01100-info"); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM047", "FIM061", "FIM064"); - addCodes(commonCodes, mav, "FIM004", "FIM005", "FIM006", "FIM061", "FIM064", "FIM047"); - - return mav - .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "sndb01100") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("infoPrefix", "nhtTrgt") // prefix - .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) - .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) - .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) + return addCodes(commonCodes, new ModelAndView("fims/sndb/sndb01100-info"), "FIM004", "FIM005", "FIM006", "FIM061", "FIM064", "FIM047") + .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "sndb01100") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("infoPrefix", "nhtTrgt") // prefix + .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) + .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) + .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) ; } @@ -1100,18 +1020,11 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="고지서 발송 대장 등록", value=METHOD_URL.createNoticeSheetSendingList) public ModelAndView createNoticeSheetSendingList(SndbQuery req, Sndng sndng) { - boolean saved = false; String rtnMsg = sndngService.createNhtSndngList(req, sndng); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**고지서 발송 현황 메인화면(sndb/sndb01/110-main)을 연다. @@ -1120,22 +1033,16 @@ public class Sndb01Controller extends ApplicationController { */ @RequestMapping(name = "고지서 발송 현황 메인", value = METHOD_URL.noticeSheetSendingMain) public ModelAndView noticeSheetSendingMain() { - ModelAndView mav = new ModelAndView("fims/sndb/sndb01110-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM047", "FIM054", "FIM067"); - addCodes(commonCodes, mav, "FIM047"); - return mav - .addObject("pageName", "sndb01110") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 - .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) - .addObject("FIM067List", commonCodes.get("FIM067")) // 발송 등록 구분 코드(SNDNG_REG_SE_CD) + return addCodes(commonCodes, new ModelAndView("fims/sndb/sndb01110-main"), "FIM047") + .addObject("pageName", "sndb01110") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 + .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) + .addObject("FIM067List", commonCodes.get("FIM067")) // 발송 등록 구분 코드(SNDNG_REG_SE_CD) ; } @@ -1194,7 +1101,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("고지서발송현황" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("고지서발송현황" + "_목록_" + dateTime + ".xlsx")); } } @@ -1208,7 +1115,6 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="고지서 발송 대장 삭제", value=METHOD_URL.removeNoticeSheetSending) public ModelAndView removeNoticeSheetSending(Sndng sndng) { - boolean saved = false; String rtnMsg = ""; // 발송(sndngId) 단건 삭제 @@ -1228,15 +1134,9 @@ public class Sndb01Controller extends ApplicationController { } } - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**고지서 발송 현황 - 발송상세 화면(sndb/sndb01/120-info)을 연다. @@ -1342,7 +1242,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("고지서발송상세" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("고지서발송상세" + "_목록_" + dateTime + ".xlsx")); } } @@ -1356,18 +1256,11 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="우편통합 발송 연계 등록", value=METHOD_URL.createSendingLink) public ModelAndView createSendingLink(Sndng sndng) { - boolean saved = false; String rtnMsg = sndngService.createSndngLink(sndng); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**수기 반송 등록 정보(sndb/sndb01/210-info)을 연다. @@ -1377,19 +1270,17 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name = "수기 반송 등록 정보 조회", value = METHOD_URL.sendingDetailInfo) public ModelAndView sendingDetailInfo(HttpServletRequest hReq, SndbQuery req) { - ModelAndView mav = new ModelAndView("fims/sndb/sndb01210-info"); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM047", "FIM054", "FIM081"); - return mav - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "sndb01210") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) - .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) - .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) - .addObject("FIM081List", commonCodes.get("FIM081")) // 미배달 사유 코드(UNDLVR_RSN_CD) + return new ModelAndView("fims/sndb/sndb01210-info") + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "sndb01210") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) + .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) + .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) + .addObject("FIM081List", commonCodes.get("FIM081")) // 미배달 사유 코드(UNDLVR_RSN_CD) ; } @@ -1464,7 +1355,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("발송 상세" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("발송 상세" + "_목록_" + dateTime + ".xlsx")); } } @@ -1478,18 +1369,11 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="발송상세 목록의 반송 정보 등록", value=METHOD_URL.createSendBackList) public ModelAndView createSendBackList(SndbQuery req) { - boolean saved = false; String rtnMsg = sndngDtlService.createSndbkList(req); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**발송상세 정보의 반송 정보를 등록한다. @@ -1502,18 +1386,11 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="발송상세의 반송 정보 등록", value=METHOD_URL.createSendBack) public ModelAndView createSendBack(SndngDtl sndngDtl) { - boolean saved = false; String rtnMsg = sndngDtlService.createSndbk(sndngDtl); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**발송상세 정보의 반송 정보를 수정한다. @@ -1526,18 +1403,11 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="발송상세의 반송 정보 수정", value=METHOD_URL.updateSendBack) public ModelAndView updateSendBack(SndngDtl sndngDtl) { - boolean saved = false; String rtnMsg = sndngDtlService.updateSndbk(sndngDtl); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**발송상세 정보의 반송 정보를 삭제한다. @@ -1550,7 +1420,6 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="발송 상세의 반송 정보 삭제", value=METHOD_URL.removeSendBack) public ModelAndView removeSendBack(SndngDtl sndngDtl) { - boolean saved = false; String rtnMsg = ""; // 발송상세의 반송 정보 삭제 @@ -1569,15 +1438,9 @@ public class Sndb01Controller extends ApplicationController { } } - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**반송 현황 메인화면(sndb/sndb01/220-main)을 연다. @@ -1586,21 +1449,16 @@ public class Sndb01Controller extends ApplicationController { */ @RequestMapping(name = "반송 현황 메인", value = METHOD_URL.sendBackMain) public ModelAndView sendBackMain() { - ModelAndView mav = new ModelAndView("fims/sndb/sndb01220-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM047", "FIM054", "FIM081"); - return mav - .addObject("pageName", "sndb01220") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 - .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) - .addObject("FIM081List", commonCodes.get("FIM081")) // 미배달 사유 코드(UNDLVR_RSN_CD) + return new ModelAndView("fims/sndb/sndb01220-main") + .addObject("pageName", "sndb01220") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 + .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) + .addObject("FIM081List", commonCodes.get("FIM081")) // 미배달 사유 코드(UNDLVR_RSN_CD) ; } @@ -1673,7 +1531,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("반송현황" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("반송현황" + "_목록_" + dateTime + ".xlsx")); } } @@ -1691,27 +1549,23 @@ public class Sndb01Controller extends ApplicationController { // 등록을 호출하였지만 등록된 미배달 사유가 있는지 확인. if (req.getCallPurpose().equals("create") && !info.string("UNDLVR_RSN_NM").equals("")) { - ModelAndView mav = new ModelAndView("jsonView"); - - return mav.addObject("pageName", "sndb01230") - .addObject("rtnMsg", "이미 등록된 미배달 사유가 있습니다.") - ; + return new ModelAndView("jsonView") + .addObject("pageName", "sndb01230") + .addObject("rtnMsg", "이미 등록된 미배달 사유가 있습니다."); } else { boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sndb/sndb01230-info"); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM054", "FIM081"); - return mav - .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "sndb01230") // jsp pageName - .addObject("infoPrefix", "sndbk") // prefix - .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) - .addObject("FIM081List", commonCodes.get("FIM081")) // 미배달 사유 코드(UNDLVR_RSN_CD) - .addObject("sndbkInfo", json ? info : toJson(info)) // 반송 정보 + return new ModelAndView(json ? "jsonView" : "fims/sndb/sndb01230-info") + .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "sndb01230") // jsp pageName + .addObject("infoPrefix", "sndbk") // prefix + .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl + .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) + .addObject("FIM081List", commonCodes.get("FIM081")) // 미배달 사유 코드(UNDLVR_RSN_CD) + .addObject("sndbkInfo", json ? info : toJson(info)) // 반송 정보 ; } } @@ -1722,20 +1576,15 @@ public class Sndb01Controller extends ApplicationController { */ @RequestMapping(name = "공시송달 현황 메인", value = METHOD_URL.serviceByPublicNoticeMain) public ModelAndView serviceByPublicNoticeMain() { - ModelAndView mav = new ModelAndView("fims/sndb/sndb01240-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM047", "FIM054"); - return mav - .addObject("pageName", "sndb01240") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) - .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 - .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) + return new ModelAndView("fims/sndb/sndb01240-main") + .addObject("pageName", "sndb01240") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 + .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) ; } @@ -1807,10 +1656,9 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="공시송달 상세 화면", value=METHOD_URL.getServiceByPublicNoticeDetailInfo) public ModelAndView getServiceByPublicNoticeDetailInfo(HttpServletRequest hReq, SndbQuery req) { - boolean json = jsonResponse(); ModelAndView mav = getServiceByPublicNoticeDetailList(req); - if (json) { + if (jsonResponse()) { mav.setViewName("jsonView"); } else { mav.setViewName("fims/sndb/sndb01250-info"); @@ -1901,7 +1749,7 @@ public class Sndb01Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("공시송달상세" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("공시송달상세" + "_목록_" + dateTime + ".xlsx")); } } @@ -1925,10 +1773,8 @@ public class Sndb01Controller extends ApplicationController { SvbtcList hwpFormat = new SvbtcList(print, printOption, dataObjectList); HashMap result = hwpFormat.makeFile().andDownload(); - ModelAndView mav = new ModelAndView("downloadView"); - mav.addAllObjects(result); - - return mav; + return new ModelAndView("downloadView") + .addAllObjects(result); } /**지정한 ID의 공시송달 정보를 반환한다. @@ -1942,7 +1788,6 @@ public class Sndb01Controller extends ApplicationController { @RequestMapping(name="공시송달 정보 상세 조회", value=METHOD_URL.getServiceByPublicNoticeInfo) public ModelAndView getServiceByPublicNoticeInfo(HttpServletRequest hReq, SndbQuery req) { boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sndb/sndb01260-info"); // 공시송달 정보 조회 DataObject svbtcInfo = new DataObject(); @@ -1957,14 +1802,12 @@ public class Sndb01Controller extends ApplicationController { // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM047", "FIM054"); - addCodes(commonCodes, mav, "FIM047", "FIM054"); - - return mav - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "sndb01260") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("prefixUrl", CLASS_URL) // prefixUrl - .addObject("mainQuery", json ? req : toJson(req)) // mainQuery - .addObject("Info", json ? svbtcInfo : toJson(svbtcInfo)) // 공시송달 정보 + return addCodes(commonCodes, new ModelAndView(json ? "jsonView" : "fims/sndb/sndb01260-info"), "FIM047", "FIM054") + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "sndb01260") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("mainQuery", json ? req : toJson(req)) // mainQuery + .addObject("Info", json ? svbtcInfo : toJson(svbtcInfo)) // 공시송달 정보 ; } @@ -1978,18 +1821,11 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="공시송달 등록", value=METHOD_URL.createServiceByPublicNotice) public ModelAndView createServiceByPublicNotice(SndbQuery req, Svbtc svbtc) { - boolean saved = false; String rtnMsg = svbtcService.createSvbtc(req, svbtc); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**공시송달 대장에 공시송달 정보를 수정한다. @@ -2002,18 +1838,11 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="공시송달 수정", value=METHOD_URL.updateServiceByPublicNotice) public ModelAndView updateServiceByPublicNotice(Svbtc svbtc) { - boolean saved = false; String rtnMsg = svbtcService.updateSvbtc(svbtc); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**지정한 공시송달 ID에 해당하는 공시송달 대장을 제거한다. @@ -2027,7 +1856,6 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="공시송달 삭제", value=METHOD_URL.removeServiceByPublicNotice) public ModelAndView removeServiceByPublicNotice(Svbtc svbtc) { - boolean saved = false; String rtnMsg = ""; if (svbtc.getSvbtcIds() == null || svbtc.getSvbtcIds().length < 1) { @@ -2046,15 +1874,9 @@ public class Sndb01Controller extends ApplicationController { } } - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**지정한 공시송달 ID에 해당하는 공시송달 대장을 제거한다. @@ -2068,18 +1890,11 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="공시송달 개별 삭제", value=METHOD_URL.removeServiceByPublicNoticeEach) public ModelAndView removeServiceByPublicNoticeEach(Svbtc svbtc) { - boolean saved = false; String rtnMsg = svbtcService.removeSvbtcEach(svbtc); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /** 사전통지서를 PDF 파일로 작성한다. @@ -2088,8 +1903,6 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="사전통지서 pdf 파일 생성", value=METHOD_URL.makeAdvanceNoticePdf) public ModelAndView makeAdvanceNoticePdf(SndbQuery req, FimsPrintOption printOption) { - ModelAndView mav = new ModelAndView("downloadView"); - List list = sndngDtlService.getSndngTrgtDtlIds(req); String[] crdnIds = new String[list.size()]; @@ -2174,9 +1987,8 @@ public class Sndb01Controller extends ApplicationController { Advntce pdfFormat = new Advntce(print,printOption,otptBscStng,otptArtclStngList,paperSeCd,dataObjectList); Map result = pdfFormat.makeFile(); - mav.addAllObjects(result); - - return mav; + return new ModelAndView("downloadView") + .addAllObjects(result); } /** 사전통지 정보로 txt파일,이미지파일을 생성하고 압축파일로 반환한다. @@ -2185,8 +1997,6 @@ public class Sndb01Controller extends ApplicationController { @Task @RequestMapping(name="사전통지서 외주 파일 생성", value=METHOD_URL.makeAdvanceNoticeOutsourcing) public ModelAndView makeAdvanceNoticeOutsourcing(SndbQuery req, FimsPrintOption printOption) { - ModelAndView mav = new ModelAndView("downloadView"); - String taskSeCd = ""; List list = sndngDtlService.getSndngTrgtDtlIds(req); @@ -2225,8 +2035,9 @@ public class Sndb01Controller extends ApplicationController { for(int j=0; j < fileInfoList.size(); j++) { DataObject fileInfo = fileInfoList.get(j); - dataObject.set("CRDN_PHOTO"+(j+1), fileInfo.string("FILE_PATH")); - dataObject.set("CRDN_PHOTO"+(j+1)+"KEY", fileInfo.string("FILE_ID")); + dataObject + .set("CRDN_PHOTO"+(j+1), fileInfo.string("FILE_PATH")) + .set("CRDN_PHOTO"+(j+1)+"KEY", fileInfo.string("FILE_ID")); List mosSet = mediaBean.getMosaicList(fileInfo.string("FILE_ID")); if(mosSet != null) { for(int k=0; k < mosSet.size(); k++) { @@ -2241,22 +2052,18 @@ public class Sndb01Controller extends ApplicationController { } - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - - OutsourcingStngQuery stngQuery = new OutsourcingStngQuery(); - stngQuery.setSggCd(sggCd); - stngQuery.setTaskSeCd(taskSeCd); - stngQuery.setSndngSeCd("02"); + OutsourcingStngQuery stngQuery = new OutsourcingStngQuery() + .setSndngSeCd("02") + .setSggCd(currentUser().getOrgID()) + .setTaskSeCd(taskSeCd); List printStngItems = outsourcingStngBean.getArtclStngList(stngQuery); OutsourcingFileMaker osMaker = new OutsourcingFileMaker("사전통지", printOption, printStngItems, dataObjectList); Map result = osMaker.makeFile(); - mav.addAllObjects(result); - - return mav; + return new ModelAndView("downloadView") + .addAllObjects(result); } /** 고지서를 PDF 파일로 작성한다. @@ -2276,8 +2083,6 @@ public class Sndb01Controller extends ApplicationController { UserInfo userInfo = currentUser(); ogdpBean.initUserInfo(userInfo); - ModelAndView mav = new ModelAndView("downloadView"); - // 단속 대장 조회 SprtQuery sprtQuery = new SprtQuery(); sprtQuery.setCrdnIds(crdnIds); @@ -2347,9 +2152,8 @@ public class Sndb01Controller extends ApplicationController { Map result = pdfFormat.makeFile(); - mav.addAllObjects(result); - - return mav; + return new ModelAndView("downloadView") + .addAllObjects(result); } /** 고지서 정보로 txt파일,이미지파일을 생성하고 압축파일로 반환한다. @@ -2369,8 +2173,6 @@ public class Sndb01Controller extends ApplicationController { UserInfo userInfo = currentUser(); ogdpBean.initUserInfo(userInfo); - ModelAndView mav = new ModelAndView("downloadView"); - String taskSeCd = req.getTaskSeCd(); // 단속 대장 조회 @@ -2411,13 +2213,10 @@ public class Sndb01Controller extends ApplicationController { } } - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - - OutsourcingStngQuery stngQuery = new OutsourcingStngQuery(); - stngQuery.setSggCd(sggCd); - stngQuery.setTaskSeCd(taskSeCd); - stngQuery.setSndngSeCd("03"); + OutsourcingStngQuery stngQuery = new OutsourcingStngQuery() + .setSndngSeCd("03") + .setSggCd(currentUser().getOrgID()) + .setTaskSeCd(taskSeCd); List printStngItems = outsourcingStngBean.getArtclStngList(stngQuery); @@ -2425,9 +2224,7 @@ public class Sndb01Controller extends ApplicationController { Map result = osMaker.makeFile(); - mav.addAllObjects(result); - - return mav; + return new ModelAndView("downloadView").addAllObjects(result); } /**과태료 대장 단속 정보 등록를 등록한다. @@ -2443,31 +2240,25 @@ public class Sndb01Controller extends ApplicationController { boolean saved = false; String rtnMsg = ""; - List dtlList = sndngDtlService.getSndngTrgtDtlIds(req); - // 발송상세 Ids 만큼 반복.. - for (int iLoop = 0; iLoop < dtlList.size(); iLoop++) { + for (DataObject dtl: sndngDtlService.getSndngTrgtDtlIds(req)) { SndngDtl sndngDtl = new SndngDtl(); - sndngDtl.setSndngDtlId(dtlList.get(iLoop).string("SNDNG_DTL_ID")); - sndngDtl.setCrdnId(dtlList.get(iLoop).string("CRDN_ID")); - sndngDtl.setLinkTrgtCd(dtlList.get(iLoop).string("LINK_TRGT_CD")); - sndngDtl.setLinkMngKey(dtlList.get(iLoop).string("LINK_MNG_KEY")); - sndngDtl.setSndngDtlSttsCd(dtlList.get(iLoop).string("SNDNG_DTL_STTS_CD")); + sndngDtl.setSndngDtlId(dtl.string("SNDNG_DTL_ID")); + sndngDtl.setCrdnId(dtl.string("CRDN_ID")); + sndngDtl.setLinkTrgtCd(dtl.string("LINK_TRGT_CD")); + sndngDtl.setLinkMngKey(dtl.string("LINK_MNG_KEY")); + sndngDtl.setSndngDtlSttsCd(dtl.string("SNDNG_DTL_STTS_CD")); sndngDtl.setDelYn("N"); sndngDtl.setSndngYmd(sndng.getSndngYmd()); rtnMsg = sndngDtlService.setNxrpIndivA01List(sndngDtl); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } + saved = rtnMsg.contains("[S]"); } return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", saved) + .addObject("rtnMsg", rtnMsg); } /**과태료 대장 등록 자료 상세 조회(실시간)한다. @@ -2483,30 +2274,23 @@ public class Sndb01Controller extends ApplicationController { boolean saved = false; String rtnMsg = ""; - List dtlList = sndngDtlService.getSndngTrgtDtlIds(req); - // 발송상세 Ids 만큼 반복.. - for (int iLoop = 0; iLoop < dtlList.size(); iLoop++) { + for (DataObject dtl: sndngDtlService.getSndngTrgtDtlIds(req)) { SndngDtl sndngDtl = new SndngDtl(); - - sndngDtl.setSndngDtlId(dtlList.get(iLoop).string("SNDNG_DTL_ID")); - sndngDtl.setCrdnId(dtlList.get(iLoop).string("CRDN_ID")); - sndngDtl.setLinkTrgtCd(dtlList.get(iLoop).string("LINK_TRGT_CD")); - sndngDtl.setLinkMngKey(dtlList.get(iLoop).string("LINK_MNG_KEY")); - sndngDtl.setSndngDtlSttsCd(dtlList.get(iLoop).string("SNDNG_DTL_STTS_CD")); + sndngDtl.setSndngDtlId(dtl.string("SNDNG_DTL_ID")); + sndngDtl.setCrdnId(dtl.string("CRDN_ID")); + sndngDtl.setLinkTrgtCd(dtl.string("LINK_TRGT_CD")); + sndngDtl.setLinkMngKey(dtl.string("LINK_MNG_KEY")); + sndngDtl.setSndngDtlSttsCd(dtl.string("SNDNG_DTL_STTS_CD")); sndngDtl.setDelYn("N"); rtnMsg = sndngDtlService.getNxrpIndivA03List(sndngDtl); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } + saved = rtnMsg.contains("[S]"); } return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", saved) + .addObject("rtnMsg", rtnMsg); } /**과태료 대장 등록 자료 상세 조회(실시간)한다. @@ -2550,5 +2334,4 @@ public class Sndb01Controller extends ApplicationController { .addObject("saved", saved) .addObject("rtnMsg", rtnMsg); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index afb84100..ed0404a7 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -104,40 +104,28 @@ public class Sprt01Controller extends ApplicationController { /**통합 조회 서비스*/ @Resource(name="integrationSearchService") private IntegrationSearchService integrationSearchService; - @Resource(name="userMapper") protected UserMapper userMapper; - @Resource(name="otptStngBean") protected OtptStngBean otptStngBean; - @Resource(name="outsourcingStngBean") protected OutsourcingStngBean outsourcingStngBean; - @Resource(name = "fileBean") private FileBean fileBean; - @Resource(name = "sndngBean") private SndngBean sndngBean; - @Resource(name = "taskBean") private TaskBean taskBean; - @Resource(name = "ogdpBean") private OgdpBean ogdpBean; - @Resource(name = "mediaBean") private MediaBean mediaBean; - @Resource(name = "stngBean") private StngBean stngBean; - @Resource(name = "crdnListMapper") private CrdnListMapper crdnListMapper; - @Resource(name = "integrationSearchMapper") private IntegrationSearchMapper integrationSearchMapper; - @Resource(name = "otptStngMapper") private OtptStngMapper otptStngMapper; @@ -147,33 +135,23 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="통합조회 메인", value=METHOD_URL.integrationSearchMain) public ModelAndView integrationSearchMain() { - - ModelAndView mav = new ModelAndView("fims/sprt/sprt01010-main"); - mav.addObject("pageName", "sprt01010"); - - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - mav.addObject("sggCd", sggCd); - - Map> commonCodes = getCodesOf("FIM003", "FIM010", "FIM026", "FIM054" - ,"FIM004","FIM005","FIM006","FIM061","FIM064"); - - mav.addObject("FIM003List", commonCodes.get("FIM003")); - mav.addObject("FIM010List", commonCodes.get("FIM010")); - mav.addObject("FIM026List", commonCodes.get("FIM026")); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); - mav.addObject("FIM004List", commonCodes.get("FIM004")); - mav.addObject("FIM005List", commonCodes.get("FIM005")); - mav.addObject("FIM006List", commonCodes.get("FIM006")); - mav.addObject("FIM061List", commonCodes.get("FIM061")); - mav.addObject("FIM064List", commonCodes.get("FIM064")); - - - addCodes(commonCodes, mav, "FIM003", "FIM010", "FIM026", "FIM054" - ,"FIM004","FIM005","FIM006","FIM061","FIM064"); - - return mav; + Map> commonCodes = getCodesOf("FIM003", "FIM010", "FIM026", "FIM054","FIM004","FIM005","FIM006","FIM061","FIM064"); + + ModelAndView mav = new ModelAndView("fims/sprt/sprt01010-main") + .addObject("pageName", "sprt01010") + .addObject("sggCd", currentUser().getOrgID()) + .addObject("FIM003List", commonCodes.get("FIM003")) + .addObject("FIM010List", commonCodes.get("FIM010")) + .addObject("FIM026List", commonCodes.get("FIM026")) + .addObject("FIM054List", commonCodes.get("FIM054")) + .addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) + .addObject("FIM004List", commonCodes.get("FIM004")) + .addObject("FIM005List", commonCodes.get("FIM005")) + .addObject("FIM006List", commonCodes.get("FIM006")) + .addObject("FIM061List", commonCodes.get("FIM061")) + .addObject("FIM064List", commonCodes.get("FIM064")); + + return addCodes(commonCodes, mav, "FIM003", "FIM010", "FIM026", "FIM054" ,"FIM004","FIM005","FIM006","FIM061","FIM064"); } /**지정한 조건에 따라 통합 조회 자료 목록을 반환한다.
@@ -183,12 +161,8 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="통합조회 자료 목록", value=METHOD_URL.getIntegrationDataList) public ModelAndView getIntegrationDataList(SprtQuery query, HttpServletRequest req) { - ModelAndView mav = new ModelAndView("jsonView"); - - this.makeIntegrationSearchQuery(query, req); - + makeIntegrationSearchQuery(query, req); List list = integrationSearchService.getIntegrationDataList(query); - List upList = list.stream().filter(item -> item.string("RCVMT_ETC_YN").equals("N")).toList(); List downList = list.stream().filter(item -> item.string("RCVMT_ETC_YN").equals("Y")).toList(); @@ -274,13 +248,12 @@ public class Sprt01Controller extends ApplicationController { .addObject("downloadData", listForExcel).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } - mav.addObject("upList", upList); - mav.addObject("downList", downList); - return mav; + return new ModelAndView("jsonView") + .addObject("upList", upList) + .addObject("downList", downList); } private void makeIntegrationSearchQuery(SprtQuery query, HttpServletRequest req) { - Map pm = req.getParameterMap(); Enumeration pns = req.getParameterNames(); @@ -391,11 +364,9 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="특기사항 일괄 입력 화면", value=METHOD_URL.inputEtcCnMain) public ModelAndView inputEtcCnMain(String... crdnIds) { - ModelAndView mav = new ModelAndView("fims/sprt/sprt01100-info"); - mav.addObject("pageName", "sprt01100"); - mav.addObject("crdnIds", toJson(crdnIds)); - - return mav; + return new ModelAndView("fims/sprt/sprt01100-info") + .addObject("pageName", "sprt01100") + .addObject("crdnIds", toJson(crdnIds)); } /**특기사항을 일괄 갱신한다. @@ -408,17 +379,9 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="특기사항 일괄 입력", value=METHOD_URL.inputEtcCn) public ModelAndView inputEtcCn(Crdn crdn, String... crdnIds) { - ModelAndView mav = new ModelAndView("jsonView"); - - boolean saved = false; - String rtnMsg = integrationSearchService.updateEtcCn(crdn.getEtcCn(), crdnIds); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - - return mav; + return new ModelAndView("jsonView") + .addObject("saved", rtnMsg.contains("[S]")); } /**단속내역서,확인서 출력 화면을 연다. @@ -427,11 +390,9 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="단속 내역서,확인서 출력 화면", value=METHOD_URL.printCrdnMain) public ModelAndView printCrdnMain(String... crdnIds) { - ModelAndView mav = new ModelAndView("fims/sprt/sprt01110-info"); - mav.addObject("pageName", "sprt01110"); - mav.addObject("crdnIds", toJson(crdnIds)); - - return mav; + return new ModelAndView("fims/sprt/sprt01110-info") + .addObject("pageName", "sprt01110") + .addObject("crdnIds", toJson(crdnIds)); } /** 단속내역서를 한글 파일로 작성한다. @@ -439,7 +400,6 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="단속 내역서 한글 파일 생성", value=METHOD_URL.makeCrdnListFileFromHwpFormat) public ModelAndView makeCrdnListFileFromHwpFormat(String privateInfoYn, String... crdnIds) { - FimsPrintOption printOption = new FimsPrintOption(); printOption.setPrivateInfoYn(privateInfoYn); UserInfo userInfo = currentUser(); @@ -447,17 +407,15 @@ public class Sprt01Controller extends ApplicationController { Print print = new Print(); print.setPrintRequestUserInfo(userInfo); - CrdnQuery query = new CrdnQuery(); - query.setCrdnIds(crdnIds); + CrdnQuery query = new CrdnQuery() + .setCrdnIds(crdnIds); List dataObjectList = crdnListMapper.selectCrackdownList(query); - CrdnList hwpFormat = new CrdnList(print, printOption, dataObjectList); HashMap result = hwpFormat.makeFile().andDownload(); - ModelAndView mav = new ModelAndView("downloadView"); - mav.addAllObjects(result); - return mav; + return new ModelAndView("downloadView") + .addAllObjects(result); } /** 단속확인서를 한글 파일로 작성한다. @@ -465,7 +423,6 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="단속 확인서 한글 파일 생성", value=METHOD_URL.makeCrdnConfirmFileFromHwpFormat) public ModelAndView makeCrdnConfirmFileFromHwpFormat(String... crdnIds) { - FimsPrintOption printOption = new FimsPrintOption(); UserInfo userInfo = currentUser(); @@ -473,17 +430,17 @@ public class Sprt01Controller extends ApplicationController { Print print = new Print(); print.setPrintRequestUserInfo(userInfo); - CrdnQuery query = new CrdnQuery(); - query.setCrdnIds(crdnIds); + CrdnQuery query = new CrdnQuery() + .setCrdnIds(crdnIds); List dataObjectList = crdnListMapper.selectCrackdownList(query); for(int i=0; i < dataObjectList.size(); i++) { DataObject dataObject = dataObjectList.get(i); String crndId = dataObject.string("CRDN_ID"); - FileQuery fileQuery = new FileQuery(); - fileQuery.setInfoType(Crdn.INF_TYPE); - fileQuery.setInfoKeys(crndId); + FileQuery fileQuery = new FileQuery() + .setInfoType(Crdn.INF_TYPE) + .setInfoKeys(crndId); List fileInfoList = fileBean.getFileList(fileQuery); if(fileInfoList != null && fileInfoList.size() > 0) { dataObject.set("PHOTO1", fileInfoList.get(0).string("URL")); @@ -499,10 +456,8 @@ public class Sprt01Controller extends ApplicationController { CrdnConfirm hwpFormat = new CrdnConfirm(print, printOption, dataObjectList); HashMap result = hwpFormat.makeFile().andDownload(); - ModelAndView mav = new ModelAndView("downloadView"); - mav.addAllObjects(result); - - return mav; + return new ModelAndView("downloadView") + .addAllObjects(result); } /**교부청구서,채권신고서 출력 화면을 연다. @@ -511,11 +466,9 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="교부청구서,채권신고서 출력 화면", value=METHOD_URL.printBillMain) public ModelAndView printBillMain(String... crdnIds) { - ModelAndView mav = new ModelAndView("fims/sprt/sprt01120-info"); - mav.addObject("pageName", "sprt01120"); - mav.addObject("crdnIds", toJson(crdnIds)); - - return mav; + return new ModelAndView("fims/sprt/sprt01120-info") + .addObject("pageName", "sprt01120") + .addObject("crdnIds", toJson(crdnIds)); } /** 교부청구서를 한글 파일로 작성한다. @@ -523,7 +476,6 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="교부청구서 한글 파일 생성", value=METHOD_URL.makeRequestForDeliveryFileFromHwpFormat) public ModelAndView makeRequestForDeliveryFileFromHwpFormat(FimsPrintOption printOption, String globalVariableInfo, String... crdnIds) { - DataObject sggStngInfo = stngBean.getStng("sgg"); DataObject deptStngInfo = stngBean.getStng("dept"); @@ -548,17 +500,15 @@ public class Sprt01Controller extends ApplicationController { Print print = new Print(); print.setPrintRequestUserInfo(userInfo); - SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIds(crdnIds); + SprtQuery sprtQuery = new SprtQuery() + .setCrdnIds(crdnIds); List dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); RequestForDelivery hwpFormat = new RequestForDelivery(print, printOption, dataObjectList); HashMap result = hwpFormat.makeFile().andDownload(); - ModelAndView mav = new ModelAndView("downloadView"); - mav.addAllObjects(result); - - return mav; + return new ModelAndView("downloadView") + .addAllObjects(result); } /** 채권신고서를 한글 파일로 작성한다. @@ -591,16 +541,15 @@ public class Sprt01Controller extends ApplicationController { globalVariable.put("offcsFilePath", sggStngInfo.string("OFFCS_FILE_PATH")); printOption.setGlobalVariable(globalVariable); - SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIds(crdnIds); + SprtQuery sprtQuery = new SprtQuery() + .setCrdnIds(crdnIds); List dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); - ReportOnClaims hwpFormat = new ReportOnClaims(print, printOption, dataObjectList); HashMap result = hwpFormat.makeFile().andDownload(); - ModelAndView mav = new ModelAndView("downloadView"); - mav.addAllObjects(result); - return mav; + + return new ModelAndView("downloadView") + .addAllObjects(result); } /** 납부확인서를 한글 파일로 작성한다. @@ -608,7 +557,6 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="납부확인서 한글 파일 생성", value=METHOD_URL.makeRcvmtConfirmFileFromHwpFormat) public ModelAndView makeRcvmtConfirmFileFromHwpFormat(String... crdnIds) { - UserInfo userInfo = currentUser(); ogdpBean.initUserInfo(userInfo); Print print = new Print(); @@ -617,16 +565,14 @@ public class Sprt01Controller extends ApplicationController { FimsPrintOption printOption = new FimsPrintOption(); printOption.setGlobalVariable(new HashMap()); - SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIds(crdnIds); + SprtQuery sprtQuery = new SprtQuery() + .setCrdnIds(crdnIds); List dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); RcvmtConfirm hwpFormat = new RcvmtConfirm(print, printOption, dataObjectList); HashMap result = hwpFormat.makeFile().andDownload(); - ModelAndView mav = new ModelAndView("downloadView"); - mav.addAllObjects(result); - - return mav; + return new ModelAndView("downloadView") + .addAllObjects(result); } /**사전통지서 출력 화면을 연다. @@ -635,11 +581,9 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="사전통지서 출력 화면", value=METHOD_URL.printAdvntceMain) public ModelAndView printAdvntceMain(String... crdnIds) { - ModelAndView mav = new ModelAndView("fims/sprt/sprt01140-info"); - mav.addObject("pageName", "sprt01140"); - mav.addObject("crdnIds", toJson(crdnIds)); - - return mav; + return new ModelAndView("fims/sprt/sprt01140-info") + .addObject("pageName", "sprt01140") + .addObject("crdnIds", toJson(crdnIds)); } /** 사전통지서를 PDF 파일로 작성한다. @@ -652,9 +596,8 @@ public class Sprt01Controller extends ApplicationController { sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); - ModelAndView mav = new ModelAndView("downloadView"); - SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIds(crdnIds); + SprtQuery sprtQuery = new SprtQuery() + .setCrdnIds(crdnIds); List dataObjectList = new ArrayList(); if(crdnIds.length == 1 && crdnIds[0].equals("sample")) { @@ -663,8 +606,8 @@ public class Sprt01Controller extends ApplicationController { } else { //발송 등록 List dataObjectList0 = integrationSearchMapper.selectIntegrationDataList(sprtQuery); - SndbQuery sndbQuery = new SndbQuery(); - sndbQuery.setCrdnIds(crdnIds); + SndbQuery sndbQuery = new SndbQuery() + .setCrdnIds(crdnIds); sndng.setSndngRegSeCd("02"); sndng.setSndngSeCd("02"); sndng.setTnocs(crdnIds.length); @@ -755,10 +698,10 @@ public class Sprt01Controller extends ApplicationController { printOption.setGlobalVariable(globalVariable); Advntce pdfFormat = new Advntce(print,printOption,otptBscStng,otptArtclStngList,paperSeCd,dataObjectList); - Map result = pdfFormat.makeFile(); - mav.addAllObjects(result); - return mav; + + return new ModelAndView("downloadView") + .addAllObjects(result); } @@ -772,14 +715,13 @@ public class Sprt01Controller extends ApplicationController { sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); - ModelAndView mav = new ModelAndView("downloadView"); - SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIds(crdnIds); - + SprtQuery sprtQuery = new SprtQuery() + .setCrdnIds(crdnIds); //발송 등록 List dataObjectList0 = integrationSearchMapper.selectIntegrationDataList(sprtQuery); - SndbQuery sndbQuery = new SndbQuery(); - sndbQuery.setCrdnIds(crdnIds); + + SndbQuery sndbQuery = new SndbQuery() + .setCrdnIds(crdnIds); sndng.setSndngSeCd("02"); sndng.setTnocs(crdnIds.length); sndng.setGramt(CmmnUtil.sumByKey(dataObjectList0, "FFNLG_AMT")); @@ -788,8 +730,9 @@ public class Sprt01Controller extends ApplicationController { String today = sdf.format(new Date()); sndng.setSndngYmd(today); - sndbQuery.setSggCd(sndng.getSggCd()); - sndbQuery.setTaskSeCd(sndng.getTaskSeCd()); + sndbQuery + .setSggCd(sndng.getSggCd()) + .setTaskSeCd(sndng.getTaskSeCd()); DataObject advntceYmdInfo = taskBean.getAdvntceYmdInfo(sndbQuery); String sndngEndYmd = CmmnUtil.addDay(today, toInt(advntceYmdInfo.get("ADVNTCE_DAY_CNT"))); sndng.setSndngEndYmd(sndngEndYmd); @@ -799,9 +742,8 @@ public class Sprt01Controller extends ApplicationController { sndng.setRsndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); - if(insertSndngResult.contains("[F]")) { + if(insertSndngResult.contains("[F]")) throw new RuntimeException(insertSndngResult); - } //발송 등록 후 출력대상조회 List dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); @@ -822,9 +764,9 @@ public class Sprt01Controller extends ApplicationController { taskSeCd = dataObject.string("TASK_SE_CD"); } - FileQuery fileQuery = new FileQuery(); - fileQuery.setInfoType(Crdn.INF_TYPE); - fileQuery.setInfoKeys(dataObject.string("CRDN_ID")); + FileQuery fileQuery = new FileQuery() + .setInfoType(Crdn.INF_TYPE) + .setInfoKeys(dataObject.string("CRDN_ID")); List fileInfoList = fileBean.getFileList(fileQuery); if(fileInfoList != null) { @@ -858,11 +800,9 @@ public class Sprt01Controller extends ApplicationController { List printStngItems = outsourcingStngBean.getArtclStngList(stngQuery); OutsourcingFileMaker osMaker = new OutsourcingFileMaker("사전통지", printOption, printStngItems, dataObjectList); - Map result = osMaker.makeFile(); - mav.addAllObjects(result); - return mav; + return new ModelAndView("downloadView").addAllObjects(result); } @@ -872,11 +812,9 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="고지서 출력 화면", value=METHOD_URL.printNhtMain) public ModelAndView printNhtMain(String... crdnIds) { - ModelAndView mav = new ModelAndView("fims/sprt/sprt01150-info"); - mav.addObject("pageName", "sprt01150"); - mav.addObject("crdnIds", toJson(crdnIds)); - - return mav; + return new ModelAndView("fims/sprt/sprt01150-info") + .addObject("pageName", "sprt01150") + .addObject("crdnIds", toJson(crdnIds)); } /** 고지서를 PDF 파일로 작성한다. @@ -884,15 +822,13 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="고지서 pdf 파일 생성", value=METHOD_URL.makeNhtPdf) public ModelAndView makeNhtPdf(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) { - UserInfo userInfo = currentUser(); ogdpBean.initUserInfo(userInfo); sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); - ModelAndView mav = new ModelAndView("downloadView"); - SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIds(crdnIds); + SprtQuery sprtQuery = new SprtQuery() + .setCrdnIds(crdnIds); List dataObjectList = new ArrayList(); @@ -903,8 +839,8 @@ public class Sprt01Controller extends ApplicationController { //발송 등록 List dataObjectList0 = integrationSearchMapper.selectIntegrationDataList(sprtQuery); - SndbQuery sndbQuery = new SndbQuery(); - sndbQuery.setCrdnIds(crdnIds); + SndbQuery sndbQuery = new SndbQuery() + .setCrdnIds(crdnIds); sndng.setSndngSeCd("03"); sndng.setTnocs(crdnIds.length); sndng.setGramt(CmmnUtil.sumByKey(dataObjectList0, "FFNLG_AMT")); @@ -913,8 +849,9 @@ public class Sprt01Controller extends ApplicationController { String today = sdf.format(new Date()); sndng.setSndngYmd(today); - sndbQuery.setSggCd(sndng.getSggCd()); - sndbQuery.setTaskSeCd(sndng.getTaskSeCd()); + sndbQuery + .setSggCd(sndng.getSggCd()) + .setTaskSeCd(sndng.getTaskSeCd()); DataObject advntceYmdInfo = taskBean.getAdvntceYmdInfo(sndbQuery); String sndngEndYmd = CmmnUtil.addDay(today, toInt(advntceYmdInfo.get("ADVNTCE_DAY_CNT"))); sndng.setSndngEndYmd(sndngEndYmd); @@ -924,9 +861,8 @@ public class Sprt01Controller extends ApplicationController { sndng.setRsndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); - if(insertSndngResult.contains("[F]")) { + if(insertSndngResult.contains("[F]")) throw new RuntimeException(insertSndngResult); - } //발송 등록 후 출력대상조회 dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); @@ -956,8 +892,6 @@ public class Sprt01Controller extends ApplicationController { } } - - Print print = new Print(); print.setPrintRequestUserInfo(userInfo); @@ -996,10 +930,9 @@ public class Sprt01Controller extends ApplicationController { printOption.setGlobalVariable(globalVariable); Nht pdfFormat = new Nht(print,printOption,otptBscStng,otptArtclStngList,paperSeCd,dataObjectList); - Map result = pdfFormat.makeFile(); - mav.addAllObjects(result); - return mav; + + return new ModelAndView("downloadView").addAllObjects(result); } /** 고지 정보로 txt파일,이미지파일을 생성하고 압축파일로 반환한다. @@ -1012,14 +945,13 @@ public class Sprt01Controller extends ApplicationController { sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); - ModelAndView mav = new ModelAndView("downloadView"); - SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIds(crdnIds); + SprtQuery sprtQuery = new SprtQuery() + .setCrdnIds(crdnIds); //발송 등록 List dataObjectList0 = integrationSearchMapper.selectIntegrationDataList(sprtQuery); - SndbQuery sndbQuery = new SndbQuery(); - sndbQuery.setCrdnIds(crdnIds); + SndbQuery sndbQuery = new SndbQuery() + .setCrdnIds(crdnIds); sndng.setSndngSeCd("03"); sndng.setTnocs(crdnIds.length); sndng.setGramt(CmmnUtil.sumByKey(dataObjectList0, "FFNLG_AMT")); @@ -1028,8 +960,9 @@ public class Sprt01Controller extends ApplicationController { String today = sdf.format(new Date()); sndng.setSndngYmd(today); - sndbQuery.setSggCd(sndng.getSggCd()); - sndbQuery.setTaskSeCd(sndng.getTaskSeCd()); + sndbQuery + .setSggCd(sndng.getSggCd()) + .setTaskSeCd(sndng.getTaskSeCd()); DataObject advntceYmdInfo = taskBean.getAdvntceYmdInfo(sndbQuery); String sndngEndYmd = CmmnUtil.addDay(today, toInt(advntceYmdInfo.get("ADVNTCE_DAY_CNT"))); sndng.setSndngEndYmd(sndngEndYmd); @@ -1039,9 +972,8 @@ public class Sprt01Controller extends ApplicationController { sndng.setRsndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); - if(insertSndngResult.contains("[F]")) { + if(insertSndngResult.contains("[F]")) throw new RuntimeException(insertSndngResult); - } //발송 등록 후 출력대상조회 List dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); @@ -1062,9 +994,9 @@ public class Sprt01Controller extends ApplicationController { taskSeCd = dataObject.string("TASK_SE_CD"); } - FileQuery fileQuery = new FileQuery(); - fileQuery.setInfoType(Crdn.INF_TYPE); - fileQuery.setInfoKeys(dataObject.string("CRDN_ID")); + FileQuery fileQuery = new FileQuery() + .setInfoType(Crdn.INF_TYPE) + .setInfoKeys(dataObject.string("CRDN_ID")); List fileInfoList = fileBean.getFileList(fileQuery); if(fileInfoList != null) { @@ -1088,24 +1020,16 @@ public class Sprt01Controller extends ApplicationController { } - FimsUser currentUser = (FimsUser) currentUser().getUser(); - String sggCd = currentUser.getOrgID(); - - OutsourcingStngQuery stngQuery = new OutsourcingStngQuery(); - stngQuery.setSggCd(sggCd); - stngQuery.setTaskSeCd(taskSeCd); - stngQuery.setSndngSeCd("03"); + OutsourcingStngQuery stngQuery = new OutsourcingStngQuery() + .setSndngSeCd("03") + .setSggCd(currentUser().getOrgID()) + .setTaskSeCd(taskSeCd); List printStngItems = outsourcingStngBean.getArtclStngList(stngQuery); OutsourcingFileMaker osMaker = new OutsourcingFileMaker("고지서", printOption, printStngItems, dataObjectList); - Map result = osMaker.makeFile(); - mav.addAllObjects(result); - return mav; + return new ModelAndView("downloadView") + .addAllObjects(result); } - - - - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java index fc046f86..3d044cdb 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -67,47 +67,36 @@ public class Sprt02Controller extends ApplicationController { /** 개별총정보 서비스*/ @Resource(name = "sprt02Service") private Sprt02Service sprt02Service; - /** 부과제외 대장 서비스 */ @Resource(name = "levyExclService") protected LevyExclService levyExclService; - /** 의견제출 대장 서비스 */ @Resource(name = "opnnSbmsnService") protected OpnnSbmsnService opnnSbmsnService; - /** 발송 대장 서비스*/ @Resource(name = "sndngService") protected SndngService sndngService; - /** 발송 상세 대장 서비스*/ @Resource(name = "sndngDtlService") protected SndngDtlService sndngDtlService; - /** 공시송달 대장 서비스*/ @Resource(name = "svbtcService") private SvbtcService svbtcService; - /** 부과 대장 서비스*/ @Resource(name = "levyService") protected LevyService levyService; - /** 감경 대장 서비스 */ @Resource(name = "rdctService") protected RdctService rdctService; - /** 수납 대장 서비스*/ @Resource(name = "rcvmtService") protected RcvmtService rcvmtService; - /** 단속 상태 이력 서비스 */ @Resource(name = "crdnSttsHstryService") private CrdnSttsHstryService crdnSttsHstryService; - /** 납부자 서비스*/ @Resource(name = "payerService") private PayerService payerService; - /** 민원 상담 내용 대장 서비스 */ @Resource(name = "cvlcptDscsnService") private CvlcptDscsnService cvlcptDscsnService; @@ -119,17 +108,15 @@ public class Sprt02Controller extends ApplicationController { @Task("CMN") @RequestMapping(name="개별총정보 메인", value=METHOD_URL.indivTotalInfoMain) public ModelAndView indivTotalInfoMain(SprtQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02010-main"); - // 개별총정보 메인 정보 DataObject info = sprt02Service.getCrdnInfo(req); - return mav - .addObject("callPageName", req.getCallPageName()) // 호출 pageName - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "sprt02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("totalInfo", json ? info : toJson(info)) // 개별총정보 + boolean json = jsonResponse(); + return new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02010-main") + .addObject("callPageName", req.getCallPageName()) // 호출 pageName + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "sprt02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("totalInfo", json ? info : toJson(info)) // 개별총정보 ; } @@ -143,12 +130,11 @@ public class Sprt02Controller extends ApplicationController { @Task @RequestMapping(name="개별총정보 단속,납부자 정보 조회", value=METHOD_URL.getCrdnPayerInfo) public ModelAndView getCrdnPayerInfo(SprtQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02020-info"); - // 단속(TB_CRDN), 납부자(TB_PAYER) 정보 DataObject crdnPayerInfo = sprt02Service.getCrdnPayerInfo(req); + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02020-info"); // 재 조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 @@ -156,9 +142,9 @@ public class Sprt02Controller extends ApplicationController { } return mav - .addObject("pageNameMain", "sprt02010") // pageNameMain - .addObject("pageName", "sprt02020") // pageName - .addObject("crdnPayerInfo", json ? crdnPayerInfo : toJson(crdnPayerInfo)) // 단속, 납부자 정보 + .addObject("pageNameMain", "sprt02010") // pageNameMain + .addObject("pageName", "sprt02020") // pageName + .addObject("crdnPayerInfo", json ? crdnPayerInfo : toJson(crdnPayerInfo)) // 단속, 납부자 정보 ; } @@ -172,15 +158,14 @@ public class Sprt02Controller extends ApplicationController { @Task @RequestMapping(name="개별총정보 의견제출 정보 조회", value=METHOD_URL.getOpnnSbmsnInfo) public ModelAndView getOpnnSbmsnInfo(SprtQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02030-info"); - // 의견 제출(TB_OPNN_SBMSN) 대장 조회 LevyExclQuery reqLevyExcl = new LevyExclQuery(); reqLevyExcl.setCrdnId(req.getCrdnId()); reqLevyExcl.setDelYn("N"); DataObject opnnInfo = opnnSbmsnService.getOpnnSbmsnInfo(reqLevyExcl); + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02030-info"); // 재 조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 @@ -188,9 +173,9 @@ public class Sprt02Controller extends ApplicationController { } return mav - .addObject("pageNameMain", "sprt02010") // pageNameMain - .addObject("pageName", "sprt02030") // pageName - .addObject("opnnInfo", json ? opnnInfo : toJson(opnnInfo)) // 의견제출 정보 + .addObject("pageNameMain", "sprt02010") // pageNameMain + .addObject("pageName", "sprt02030") // pageName + .addObject("opnnInfo", json ? opnnInfo : toJson(opnnInfo)) // 의견제출 정보 ; } @@ -204,20 +189,18 @@ public class Sprt02Controller extends ApplicationController { @Task @RequestMapping(name="개별총정보 발송, 반송 정보 조회", value=METHOD_URL.getSndngInfo) public ModelAndView getSndngInfo(SprtQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02040-info"); - // 발송 상세 정보 - SndbQuery sndbQuery = new SndbQuery(); - sndbQuery.setCrdnId(req.getCrdnId()); // 단속 ID - sndbQuery.setDelYn("N"); // 삭제 여부 - - sndbQuery.setOrderBy("SD.REG_DT, SD.SNDNG_DTL_ID"); // 정렬 + SndbQuery sndbQuery = new SndbQuery() + .setCrdnId(req.getCrdnId()) + .setDelYn("N") + .setOrderBy("SD.REG_DT, SD.SNDNG_DTL_ID"); // 정렬 List sndngDtls = sndngDtlService.getSndngDtls(sndbQuery); // 발송 상세 정보 sndbQuery.setOrderBy("SV.REG_DT, SV.SVBTC_ID"); // 정렬 List svbtcDtls = svbtcService.getSvbtcDtls(sndbQuery); // 공시송달 정보 + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02040-info"); // 재조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 @@ -225,10 +208,10 @@ public class Sprt02Controller extends ApplicationController { } return mav - .addObject("pageNameMain", "sprt02010") // pageNameMain - .addObject("pageName", "sprt02040") // pageName - .addObject("sndngDtls", json ? sndngDtls : toJson(sndngDtls)) // 발송상세 정보 - .addObject("svbtcDtls", json ? svbtcDtls : toJson(svbtcDtls)) // 공시송달 정보 + .addObject("pageNameMain", "sprt02010") // pageNameMain + .addObject("pageName", "sprt02040") // pageName + .addObject("sndngDtls", json ? sndngDtls : toJson(sndngDtls)) // 발송상세 정보 + .addObject("svbtcDtls", json ? svbtcDtls : toJson(svbtcDtls)) // 공시송달 정보 ; } @@ -242,9 +225,6 @@ public class Sprt02Controller extends ApplicationController { @Task @RequestMapping(name="개별총정보 처리 상세 정보 조회", value=METHOD_URL.getPrcsDtlInfo) public ModelAndView getPrcsDtlInfo(SprtQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02050-info"); - // 과태료 감경(TB_RDCT) 대장 조회 LevyQuery levyQuery = new LevyQuery(); if (req.getCallPurpose() == null) { @@ -252,10 +232,10 @@ public class Sprt02Controller extends ApplicationController { } else { levyQuery.setCallPurpose(req.getCallPurpose()); } - levyQuery.setCrdnId(req.getCrdnId()); // 단속 ID - levyQuery.setDelYn(req.getDelYn()); // 삭제 여부 - levyQuery.setOrderBy("RDCT_ID DESC"); // 정렬 - + levyQuery + .setCrdnId(req.getCrdnId()) + .setDelYn(req.getDelYn()) + .setOrderBy("RDCT_ID DESC"); DataObject rdctInfo = rdctService.getRdctInfo(levyQuery); // 부과 제외(TB_LEVY_EXCL) 대장 조회 @@ -268,28 +248,26 @@ public class Sprt02Controller extends ApplicationController { exclQuery.setCrdnId(req.getCrdnId()); // 단속 ID exclQuery.setDelYn(req.getDelYn()); // 삭제 여부 exclQuery.setOrderBy("LEVY_EXCL_ID DESC"); // 정렬 - DataObject levyExclInfo = levyExclService.getLevyExclInfo(exclQuery); // 단속 상태 이력(TB_CRDN_STTS_HSTRY) 조회 - CrdnSttsHstryQuery crdnSttsHstryQuery = new CrdnSttsHstryQuery(); - crdnSttsHstryQuery.setCrdnId(req.getCrdnId()); // 단속 ID + CrdnSttsHstryQuery crdnSttsHstryQuery = new CrdnSttsHstryQuery() + .setCrdnId(req.getCrdnId()); // 단속 ID // 미사용 조회 여부 if (!"Y".equals(req.getUnusedInq())) { crdnSttsHstryQuery.setUseYn("Y"); // 사용 여부 } - - crdnSttsHstryQuery.setOrderBy("CSH.STTS_HSTRY_ID DESC"); // 정렬 - + crdnSttsHstryQuery.setOrderBy("CSH.STTS_HSTRY_ID DESC"); List crdnSttsHstrys = crdnSttsHstryService.getCrdnSttsHstrys(crdnSttsHstryQuery); // 납부자 변경 이력(TB_PAYER_HSTRY) 조회 - PayerQuery payerQuery = new PayerQuery(); - payerQuery.setCrdnId(req.getCrdnId()); // 단속 ID - payerQuery.setOrderBy("CPAH.REG_DT DESC"); // 정렬 - + PayerQuery payerQuery = new PayerQuery() + .setCrdnId(req.getCrdnId()) + .setOrderBy("CPAH.REG_DT DESC"); List payerAddrHstrys = payerService.getPayerAddrHstrys(payerQuery); + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02050-info"); // 재조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 @@ -297,12 +275,12 @@ public class Sprt02Controller extends ApplicationController { } return mav - .addObject("pageNameMain", "sprt02010") // pageNameMain - .addObject("pageName", "sprt02050") // pageName - .addObject("rdctInfo", json ? rdctInfo : toJson(rdctInfo)) // 과태료 감경 정보 - .addObject("levyExclInfo", json ? levyExclInfo : toJson(levyExclInfo)) // 부과 제외 정보 - .addObject("crdnSttsHstrys", json ? crdnSttsHstrys : toJson(crdnSttsHstrys)) // 단속 상태 이력 - .addObject("payerAddrHstrys", json ? payerAddrHstrys : toJson(payerAddrHstrys)) // 납부자 주소 변경 이력 + .addObject("pageNameMain", "sprt02010") // pageNameMain + .addObject("pageName", "sprt02050") // pageName + .addObject("rdctInfo", json ? rdctInfo : toJson(rdctInfo)) // 과태료 감경 정보 + .addObject("levyExclInfo", json ? levyExclInfo : toJson(levyExclInfo)) // 부과 제외 정보 + .addObject("crdnSttsHstrys", json ? crdnSttsHstrys : toJson(crdnSttsHstrys)) // 단속 상태 이력 + .addObject("payerAddrHstrys", json ? payerAddrHstrys : toJson(payerAddrHstrys)) // 납부자 주소 변경 이력 ; } @@ -316,9 +294,6 @@ public class Sprt02Controller extends ApplicationController { @Task @RequestMapping(name="개별총정보 부과, 체납 정보 조회", value=METHOD_URL.getLevyNpmntInfo) public ModelAndView getLevyNpmntInfo(SprtQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02060-info"); - // 부과(TB_LEVY) 대장 조회 LevyQuery levyQuery = new LevyQuery(); if (req.getCallPurpose() == null) { @@ -326,12 +301,14 @@ public class Sprt02Controller extends ApplicationController { } else { levyQuery.setCallPurpose(req.getCallPurpose()); } - levyQuery.setCrdnId(req.getCrdnId()); // 단속 ID - levyQuery.setDelYn(req.getDelYn()); // 삭제 여부 - levyQuery.setOrderBy("LEVY_ID DESC"); // 정렬 - + levyQuery + .setCrdnId(req.getCrdnId()) + .setDelYn(req.getDelYn()) + .setOrderBy("LEVY_ID DESC"); DataObject levyInfo = levyService.getLevyInfo(levyQuery); + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02060-info"); // 재 조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 @@ -339,9 +316,9 @@ public class Sprt02Controller extends ApplicationController { } return mav - .addObject("pageNameMain", "sprt02010") // pageNameMain - .addObject("pageName", "sprt02060") // pageName - .addObject("levyInfo", json ? levyInfo : toJson(levyInfo)) // 부과 정보 + .addObject("pageNameMain", "sprt02010") // pageNameMain + .addObject("pageName", "sprt02060") // pageName + .addObject("levyInfo", json ? levyInfo : toJson(levyInfo)) // 부과 정보 ; } @@ -355,9 +332,6 @@ public class Sprt02Controller extends ApplicationController { @Task @RequestMapping(name="개별총정보 수납 정보 조회", value=METHOD_URL.getRcvmtInfo) public ModelAndView getRcvmtInfo(SprtQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02070-info"); - // 수납(TB_RCVMT) 대장 조회 RcvmtQuery rcvmtQuery = new RcvmtQuery(); if (req.getCallPurpose() == null) { @@ -365,12 +339,14 @@ public class Sprt02Controller extends ApplicationController { } else { rcvmtQuery.setCallPurpose(req.getCallPurpose()); } - rcvmtQuery.setCrdnId(req.getCrdnId()); // 단속 ID - rcvmtQuery.setDelYn(req.getDelYn()); // 삭제 여부 - rcvmtQuery.setOrderBy("R.RCVMT_ID DESC"); // 정렬 - + rcvmtQuery + .setCrdnId(req.getCrdnId()) + .setDelYn(req.getDelYn()) + .setOrderBy("R.RCVMT_ID DESC"); List rcvmts = rcvmtService.getRcvmts(rcvmtQuery); + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02070-info"); // 재 조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 @@ -378,9 +354,9 @@ public class Sprt02Controller extends ApplicationController { } return mav - .addObject("pageNameMain", "sprt02010") // pageNameMain - .addObject("pageName", "sprt02070") // pageName - .addObject("rcvmts", json ? rcvmts : toJson(rcvmts)) // 수납 정보 + .addObject("pageNameMain", "sprt02010") // pageNameMain + .addObject("pageName", "sprt02070") // pageName + .addObject("rcvmts", json ? rcvmts : toJson(rcvmts)) // 수납 정보 ; } @@ -394,9 +370,6 @@ public class Sprt02Controller extends ApplicationController { @Task @RequestMapping(name="개별총정보 민원 상담 정보 조회", value=METHOD_URL.getCvlcptDscsnInfo) public ModelAndView getCvlcptDscsnInfo(SprtQuery req) { - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02080-info"); - // 민원 상담(TB_CVLCPT_DSCSN) 대장 조회 CvlcptDscsnQuery cvlcptDscsnQuery = new CvlcptDscsnQuery(); if (req.getCallPurpose() == null) { @@ -404,16 +377,18 @@ public class Sprt02Controller extends ApplicationController { } else { cvlcptDscsnQuery.setCallPurpose(req.getCallPurpose()); } - cvlcptDscsnQuery.setInquiryCondition(req.getInquiryCondition()); - cvlcptDscsnQuery.setSggCd(req.getSggCd()); // 시군구 코드 - cvlcptDscsnQuery.setTaskSeCd(req.getTaskSeCd()); // 업무 구분 코드 - cvlcptDscsnQuery.setCrdnId(req.getCrdnId()); // 단속 ID - cvlcptDscsnQuery.setVhrno(req.getVhrno()); // 차량번호 - cvlcptDscsnQuery.setDelYn(req.getDelYn()); // 삭제 여부 - cvlcptDscsnQuery.setOrderBy("CD.CVLCPT_DSCSN_ID DESC"); // 정렬 - + cvlcptDscsnQuery + .setInquiryCondition(req.getInquiryCondition()) + .setCrdnId(req.getCrdnId()) + .setVhrno(req.getVhrno()) + .setSggCd(req.getSggCd()) + .setTaskSeCd(req.getTaskSeCd()) + .setDelYn(req.getDelYn()) + .setOrderBy("CD.CVLCPT_DSCSN_ID DESC"); List cvlcptDscsns = cvlcptDscsnService.getCvlcptDscsns(cvlcptDscsnQuery); + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02080-info"); // 재조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 @@ -421,10 +396,9 @@ public class Sprt02Controller extends ApplicationController { } return mav - .addObject("pageNameMain", "sprt02010") // pageNameMain - .addObject("pageName", "sprt02080") // pageName - .addObject("cvlcptDscsns", json ? cvlcptDscsns : toJson(cvlcptDscsns)) // 민원상담내용 정보 + .addObject("pageNameMain", "sprt02010") // pageNameMain + .addObject("pageName", "sprt02080") // pageName + .addObject("cvlcptDscsns", json ? cvlcptDscsns : toJson(cvlcptDscsns)) // 민원상담내용 정보 ; } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java index 37bcb71b..e1e74e1a 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java @@ -17,10 +17,8 @@ import cokr.xit.foundation.data.DataObject; @Controller @RequestMapping(name="동영상 재생", value="/sprt/sprt03") public class Sprt03Controller extends ApplicationController { - @Resource(name="fileBean") private FileBean fileBean; - @Resource(name="mediaBean") private MediaBean mediaBean; @@ -29,12 +27,10 @@ public class Sprt03Controller extends ApplicationController { */ @RequestMapping(name="동영상 재생 메인", value="/010/main.do") public ModelAndView videoMain(String openerPageName, String crdnId) { - ModelAndView mav = new ModelAndView(); + ModelAndView mav = new ModelAndView("fims/sprt/sprt03010-main") + .addObject("openerPageName", openerPageName); - mav.setViewName("fims/sprt/sprt03010-main"); - mav.addObject("openerPageName", openerPageName); - - if(crdnId != null && !crdnId.equals("")) { + if(!isEmpty(crdnId)) { mav.addObject("crdnId", crdnId); DataObject file = mediaBean.getVideoInfo(crdnId); if(!file.isEmpty()) { @@ -50,18 +46,16 @@ public class Sprt03Controller extends ApplicationController { */ @RequestMapping(name="사진 편집 메인", value="/020/main.do") public ModelAndView editPhotoMain(String openerPageName, String fileId) { - ModelAndView mav = new ModelAndView(); - - mav.setViewName("fims/sprt/sprt03020-main"); - mav.addObject("openerPageName", openerPageName); + ModelAndView mav = new ModelAndView("fims/sprt/sprt03020-main") + .addObject("openerPageName", openerPageName); - if(!ifEmpty(fileId, ()->"").equals("")) { + if(!isEmpty(fileId)) { mav.addObject("fileId", fileId); - FileQuery fileQuery = new FileQuery(); - fileQuery.setFileIDs(fileId); + FileQuery fileQuery = new FileQuery() + .setFileIDs(fileId); List fileList = fileBean.getFileList(fileQuery); - if(fileList != null && !fileList.isEmpty()) { + if(!isEmpty(fileList)) { DataObject file = fileList.get(0); mav.addObject("fileInfo", toJson(file)); } @@ -69,4 +63,4 @@ public class Sprt03Controller extends ApplicationController { return mav; } -} +} \ No newline at end of file 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 ba7d719f..e72a9b2c 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java @@ -19,7 +19,6 @@ import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -70,19 +69,14 @@ public class Sprt04Controller extends ApplicationController { */ @RequestMapping(name="민원 상담 내용 메인", value="/010/main.do") public ModelAndView civilComplaintDiscussionMain() { - ModelAndView mav = new ModelAndView("fims/sprt/sprt04010-main"); - - // 사용자 정보 - FimsUser fimsUser = (FimsUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("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"))) + return new ModelAndView("fims/sprt/sprt04010-main") + .addObject("pageName", "sprt04010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", currentUser().getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) ; } @@ -139,7 +133,7 @@ public class Sprt04Controller extends ApplicationController { .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> {if(i.getValue() instanceof Format) {i.setField(null);}; return i;}).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("민원상담" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("민원상담" + "_목록_" + dateTime + ".xlsx")); } } @@ -156,10 +150,8 @@ public class Sprt04Controller extends ApplicationController { public ModelAndView getCivilComplaintDiscussionNocs(CvlcptDscsnQuery req) { DataObject result = cvlcptDscsnService.getCvlcptDscsnNocs(req); - boolean json = jsonResponse(); - return new ModelAndView("jsonView") - .addObject("cvlcptDscsnNocs", json ? result : toJson(result)); + .addObject("cvlcptDscsnNocs", jsonResponse() ? result : toJson(result)); } /**지정한 ID의 민원 상담 정보(info)를 반환한다. @@ -172,25 +164,19 @@ public class Sprt04Controller extends ApplicationController { @Task @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); - } - + DataObject cvlcptDscsnInfo = req.getCvlcptDscsnId() != null ? + cvlcptDscsnService.getCvlcptDscsnInfo(req) : + cvlcptDscsnService.getCrdnInfo(req); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM065"); - return mav - .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)) // 민원 상담 정보 + boolean json = jsonResponse(); + return new ModelAndView(json ? "jsonView" : "fims/sprt/sprt04020-info") + .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)) // 민원 상담 정보 ; } @@ -204,18 +190,11 @@ public class Sprt04Controller extends ApplicationController { @Task @RequestMapping(name="민원 상담 대장 등록", value=METHOD_URL.createCivilComplaintDiscussion) public ModelAndView createCivilComplaintDiscussion(CvlcptDscsn cvlcptDscsn) { - boolean saved = false; String rtnMsg = cvlcptDscsnService.createCvlcptDscsn(cvlcptDscsn); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**민원 상담 내용 정보를 수정한다. @@ -228,18 +207,11 @@ public class Sprt04Controller extends ApplicationController { @Task @RequestMapping(name="민원 상담 대장 수정", value=METHOD_URL.updateCivilComplaintDiscussion) public ModelAndView updateCivilComplaintDiscussion(CvlcptDscsn cvlcptDscsn) { - boolean saved = false; String rtnMsg = cvlcptDscsnService.updateCvlcptDscsn(cvlcptDscsn); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } /**지정한 민원 상담 내용를 제거한다. @@ -253,18 +225,10 @@ public class Sprt04Controller extends ApplicationController { @Task @RequestMapping(name="민원 상담 대장 삭제", value=METHOD_URL.removeCivilComplaintDiscussion) public ModelAndView removeCivilComplaintDiscussion(CvlcptDscsn cvlcptDscsn) { - boolean saved = false; String rtnMsg = cvlcptDscsnService.removeCvlcptDscsn(cvlcptDscsn); - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", rtnMsg.contains("[S]")) + .addObject("rtnMsg", rtnMsg); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/task/TaskRequestMappingHandlerMapping.java b/src/main/java/cokr/xit/fims/task/TaskRequestMappingHandlerMapping.java index 03fd1333..da7a8969 100644 --- a/src/main/java/cokr/xit/fims/task/TaskRequestMappingHandlerMapping.java +++ b/src/main/java/cokr/xit/fims/task/TaskRequestMappingHandlerMapping.java @@ -14,31 +14,25 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl import cokr.xit.fims.FimsConf; public class TaskRequestMappingHandlerMapping extends RequestMappingHandlerMapping { - @Override @Nullable public RequestMappingInfo getMappingForMethod(Method method, Class handlerType) { - RequestMappingInfo info = super.getMappingForMethod(method, handlerType); - Task task = AnnotatedElementUtils.findMergedAnnotation(method, Task.class); - if(task != null && info != null) { - return createRequestMappingInfo(task, method, info); - } else { - return info; - } - + return task != null && info != null ? + createRequestMappingInfo(task, method, info) : + info; } - protected RequestMappingInfo createRequestMappingInfo(Task task, Method method, - RequestMappingInfo info) { + protected RequestMappingInfo createRequestMappingInfo(Task task, Method method, RequestMappingInfo info) { List tasks = FimsConf.get().getTasks(); String[] prefix = task.value(); - if(prefix[0].equals("ALL")) { + String first = prefix[0]; + if ("ALL".equals(first)) { prefix = tasks.toArray(new String[tasks.size()]); - } else if(prefix[0].equals("CMN")) { + } else if ("CMN".equals(first)) { String[] tasksArray = tasks.toArray(new String[tasks.size()]); prefix = new String[1 + tasksArray.length]; System.arraycopy(new String[] {""}, 0, prefix, 0, 1); @@ -49,11 +43,11 @@ public class TaskRequestMappingHandlerMapping extends RequestMappingHandlerMappi Set olds0 = info.getPatternValues(); String[] olds = olds0.toArray(new String[olds0.size()]); - String[] news = new String[prefix.length*olds.length]; - for(int i=0;i < prefix.length; i++) { - for(int j=0;j < olds.length; j++) { - String newPattern = (prefix[i].equals("") ? "" : "/")+prefix[i]+olds[j]; - news[i*(olds.length)+j] = newPattern; + String[] news = new String[prefix.length * olds.length]; + for (int i = 0; i < prefix.length; i++) { + for (int j = 0; j < olds.length; j++) { + String newPattern = (prefix[i].equals("") ? "" : "/") + prefix[i] + olds[j]; + news[i * (olds.length) + j] = newPattern; } } @@ -71,6 +65,5 @@ public class TaskRequestMappingHandlerMapping extends RequestMappingHandlerMappi .produces(rm.produces()) .options(bc) .build(); - } -} +} \ No newline at end of file