From fe4ae930bb9f6475c35c2c6de8d46923f50c466b Mon Sep 17 00:00:00 2001 From: leebj Date: Mon, 27 May 2024 13:40:49 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=86=8D=20=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/MainController.java | 14 +++--- .../cokr/xit/fims/base/CodeController.java | 8 +-- .../cokr/xit/fims/base/UserController.java | 26 +++++----- .../xit/fims/cmmn/hwp/format/CrdnConfirm.java | 4 +- .../xit/fims/cmmn/hwp/format/CrdnList.java | 4 +- .../fims/cmmn/hwp/format/RcvmtConfirm.java | 4 +- .../fims/cmmn/hwp/format/ReportOnClaims.java | 6 +-- .../cmmn/hwp/format/RequestForDelivery.java | 6 +-- .../fims/cmmn/pdf/print/format/Advntce.java | 6 +-- .../xit/fims/cmmn/pdf/print/format/Nht.java | 6 +-- .../xit/fims/cmmn/service/bean/StngBean.java | 16 +++--- .../xit/fims/cmmn/web/LinkController.java | 8 +-- .../xit/fims/crdn/web/Crdn05Controller.java | 8 +-- .../xit/fims/cvlc/web/Cvlc01Controller.java | 8 +-- .../service/bean/OpnnSbmsnServiceBean.java | 6 +-- .../xit/fims/excl/web/Excl02Controller.java | 8 +-- .../mngt/{FactionUtil.java => OgdpUtil.java} | 6 +-- .../{FactionMapper.java => OgdpMapper.java} | 10 ++-- .../{FactionService.java => OgdpService.java} | 2 +- .../bean/{FactionBean.java => OgdpBean.java} | 42 ++++++++-------- ...nServiceBean.java => OgdpServiceBean.java} | 26 +++++----- .../xit/fims/mngt/web/Mngt01Controller.java | 8 +-- .../xit/fims/mngt/web/Mngt03Controller.java | 26 +++++----- .../xit/fims/mngt/web/Mngt04Controller.java | 32 ++++++------ .../fims/nxrp/service/bean/NisIndivBean.java | 10 ++-- .../sndb/service/bean/SvbtcServiceBean.java | 6 +-- .../xit/fims/sndb/web/Sndb01Controller.java | 12 ++--- .../bean/IntegrationSearchServiceBean.java | 6 +-- .../xit/fims/sprt/web/Sprt01Controller.java | 24 ++++----- .../{faction-mapper.xml => ogdp-mapper.xml} | 50 +++++++++---------- .../WEB-INF/jsp/base/user/user-info.jsp | 16 +++--- .../WEB-INF/jsp/fims/user/user-info.jsp | 16 +++--- 32 files changed, 215 insertions(+), 215 deletions(-) rename src/main/java/cokr/xit/fims/mngt/{FactionUtil.java => OgdpUtil.java} (81%) rename src/main/java/cokr/xit/fims/mngt/dao/{FactionMapper.java => OgdpMapper.java} (95%) rename src/main/java/cokr/xit/fims/mngt/service/{FactionService.java => OgdpService.java} (97%) rename src/main/java/cokr/xit/fims/mngt/service/bean/{FactionBean.java => OgdpBean.java} (73%) rename src/main/java/cokr/xit/fims/mngt/service/bean/{FactionServiceBean.java => OgdpServiceBean.java} (61%) rename src/main/resources/sql/mapper/fims/mngt/{faction-mapper.xml => ogdp-mapper.xml} (92%) diff --git a/src/main/java/cokr/xit/fims/MainController.java b/src/main/java/cokr/xit/fims/MainController.java index 717eea14..4e8d6e97 100644 --- a/src/main/java/cokr/xit/fims/MainController.java +++ b/src/main/java/cokr/xit/fims/MainController.java @@ -12,7 +12,7 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.service.UserService; -import cokr.xit.fims.mngt.dao.FactionMapper; +import cokr.xit.fims.mngt.dao.OgdpMapper; import cokr.xit.fims.task.TaskRequestMappingHandlerMapping; import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.web.AbstractController; @@ -24,8 +24,8 @@ public class MainController extends AbstractController { @Autowired private TaskRequestMappingHandlerMapping requestHandlers; - @Resource(name="factionMapper") - FactionMapper factionMapper; + @Resource(name="ogdpMapper") + OgdpMapper ogdpMapper; @Resource(name="userService") private UserService userService; @@ -39,13 +39,13 @@ public class MainController extends AbstractController { public ModelAndView signupPage(String institute) { ModelAndView mav = new ModelAndView("fims/user/user-info"); - mav.addObject("allFactionList", factionMapper.selectAllFactionList()); + mav.addObject("allOgdpList", ogdpMapper.selectAllOgdpList()); DataObject params = new DataObject(); params.set("anonymous", "Y"); params.set("institute", institute); - List ableFactionList = factionMapper.selectAbleFactionList(params); - mav.addObject("ableFactionList", ableFactionList); + List ableOgdpList = ogdpMapper.selectAbleOgdpList(params); + mav.addObject("ableOgdpList", ableOgdpList); mav.addObject("userInfo", "{}"); @@ -71,7 +71,7 @@ public class MainController extends AbstractController { @RequestMapping(name="기관 목록", value="/instList.do") public ModelAndView instList(String account, String institute) { - List instList = factionMapper.selectAllInstList(); + List instList = ogdpMapper.selectAllInstList(); return new ModelAndView("jsonView") .addObject("instList", instList); } diff --git a/src/main/java/cokr/xit/fims/base/CodeController.java b/src/main/java/cokr/xit/fims/base/CodeController.java index 7446c8bd..31516281 100644 --- a/src/main/java/cokr/xit/fims/base/CodeController.java +++ b/src/main/java/cokr/xit/fims/base/CodeController.java @@ -13,7 +13,7 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.service.CodeQuery; import cokr.xit.base.code.service.bean.CodeBean; import cokr.xit.fims.cmmn.CmmnQuery; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.mngt.service.bean.TaskBean; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; @@ -26,8 +26,8 @@ public class CodeController extends cokr.xit.base.code.web.CodeController { @Resource(name = "taskBean") private TaskBean taskBean; - @Resource(name = "factionBean") - private FactionBean factionBean; + @Resource(name = "ogdpBean") + private OgdpBean ogdpBean; @RequestMapping(name="모든 업무구분코드 조회",value="/getAllTaskSeCd.do") public ModelAndView getAllTaskSeCd() { @@ -52,7 +52,7 @@ public class CodeController extends cokr.xit.base.code.web.CodeController { mav.addObject("sggHasTask", "Y"); } else { - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); String sggCd = (String)userInfo.getInfo().get("sggCd"); diff --git a/src/main/java/cokr/xit/fims/base/UserController.java b/src/main/java/cokr/xit/fims/base/UserController.java index eddba953..e44a651e 100644 --- a/src/main/java/cokr/xit/fims/base/UserController.java +++ b/src/main/java/cokr/xit/fims/base/UserController.java @@ -14,8 +14,8 @@ import cokr.xit.base.security.SecuredUserInfo; import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.service.UserService; import cokr.xit.fims.cmmn.service.bean.StngBean; -import cokr.xit.fims.mngt.dao.FactionMapper; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.dao.OgdpMapper; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.foundation.data.DataObject; @Controller @@ -30,11 +30,11 @@ public class UserController extends cokr.xit.base.user.web.UserController ableFactionList = factionMapper.selectAbleFactionList(params); - mav.addObject("ableFactionList", ableFactionList); + List ableOgdpList = ogdpMapper.selectAbleOgdpList(params); + mav.addObject("ableOgdpList", ableOgdpList); return mav; } @@ -65,7 +65,7 @@ public class UserController extends cokr.xit.base.user.web.UserController ableFactionList = factionMapper.selectAbleFactionList(params); - mav.addObject("ableFactionList", ableFactionList); + List ableOgdpList = ogdpMapper.selectAbleOgdpList(params); + mav.addObject("ableOgdpList", ableOgdpList); return mav; } diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnConfirm.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnConfirm.java index b037884e..f360a3fa 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnConfirm.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnConfirm.java @@ -5,7 +5,7 @@ import java.util.List; import cokr.xit.applib.Print; import cokr.xit.applib.hwp.format.HWPFormat; import cokr.xit.fims.cmmn.FimsPrintOption; -import cokr.xit.fims.mngt.FactionUtil; +import cokr.xit.fims.mngt.OgdpUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; @@ -39,7 +39,7 @@ public class CrdnConfirm extends HWPFormat { String dd = printRequestYmd.substring(6, 8); String ymd = yyyy+"년 "+mm+"월 "+dd+"일"; - String instNm = FactionUtil.getInstituteLeader((String)print.getPrintRequestUserInfo().getInfo().get("instNm"), false); + String instNm = OgdpUtil.getInstituteLeader((String)print.getPrintRequestUserInfo().getInfo().get("instNm"), false); DataObject one = data.get(currentRunCount); diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnList.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnList.java index 7f47870a..101482b9 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnList.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnList.java @@ -7,7 +7,7 @@ import java.util.stream.IntStream; import cokr.xit.applib.Print; import cokr.xit.applib.hwp.format.HWPFormat; import cokr.xit.fims.cmmn.FimsPrintOption; -import cokr.xit.fims.mngt.FactionUtil; +import cokr.xit.fims.mngt.OgdpUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; @@ -66,7 +66,7 @@ public class CrdnList extends HWPFormat { writer.setValue("총금액", DataFormat.n_nn0(globalTotalAmount)); String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm"); - instNm = FactionUtil.getLastWord(instNm); + instNm = OgdpUtil.getLastWord(instNm); writer.setValue("발신", instNm); List list = IntStream.rangeClosed(1, this.data.size()).boxed().map(i -> { diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/RcvmtConfirm.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/RcvmtConfirm.java index 2c73e3e1..648ee649 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/RcvmtConfirm.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/RcvmtConfirm.java @@ -6,7 +6,7 @@ import java.util.List; import cokr.xit.applib.Print; import cokr.xit.applib.hwp.format.HWPFormat; import cokr.xit.fims.cmmn.FimsPrintOption; -import cokr.xit.fims.mngt.FactionUtil; +import cokr.xit.fims.mngt.OgdpUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; @@ -47,7 +47,7 @@ public class RcvmtConfirm extends HWPFormat { @Override public void runAsWriter() { - String instNm = FactionUtil.getInstituteLeader((String) print.getPrintRequestUserInfo().getInfo().get("instNm"), false); + String instNm = OgdpUtil.getInstituteLeader((String) print.getPrintRequestUserInfo().getInfo().get("instNm"), false); DataObject one = data.get(currentRunCount); diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/ReportOnClaims.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/ReportOnClaims.java index cabe6126..3956d1d6 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/ReportOnClaims.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/ReportOnClaims.java @@ -14,7 +14,7 @@ import cokr.xit.applib.hwp.OffcsCellFinder; import cokr.xit.applib.hwp.format.HWPFormat; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.FimsPrintOption; -import cokr.xit.fims.mngt.FactionUtil; +import cokr.xit.fims.mngt.OgdpUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.bodytext.control.table.Cell; @@ -87,8 +87,8 @@ public class ReportOnClaims extends HWPFormat { writer.setValue("연월일", ymd); String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm"); - instNm = FactionUtil.getLastWord(instNm); - instNm = FactionUtil.getInstituteLeader(instNm, false); + instNm = OgdpUtil.getLastWord(instNm); + instNm = OgdpUtil.getInstituteLeader(instNm, false); writer.setValue("발신", instNm); List list = IntStream.rangeClosed(1, this.data.size()).boxed().map(i -> { diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/RequestForDelivery.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/RequestForDelivery.java index 9ac84856..03f26809 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/RequestForDelivery.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/RequestForDelivery.java @@ -14,7 +14,7 @@ import cokr.xit.applib.hwp.OffcsCellFinder; import cokr.xit.applib.hwp.format.HWPFormat; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.FimsPrintOption; -import cokr.xit.fims.mngt.FactionUtil; +import cokr.xit.fims.mngt.OgdpUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.bodytext.control.table.Cell; @@ -92,8 +92,8 @@ public class RequestForDelivery extends HWPFormat { String ymd = yyyy+"년 "+mm+"월 "+dd+"일"; writer.setValue("연월일", ymd); - instNm = FactionUtil.getLastWord(instNm); - instNm = FactionUtil.getInstituteLeader(instNm, false); + instNm = OgdpUtil.getLastWord(instNm); + instNm = OgdpUtil.getInstituteLeader(instNm, false); writer.setValue("발신", instNm); List list = IntStream.rangeClosed(1, this.data.size()).boxed().map(i -> { diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Advntce.java b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Advntce.java index cb98051b..1f15f176 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Advntce.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Advntce.java @@ -6,7 +6,7 @@ import java.util.Map; import cokr.xit.applib.Print; import cokr.xit.fims.cmmn.FimsPrintOption; -import cokr.xit.fims.mngt.FactionUtil; +import cokr.xit.fims.mngt.OgdpUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; @@ -223,8 +223,8 @@ public class Advntce extends PDFPrintFormat { case "offcsText" -> { String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm"); - instNm = FactionUtil.getLastWord(instNm); - instNm = FactionUtil.getInstituteLeader(instNm, true); + instNm = OgdpUtil.getLastWord(instNm); + instNm = OgdpUtil.getInstituteLeader(instNm, true); result = instNm; } case "offcs" -> { diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java index d4824d04..259f297a 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java @@ -7,7 +7,7 @@ import java.util.Map; import cokr.xit.applib.Print; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.FimsPrintOption; -import cokr.xit.fims.mngt.FactionUtil; +import cokr.xit.fims.mngt.OgdpUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; @@ -298,8 +298,8 @@ public class Nht extends PDFPrintFormat { case "offcsText" -> { String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm"); - instNm = FactionUtil.getLastWord(instNm); - instNm = FactionUtil.getInstituteLeader(instNm, true); + instNm = OgdpUtil.getLastWord(instNm); + instNm = OgdpUtil.getInstituteLeader(instNm, true); result = instNm; } case "offcs" -> { diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java index a9e1f5c8..57b4f960 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java @@ -16,7 +16,7 @@ import cokr.xit.base.security.Authority; import cokr.xit.base.security.SecuredUserInfo; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.dao.StngMapper; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.mngt.service.bean.TaskBean; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.component.AbstractBean; @@ -27,8 +27,8 @@ public class StngBean extends AbstractBean { @Resource(name = "codeBean") private CodeBean codeBean; - @Resource(name = "factionBean") - private FactionBean factionBean; + @Resource(name = "ogdpBean") + private OgdpBean ogdpBean; @Resource(name = "stngMapper") private StngMapper stngMapper; @@ -49,14 +49,14 @@ public class StngBean extends AbstractBean { if(userInfo.getInstitute().equals("default")) { return new DataObject(); } - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); return stngMapper.selectDeptStng((String)userInfo.getInfo().get("deptCd")); } else if(type.equals("sgg")){ UserInfo userInfo = currentUser(); if(userInfo.getInstitute().equals("default")) { return new DataObject(); } - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); return stngMapper.selectSggStng((String)userInfo.getInfo().get("sggCd")); } else { return null; @@ -71,7 +71,7 @@ public class StngBean extends AbstractBean { public boolean updateDtbnActno(String dtbnBankNm, String dtbnActno) { Map params = new HashMap(); UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); params.put("mdfr", userInfo.getId()); params.put("deptCd", (String)userInfo.getInfo().get("deptCd")); params.put("dtbnBankNm", dtbnBankNm); @@ -99,7 +99,7 @@ public class StngBean extends AbstractBean { } else if(isAdmin) { //관리자 Map info = userInfo.getInfo(); if(info == null || info.get("sggCd") == null || info.get("sggCd").equals("")) { - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); } availableTaskList = taskBean.getTasks((new CmmnQuery()).setSggCd((String)userInfo.getInfo().get("sggCd")).setUseYn("Y")) @@ -182,7 +182,7 @@ public class StngBean extends AbstractBean { SecuredUserInfo userInfo = currentUser(); Map info = userInfo.getInfo(); if(info == null || info.get("sggCd") == null || info.get("sggCd").equals("")) { - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); } List taskSeCdListForSgg = taskBean.getTasks((new CmmnQuery()).setSggCd((String)userInfo.getInfo().get("sggCd")).setUseYn("Y")) 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 bc27886c..312fc783 100644 --- a/src/main/java/cokr/xit/fims/cmmn/web/LinkController.java +++ b/src/main/java/cokr/xit/fims/cmmn/web/LinkController.java @@ -9,7 +9,7 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.fims.cmmn.dao.ExtrStngMapper; import cokr.xit.fims.cmmn.service.LinkService; import cokr.xit.fims.cmmn.service.bean.LinkBean; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.web.AbstractController; @@ -24,8 +24,8 @@ public class LinkController extends AbstractController { @Resource(name = "linkService") private LinkService linkService; - @Resource(name = "factionBean") - private FactionBean factionBean; + @Resource(name = "ogdpBean") + private OgdpBean ogdpBean; @Resource(name = "extrStngMapper") private ExtrStngMapper extrStngMapper; @@ -36,7 +36,7 @@ public class LinkController extends AbstractController { boolean saved = false; UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); String sggCd = (String) userInfo.getInfo().get("sggCd"); System.out.println("파라미터 : "+ param); 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 e5a041b2..98d404f1 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -42,7 +42,7 @@ import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.crdn.service.CrdnStngService; import cokr.xit.fims.crdn.service.ImportService; import cokr.xit.fims.crdn.service.bean.CrdnStngBean; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.task.Task; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; @@ -95,8 +95,8 @@ public class Crdn05Controller extends ApplicationController { @Resource(name="crdnStngMapper") private CrdnStngMapper crdnStngMapper; - @Resource(name="factionBean") - protected FactionBean factionBean; + @Resource(name="ogdpBean") + protected OgdpBean ogdpBean; @Resource(name = "stngBean") private StngBean stngBean; @@ -481,7 +481,7 @@ public class Crdn05Controller extends ApplicationController { boolean saved = false; UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); crdn.setSggCd((String)userInfo.getInfo().get("sggCd")); crdn.setCrdnRegSeCd("01"); 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 1b6ff804..a3d9258f 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -37,7 +37,7 @@ import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.cvlc.service.CrdnCvlcptService; import cokr.xit.fims.cvlc.service.bean.CrdnCvlcptMainBean; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.task.Task; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; @@ -82,8 +82,8 @@ public class Cvlc01Controller extends ApplicationController { @Resource(name = "fileBean") private FileBean fileBean; - @Resource(name = "factionBean") - private FactionBean factionBean; + @Resource(name = "ogdpBean") + private OgdpBean ogdpBean; @Resource(name = "crdnCvlcptMainBean") private CrdnCvlcptMainBean crdnCvlcptMainBean; @@ -221,7 +221,7 @@ public class Cvlc01Controller extends ApplicationController { FimsPrintOption printOption = new FimsPrintOption(); UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); Print print = new Print(); print.setPrintRequestUserInfo(userInfo); diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java index b650ecc1..65e7afb7 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java @@ -10,7 +10,7 @@ import cokr.xit.base.file.FileInfo; import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.excl.service.OpnnSbmsnService; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -32,8 +32,8 @@ public class OpnnSbmsnServiceBean extends AbstractServiceBean implements OpnnSbm protected OpnnSbmsnBean opnnSbmsnBean; /* Bean */ - @Resource(name="factionBean") - protected FactionBean factionBean; + @Resource(name="ogdpBean") + protected OgdpBean ogdpBean; @Override public List getOpnnSbmsnList(LevyExclQuery req) { 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 4615c01a..257269e4 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -35,7 +35,7 @@ import cokr.xit.fims.excl.OpnnDlbrMbr; import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.excl.service.OpnnDlbrMbrService; import cokr.xit.fims.excl.service.OpnnSbmsnService; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.task.Task; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; @@ -89,8 +89,8 @@ public class Excl02Controller extends ApplicationController { @Resource(name="stngBean") private StngBean stngBean; - @Resource(name="factionBean") - private FactionBean factionBean; + @Resource(name="ogdpBean") + private OgdpBean ogdpBean; /**의견제출 대장 관리 메인화면(fims/excl/excl02/010-main)을 연다. * @@ -374,7 +374,7 @@ public class Excl02Controller extends ApplicationController { @RequestMapping(name="의견제출 심의의결서 출력", value=METHOD_URL.makeDlbrDecsnFileFromHwpFormat) public ModelAndView makeDlbrDecsnFileFromHwpFormat(LevyExclQuery req) { UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); Print print = new Print(); print.setPrintRequestUserInfo(userInfo); diff --git a/src/main/java/cokr/xit/fims/mngt/FactionUtil.java b/src/main/java/cokr/xit/fims/mngt/OgdpUtil.java similarity index 81% rename from src/main/java/cokr/xit/fims/mngt/FactionUtil.java rename to src/main/java/cokr/xit/fims/mngt/OgdpUtil.java index fb0a7b27..cde2d827 100644 --- a/src/main/java/cokr/xit/fims/mngt/FactionUtil.java +++ b/src/main/java/cokr/xit/fims/mngt/OgdpUtil.java @@ -1,9 +1,9 @@ package cokr.xit.fims.mngt; -public class FactionUtil { +public class OgdpUtil { - public static String getLastWord(String faction) { - String splitString[] = faction.split(" ", -1); + public static String getLastWord(String ogdp) { + String splitString[] = ogdp.split(" ", -1); return splitString[splitString.length-1]; } diff --git a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java b/src/main/java/cokr/xit/fims/mngt/dao/OgdpMapper.java similarity index 95% rename from src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java rename to src/main/java/cokr/xit/fims/mngt/dao/OgdpMapper.java index 547cac0c..ea037406 100644 --- a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java +++ b/src/main/java/cokr/xit/fims/mngt/dao/OgdpMapper.java @@ -21,27 +21,27 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Mapper("factionMapper") -public interface FactionMapper extends AbstractMapper { +@Mapper("ogdpMapper") +public interface OgdpMapper extends AbstractMapper { /**모든 기관,부서 목록을 반환한다.
* @param * @return 기관,부서 목록 */ - List selectAllFactionList(); + List selectAllOgdpList(); /**사용가능한 기관,부서 목록을 반환한다.
* @param stringMap * @param * @return 기관,부서 목록 */ - List selectAbleFactionList(Map params); + List selectAbleOgdpList(Map params); /**사용자의 시군구코드,시군구명,기관코드,기관명,부서코드,부서명을 반환한다.
* @param 사용자ID * @return 시군구코드,시군구명,기관코드,기관명,부서코드,부서명 */ - DataObject selectFactionInfoOfUser(String userId); + DataObject selectOgdpInfoOfUser(String userId); /**모든 기관 목록을 반환한다.
* @param diff --git a/src/main/java/cokr/xit/fims/mngt/service/FactionService.java b/src/main/java/cokr/xit/fims/mngt/service/OgdpService.java similarity index 97% rename from src/main/java/cokr/xit/fims/mngt/service/FactionService.java rename to src/main/java/cokr/xit/fims/mngt/service/OgdpService.java index 3e3beb90..7d4e7d81 100644 --- a/src/main/java/cokr/xit/fims/mngt/service/FactionService.java +++ b/src/main/java/cokr/xit/fims/mngt/service/OgdpService.java @@ -7,7 +7,7 @@ import cokr.xit.fims.mngt.FimsDepartment; import cokr.xit.fims.mngt.FimsSigungu; import cokr.xit.foundation.data.DataObject; -public interface FactionService { +public interface OgdpService { String updateSgg(FimsSigungu sgg); diff --git a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java b/src/main/java/cokr/xit/fims/mngt/service/bean/OgdpBean.java similarity index 73% rename from src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java rename to src/main/java/cokr/xit/fims/mngt/service/bean/OgdpBean.java index f5e780b0..0cca739f 100644 --- a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java +++ b/src/main/java/cokr/xit/fims/mngt/service/bean/OgdpBean.java @@ -11,16 +11,16 @@ import cokr.xit.base.user.dao.UserMapper; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.mngt.FimsDepartment; import cokr.xit.fims.mngt.FimsSigungu; -import cokr.xit.fims.mngt.dao.FactionMapper; +import cokr.xit.fims.mngt.dao.OgdpMapper; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.component.AbstractBean; import cokr.xit.foundation.data.DataObject; -@Component("factionBean") -public class FactionBean extends AbstractBean { +@Component("ogdpBean") +public class OgdpBean extends AbstractBean { - @Resource(name = "factionMapper") - private FactionMapper factionMapper; + @Resource(name = "ogdpMapper") + private OgdpMapper ogdpMapper; @Resource(name = "userMapper") private UserMapper userMapper; @@ -31,10 +31,10 @@ public class FactionBean extends AbstractBean { */ public void initUserInfo(UserInfo userInfo) { - DataObject factionInfo = factionMapper.selectFactionInfoOfUser(userInfo.getId()); + DataObject ogdpInfo = ogdpMapper.selectOgdpInfoOfUser(userInfo.getId()); Map infoMap = userInfo.getInfo(); - if(factionInfo == null) { + if(ogdpInfo == null) { infoMap.put("sggCd", ""); infoMap.put("sggNm", ""); infoMap.put("instCd", ""); @@ -42,12 +42,12 @@ public class FactionBean extends AbstractBean { infoMap.put("deptCd", ""); infoMap.put("deptNm", ""); } else { - infoMap.put("sggCd", factionInfo.string("SGG_CD")); - infoMap.put("sggNm", factionInfo.string("SGG_NM")); - infoMap.put("instCd", factionInfo.string("INST_CD")); - infoMap.put("instNm", factionInfo.string("INST_NM")); - infoMap.put("deptCd", factionInfo.string("DEPT_CD")); - infoMap.put("deptNm", factionInfo.string("DEPT_NM")); + infoMap.put("sggCd", ogdpInfo.string("SGG_CD")); + infoMap.put("sggNm", ogdpInfo.string("SGG_NM")); + infoMap.put("instCd", ogdpInfo.string("INST_CD")); + infoMap.put("instNm", ogdpInfo.string("INST_NM")); + infoMap.put("deptCd", ogdpInfo.string("DEPT_CD")); + infoMap.put("deptNm", ogdpInfo.string("DEPT_NM")); } userInfo.setInfo(infoMap); @@ -61,7 +61,7 @@ public class FactionBean extends AbstractBean { * */ public boolean updateSgg(FimsSigungu sgg) { - return factionMapper.updateSgg(sgg); + return ogdpMapper.updateSgg(sgg); } /**지정한 조건에 따라 시군구 객체를 반환한다. @@ -69,7 +69,7 @@ public class FactionBean extends AbstractBean { * @return 시군구 객체 */ public DataObject getSggInfo(CmmnQuery req) { - return factionMapper.selectSggInfo(req); + return ogdpMapper.selectSggInfo(req); } @@ -79,7 +79,7 @@ public class FactionBean extends AbstractBean { * @return 부서 목록 */ public List getDeptList(CmmnQuery req) { - return factionMapper.selectDeptList(req); + return ogdpMapper.selectDeptList(req); } /**지정한 조건에 따라 부서 객체들을 반환한다. @@ -87,7 +87,7 @@ public class FactionBean extends AbstractBean { * @return 부서 객체 목록 */ public List getDepts(CmmnQuery req) { - return factionMapper.selectDepts(req); + return ogdpMapper.selectDepts(req); } /**지정한 조건에 따라 부서 객체를 반환한다. @@ -95,7 +95,7 @@ public class FactionBean extends AbstractBean { * @return 부서 객체 */ public DataObject getDeptInfo(CmmnQuery req) { - return factionMapper.selectDeptInfo(req); + return ogdpMapper.selectDeptInfo(req); } /**부서 정보를 등록한다. @@ -106,7 +106,7 @@ public class FactionBean extends AbstractBean { * */ public boolean create(FimsDepartment dept) { - return factionMapper.insert(dept); + return ogdpMapper.insert(dept); } /**부서 정보를 수정한다. @@ -117,7 +117,7 @@ public class FactionBean extends AbstractBean { * */ public boolean update(FimsDepartment dept) { - return factionMapper.update(dept); + return ogdpMapper.update(dept); } /**부서 정보를 삭제한다. @@ -128,6 +128,6 @@ public class FactionBean extends AbstractBean { * */ public boolean remove(String... deptCds) { - return factionMapper.setStatus("N", deptCds) > 0 ? true : false; + return ogdpMapper.setStatus("N", deptCds) > 0 ? true : false; } } diff --git a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java b/src/main/java/cokr/xit/fims/mngt/service/bean/OgdpServiceBean.java similarity index 61% rename from src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java rename to src/main/java/cokr/xit/fims/mngt/service/bean/OgdpServiceBean.java index 83bfc852..4e5e7e3a 100644 --- a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java +++ b/src/main/java/cokr/xit/fims/mngt/service/bean/OgdpServiceBean.java @@ -9,55 +9,55 @@ import org.springframework.stereotype.Service; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.mngt.FimsDepartment; import cokr.xit.fims.mngt.FimsSigungu; -import cokr.xit.fims.mngt.service.FactionService; +import cokr.xit.fims.mngt.service.OgdpService; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; -@Service("factionService") -public class FactionServiceBean extends AbstractServiceBean implements FactionService { +@Service("ogdpService") +public class OgdpServiceBean extends AbstractServiceBean implements OgdpService { - @Resource(name = "factionBean") - private FactionBean factionBean; + @Resource(name = "ogdpBean") + private OgdpBean ogdpBean; @Override public String updateSgg(FimsSigungu sgg) { - return factionBean.updateSgg(sgg) ? "[S]" : "[F]"; + return ogdpBean.updateSgg(sgg) ? "[S]" : "[F]"; } @Override public DataObject getSggInfo(CmmnQuery req) { - return factionBean.getSggInfo(req); + return ogdpBean.getSggInfo(req); } @Override public List getDeptList(CmmnQuery req) { - return factionBean.getDeptList(req); + return ogdpBean.getDeptList(req); } @Override public List getDepts(CmmnQuery req) { - return factionBean.getDepts(req); + return ogdpBean.getDepts(req); } @Override public DataObject getDeptInfo(CmmnQuery req) { - return factionBean.getDeptInfo(req); + return ogdpBean.getDeptInfo(req); } @Override public String create(FimsDepartment dept) { - return factionBean.create(dept) ? "[S]" : "[F]"; + return ogdpBean.create(dept) ? "[S]" : "[F]"; } @Override public String update(FimsDepartment dept) { - return factionBean.update(dept) ? "[S]" : "[F]"; + return ogdpBean.update(dept) ? "[S]" : "[F]"; } @Override public String remove(String... deptCds) { - boolean result = factionBean.remove(deptCds); + boolean result = ogdpBean.remove(deptCds); if(result) { return "[S]"; } else { 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 a4271813..4a63ce33 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java @@ -12,7 +12,7 @@ import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.mngt.Ntc; import cokr.xit.fims.mngt.NtcQuery; -import cokr.xit.fims.mngt.dao.FactionMapper; +import cokr.xit.fims.mngt.dao.OgdpMapper; import cokr.xit.fims.mngt.service.NtcService; import cokr.xit.foundation.data.DataObject; @@ -40,8 +40,8 @@ public class Mngt01Controller extends ApplicationController { @Resource(name="ntcService") private NtcService ntcService; - @Resource(name = "factionMapper") - private FactionMapper factionMapper; + @Resource(name = "ogdpMapper") + private OgdpMapper ogdpMapper; /** 공지사항 메인화면을 연다. * @return fims/mngt/mngt01010-main @@ -96,7 +96,7 @@ public class Mngt01Controller extends ApplicationController { } mav.addObject("ntcInfo", json ? info : toJson(info)); - List allSggList = factionMapper.selectAllSggList(); + List allSggList = ogdpMapper.selectAllSggList(); mav.addObject("sggList", allSggList); return mav; diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java index 935a82a2..4927deda 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java @@ -19,9 +19,9 @@ import cokr.xit.fims.cmmn.service.StngService; import cokr.xit.fims.mngt.FimsSigungu; import cokr.xit.fims.mngt.Task; import cokr.xit.fims.mngt.VltnQuery; -import cokr.xit.fims.mngt.dao.FactionMapper; -import cokr.xit.fims.mngt.service.FactionService; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.dao.OgdpMapper; +import cokr.xit.fims.mngt.service.OgdpService; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.mngt.service.bean.TaskBean; import cokr.xit.fims.mngt.service.bean.VltnBean; import cokr.xit.foundation.UserInfo; @@ -50,15 +50,15 @@ public class Mngt03Controller extends ApplicationController { } /** 소속 정보 서비스 */ - @Resource(name = "factionService") - private FactionService factionService; + @Resource(name = "ogdpService") + private OgdpService ogdpService; /** 소속 정보 Bean */ - @Resource(name = "factionBean") - private FactionBean factionBean; + @Resource(name = "ogdpBean") + private OgdpBean ogdpBean; - @Resource(name = "factionMapper") - private FactionMapper factionMapper; + @Resource(name = "ogdpMapper") + private OgdpMapper ogdpMapper; /** 설정 정보 서비스 */ @Resource(name = "stngService") @@ -88,7 +88,7 @@ public class Mngt03Controller extends ApplicationController { mav.setViewName("fims/mngt/select-sgg"); mav.addObject("pageName", "selectSgg"); - List sggList = factionMapper.selectAllSggList(); + List sggList = ogdpMapper.selectAllSggList(); mav.addObject("sggList", sggList); } else { @@ -100,7 +100,7 @@ public class Mngt03Controller extends ApplicationController { } else { mav.setViewName("fims/mngt/mngt03010-main"); mav.addObject("pageName", "mngt03010"); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); mav.addObject("sggCd", userInfo.getInfo().get("sggCd")); } @@ -114,7 +114,7 @@ public class Mngt03Controller extends ApplicationController { @RequestMapping(name="시군구 조회", value=METHOD_URL.getSggInfo) public ModelAndView getSggInfo(CmmnQuery req) { ModelAndView mav = new ModelAndView("jsonView"); - DataObject sggInfo = factionService.getSggInfo(req); + DataObject sggInfo = ogdpService.getSggInfo(req); mav.addObject("sggInfo", sggInfo); return mav; } @@ -168,7 +168,7 @@ public class Mngt03Controller extends ApplicationController { sgg.setOfficialSealFilename(newOffcs.get("fileName")); } boolean saved = false; - String rtnMsg = factionService.updateSgg(sgg); + String rtnMsg = ogdpService.updateSgg(sgg); if(rtnMsg.contains("[S]")) { saved = true; } diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java index 5992d693..eea46f4a 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java @@ -11,9 +11,9 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.mngt.FimsDepartment; -import cokr.xit.fims.mngt.dao.FactionMapper; -import cokr.xit.fims.mngt.service.FactionService; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.dao.OgdpMapper; +import cokr.xit.fims.mngt.service.OgdpService; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.foundation.data.DataObject; /**부서관리 서비스 웹 컨트롤러.
@@ -38,15 +38,15 @@ public class Mngt04Controller extends ApplicationController { } /** 소속 정보 서비스 */ - @Resource(name = "factionService") - private FactionService factionService; + @Resource(name = "ogdpService") + private OgdpService ogdpService; /** 소속 정보 Bean */ - @Resource(name = "factionBean") - private FactionBean factionBean; + @Resource(name = "ogdpBean") + private OgdpBean ogdpBean; - @Resource(name = "factionMapper") - private FactionMapper factionMapper; + @Resource(name = "ogdpMapper") + private OgdpMapper ogdpMapper; /** 부서관리 메인화면을 연다. * @return fims/mngt/mngt04010-main @@ -58,7 +58,7 @@ public class Mngt04Controller extends ApplicationController { mav.setViewName("fims/mngt/mngt04010-main"); mav.addObject("pageName", "mngt04010"); - List allSggList = factionMapper.selectAllSggList(); + List allSggList = ogdpMapper.selectAllSggList(); mav.addObject("sggList", allSggList); @@ -66,7 +66,7 @@ public class Mngt04Controller extends ApplicationController { } /**부서 목록을 조회한다.
- * {@link FactionService#getDeptList(CmmnQuery)} 참고 + * {@link OgdpService#getDeptList(CmmnQuery)} 참고 * @param query 부서 목록 조회 조건 * @return jsonView */ @@ -75,7 +75,7 @@ public class Mngt04Controller extends ApplicationController { setFetchSize(query); - return setCollectionInfo(new ModelAndView("jsonView"), factionService.getDeptList(query),"",""); + return setCollectionInfo(new ModelAndView("jsonView"), ogdpService.getDeptList(query),"",""); } @@ -91,7 +91,7 @@ public class Mngt04Controller extends ApplicationController { DataObject deptInfo = new DataObject(); if(!ifEmpty(query.getDeptCd(), ()->"").equals("")) { - deptInfo = factionService.getDeptInfo(query); + deptInfo = ogdpService.getDeptInfo(query); } else { deptInfo = null; } @@ -115,7 +115,7 @@ public class Mngt04Controller extends ApplicationController { public ModelAndView removeDept(String... deptCds) { ModelAndView mav = new ModelAndView("jsonView"); boolean saved = false; - String rtnMsg = factionService.remove(deptCds); + String rtnMsg = ogdpService.remove(deptCds); if(rtnMsg.contains("[S]")) { saved = true; } @@ -135,7 +135,7 @@ public class Mngt04Controller extends ApplicationController { public ModelAndView createDept(FimsDepartment dept) { ModelAndView mav = new ModelAndView("jsonView"); boolean saved = false; - String rtnMsg = factionService.create(dept); + String rtnMsg = ogdpService.create(dept); if(rtnMsg.contains("[S]")) { saved = true; } @@ -155,7 +155,7 @@ public class Mngt04Controller extends ApplicationController { public ModelAndView updateDept(FimsDepartment dept) { ModelAndView mav = new ModelAndView("jsonView"); boolean saved = false; - String rtnMsg = factionService.update(dept); + String rtnMsg = ogdpService.update(dept); if(rtnMsg.contains("[S]")) { saved = true; } diff --git a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java index f415876e..40b101fc 100644 --- a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java +++ b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java @@ -42,7 +42,7 @@ import cokr.xit.fims.crdn.dao.CrdnInfoMapper; import cokr.xit.fims.crdn.dao.CrdnStngMapper; import cokr.xit.fims.crdn.dao.CrdnUpdtMapper; import cokr.xit.fims.mngt.dao.TaskMapper; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.nxrp.A01; import cokr.xit.fims.nxrp.A03Rqst; import cokr.xit.fims.nxrp.NisIndivQuery; @@ -110,8 +110,8 @@ public class NisIndivBean extends AbstractBean { protected StngBean stngBean; /** 부서 정보 DAO */ - @Resource(name = "factionBean") - private FactionBean factionBean; + @Resource(name = "ogdpBean") + private OgdpBean ogdpBean; /**지정한 조건에 따라 과태료 대장 단속 정보 등록 목록을 조회하여 반환한다. * @param req 과태료 대장 단속 정보 등록 조회 조건 @@ -144,7 +144,7 @@ public class NisIndivBean extends AbstractBean { DataObject userInfo = userBean.getUserInfo(currentUser().getId()); // 2. 부서 정보 - DataObject deptInfo = factionBean.getDeptInfo(new CmmnQuery().setDeptCd(userInfo.string("DEPT_CD"))); + DataObject deptInfo = ogdpBean.getDeptInfo(new CmmnQuery().setDeptCd(userInfo.string("DEPT_CD"))); // 3. 세외수입 과태료대장에 연계할 단속 정보를 조회 DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId()); @@ -346,7 +346,7 @@ public class NisIndivBean extends AbstractBean { DataObject userInfo = userBean.getUserInfo(currentUser().getId()); // 2. 부서 정보 - DataObject deptInfo = factionBean.getDeptInfo(new CmmnQuery().setDeptCd(userInfo.string("DEPT_CD"))); + DataObject deptInfo = ogdpBean.getDeptInfo(new CmmnQuery().setDeptCd(userInfo.string("DEPT_CD"))); // 3. 세외수입 과태료대장에 연계할 단속 정보를 조회 DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId()); diff --git a/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcServiceBean.java b/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcServiceBean.java index bad11201..17b8be59 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcServiceBean.java +++ b/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcServiceBean.java @@ -6,7 +6,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.Svbtc; import cokr.xit.fims.sndb.service.SvbtcService; @@ -31,8 +31,8 @@ public class SvbtcServiceBean extends AbstractServiceBean implements SvbtcServic private SvbtcBean svbtcBean; /* Bean */ - @Resource(name="factionBean") - protected FactionBean factionBean; + @Resource(name="ogdpBean") + protected OgdpBean ogdpBean; @Override public List getSvbtcList(SndbQuery req) { 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 91781acb..c077fe5d 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -24,10 +24,10 @@ import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CmmnQuery; +import cokr.xit.fims.cmmn.FimsPrintOption; import cokr.xit.fims.cmmn.OtptStngQuery; import cokr.xit.fims.cmmn.OutsourcingFileMaker; import cokr.xit.fims.cmmn.OutsourcingStngQuery; -import cokr.xit.fims.cmmn.FimsPrintOption; import cokr.xit.fims.cmmn.dao.OtptStngMapper; import cokr.xit.fims.cmmn.hwp.format.SvbtcList; import cokr.xit.fims.cmmn.pdf.print.format.Advntce; @@ -36,7 +36,7 @@ import cokr.xit.fims.cmmn.service.bean.StngBean; 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.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.mngt.service.bean.TaskBean; import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.Sndng; @@ -153,8 +153,8 @@ public class Sndb01Controller extends ApplicationController { @Resource(name="fileBean") private FileBean fileBean; - @Resource(name="factionBean") - private FactionBean factionBean; + @Resource(name="ogdpBean") + private OgdpBean ogdpBean; @Resource(name="svbtcBean") private SvbtcBean svbtcBean; @@ -1657,7 +1657,7 @@ public class Sndb01Controller extends ApplicationController { UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); Print print = new Print(); print.setPrintRequestUserInfo(userInfo); @@ -1866,7 +1866,7 @@ public class Sndb01Controller extends ApplicationController { Print print = new Print(); UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo); //출력물 기본 설정 diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java index 4acffe6b..ab4bf32e 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java @@ -10,7 +10,7 @@ import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.fims.cmmn.dao.OtptStngMapper; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.dao.CrdnListMapper; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.sprt.SprtQuery; import cokr.xit.fims.sprt.dao.IntegrationSearchMapper; import cokr.xit.fims.sprt.service.IntegrationSearchService; @@ -34,8 +34,8 @@ public class IntegrationSearchServiceBean extends AbstractServiceBean implements @Resource(name="integrationSearchBean") protected IntegrationSearchBean integrationSearchBean; - @Resource(name="factionBean") - protected FactionBean factionBean; + @Resource(name="ogdpBean") + protected OgdpBean ogdpBean; @Resource(name="crdnListMapper") protected CrdnListMapper crdnListMapper; 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 bee80fbb..34d1da51 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -48,7 +48,7 @@ import cokr.xit.fims.cmmn.xls.StyleMaker; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.CrdnListMapper; -import cokr.xit.fims.mngt.service.bean.FactionBean; +import cokr.xit.fims.mngt.service.bean.OgdpBean; import cokr.xit.fims.mngt.service.bean.TaskBean; import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.Sndng; @@ -127,8 +127,8 @@ public class Sprt01Controller extends ApplicationController { @Resource(name = "taskBean") private TaskBean taskBean; - @Resource(name = "factionBean") - private FactionBean factionBean; + @Resource(name = "ogdpBean") + private OgdpBean ogdpBean; @Resource(name = "mediaBean") private MediaBean mediaBean; @@ -457,7 +457,7 @@ public class Sprt01Controller extends ApplicationController { FimsPrintOption printOption = new FimsPrintOption(); printOption.setPrivateInfoYn(privateInfoYn); UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); Print print = new Print(); print.setPrintRequestUserInfo(userInfo); @@ -483,7 +483,7 @@ public class Sprt01Controller extends ApplicationController { FimsPrintOption printOption = new FimsPrintOption(); UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); Print print = new Print(); print.setPrintRequestUserInfo(userInfo); @@ -558,7 +558,7 @@ public class Sprt01Controller extends ApplicationController { printOption.setGlobalVariable(globalVariable); UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); Print print = new Print(); print.setPrintRequestUserInfo(userInfo); @@ -584,7 +584,7 @@ public class Sprt01Controller extends ApplicationController { DataObject deptStngInfo = stngBean.getStng("dept"); UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); Print print = new Print(); print.setPrintRequestUserInfo(userInfo); @@ -624,7 +624,7 @@ public class Sprt01Controller extends ApplicationController { public ModelAndView makeRcvmtConfirmFileFromHwpFormat(String... crdnIds) { UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); Print print = new Print(); print.setPrintRequestUserInfo(userInfo); @@ -662,7 +662,7 @@ public class Sprt01Controller extends ApplicationController { @RequestMapping(name="사전통지서 pdf 파일 생성", value=METHOD_URL.makeAdvntcePdf) public ModelAndView makeAdvntcePdf(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) { UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); @@ -782,7 +782,7 @@ public class Sprt01Controller extends ApplicationController { @RequestMapping(name="사전통지서 외주 파일 생성", value=METHOD_URL.makeAdvntceOutsourcing) public ModelAndView makeAdvntceOutsourcing(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) { UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); @@ -900,7 +900,7 @@ public class Sprt01Controller extends ApplicationController { public ModelAndView makeNhtPdf(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) { UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); @@ -1022,7 +1022,7 @@ public class Sprt01Controller extends ApplicationController { @RequestMapping(name="고지서 외주 파일 생성", value=METHOD_URL.makeNhtOutsourcing) public ModelAndView makeNhtOutsourcing(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) { UserInfo userInfo = currentUser(); - factionBean.initUserInfo(userInfo); + ogdpBean.initUserInfo(userInfo); sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); diff --git a/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml b/src/main/resources/sql/mapper/fims/mngt/ogdp-mapper.xml similarity index 92% rename from src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml rename to src/main/resources/sql/mapper/fims/mngt/ogdp-mapper.xml index dce608d1..3a6588d1 100644 --- a/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml +++ b/src/main/resources/sql/mapper/fims/mngt/ogdp-mapper.xml @@ -1,11 +1,11 @@ - + - +/* 전체 기관,부서 목록 조회(ogdpMapper.selectAllOgdpList) */ +SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS OGDP_CD + , CONCAT(A.INST_NM,' / ',B.DEPT_NM) AS OGDP_NM , A.INST_CD , A.INST_NM , B.DEPT_CD @@ -15,8 +15,8 @@ SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS FACTION_CD FROM TB_SGG A LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD) UNION -SELECT ('default/default') AS FACTION_CD - , CONCAT('기본 기관',' / ','기본 부서') AS FACTION_NM +SELECT ('default/default') AS OGDP_CD + , CONCAT('기본 기관',' / ','기본 부서') AS OGDP_NM , 'default' AS INST_CD , '기본 기관' AS INST_NM , 'default' AS DEPT_CD @@ -26,10 +26,10 @@ SELECT ('default/default') AS FACTION_CD FROM DUAL - +/* 사용가능한 기관,부서 목록 조회(ogdpMapper.selectAbleOgdpList) */ +SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS OGDP_CD + , CONCAT(A.INST_NM,' / ',B.DEPT_NM) AS OGDP_NM , A.INST_CD , A.INST_NM , B.DEPT_CD @@ -48,8 +48,8 @@ LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD) UNION - SELECT 'default/default' AS FACTION_CD - , CONCAT('기본 기관',' / ','기본 부서') AS FACTION_NM + SELECT 'default/default' AS OGDP_CD + , CONCAT('기본 기관',' / ','기본 부서') AS OGDP_NM , 'default' AS INST_CD , '기본 기관' AS INST_NM , 'default' AS DEPT_CD @@ -63,8 +63,8 @@ LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD) - +/* 사용자의 시군구,기관,부서 조회(ogdpMapper.selectOgdpInfoOfUser) */ SELECT S.SGG_CD , S.SGG_NM , U.NSTT_CD AS INST_CD @@ -78,7 +78,7 @@ SELECT S.SGG_CD -/* 시군구 객체 가져오기(factionMapper.selectSggs) */ +/* 시군구 객체 가져오기(ogdpMapper.selectSggs) */ @@ -132,14 +132,14 @@ SELECT S.SGG_CD -/* 시군구 설정정보 수정 (factionMapper.updateSgg) */ +/* 시군구 설정정보 수정 (ogdpMapper.updateSgg) */ UPDATE TB_SGG SET MDFCN_DT = , MDFR = #{sgg.modifiedBy} @@ -239,7 +239,7 @@ UPDATE TB_SGG -/* 부서 등록(factionMapper.insertDept) */ +/* 부서 등록(ogdpMapper.insertDept) */ INSERT INTO TB_DEPT ( DEPT_CD @@ -349,7 +349,7 @@ UPDATE TB_SGG -/* 부서 수정(factionMapper.updateDept) */ +/* 부서 수정(ogdpMapper.updateDept) */ UPDATE TB_DEPT SET SGG_CD = #{dept.sggID} , INST_CD = #{dept.instCode} @@ -384,7 +384,7 @@ UPDATE TB_SGG -/* 부서 사용 여부 변경(factionMapper.setStatus) */ +/* 부서 사용 여부 변경(ogdpMapper.setStatus) */ UPDATE TB_DEPT SET USE_YN = #{useYn} , MDFCN_DT = diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp index 4645afff..3eecc5b4 100644 --- a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp @@ -15,10 +15,10 @@ data-bs-toggle="dropdown" >선택
    - +
  • ${item.FACTION_NM} + onclick="setOgdpCodeValues('${item.INST_CD}','${item.DEPT_CD}','${item.SGG_CD}')">${item.OGDP_NM}
@@ -28,7 +28,7 @@ @@ -36,7 +36,7 @@ @@ -171,9 +171,9 @@ - - - + + + @@ -238,7 +238,7 @@ function saveinfoPrefix() { }); } -function setFactionCodeValues(institute, deptCode, sggCd){ +function setOgdpCodeValues(institute, deptCode, sggCd){ $("#infoPrefix-form [name='institute']").val(institute).trigger("change"); $("#infoPrefix-form [name='deptCode']").val(deptCode).trigger("change"); diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp index cb859541..13711ecf 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp @@ -42,10 +42,10 @@ data-bs-toggle="dropdown" >선택
    - +
  • ${item.FACTION_NM} + onclick="setOgdpCodeValues('${item.INST_CD}','${item.DEPT_CD}','${item.SGG_CD}')">${item.OGDP_NM}
@@ -55,7 +55,7 @@ @@ -63,7 +63,7 @@ @@ -203,9 +203,9 @@ - - - + + + @@ -306,7 +306,7 @@ function save(info){ }); } -function setFactionCodeValues(institute, deptCode, sggCd){ +function setOgdpCodeValues(institute, deptCode, sggCd){ $("#user-form [name='institute']").val(institute).trigger("change"); $("#user-form [name='deptCode']").val(deptCode).trigger("change");