diff --git a/src/main/java/cokr/xit/fims/mngt/FineIntegrationDepartment.java b/src/main/java/cokr/xit/fims/mngt/FimsDepartment.java similarity index 96% rename from src/main/java/cokr/xit/fims/mngt/FineIntegrationDepartment.java rename to src/main/java/cokr/xit/fims/mngt/FimsDepartment.java index 11c7607e..1d5e9f0d 100644 --- a/src/main/java/cokr/xit/fims/mngt/FineIntegrationDepartment.java +++ b/src/main/java/cokr/xit/fims/mngt/FimsDepartment.java @@ -10,7 +10,7 @@ import lombok.Setter; */ @Getter @Setter -public class FineIntegrationDepartment extends Department { +public class FimsDepartment extends Department { /** * 민원 연계 구분 코드 diff --git a/src/main/java/cokr/xit/fims/mngt/FineIntegrationSigungu.java b/src/main/java/cokr/xit/fims/mngt/FimsSigungu.java similarity index 88% rename from src/main/java/cokr/xit/fims/mngt/FineIntegrationSigungu.java rename to src/main/java/cokr/xit/fims/mngt/FimsSigungu.java index 1d53ac00..474698e1 100644 --- a/src/main/java/cokr/xit/fims/mngt/FineIntegrationSigungu.java +++ b/src/main/java/cokr/xit/fims/mngt/FimsSigungu.java @@ -10,7 +10,7 @@ import lombok.Setter; */ @Getter @Setter -public class FineIntegrationSigungu extends Sigungu { +public class FimsSigungu extends Sigungu { /** * 상징 파일 경로 diff --git a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java b/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java index b5b03248..82eafff9 100644 --- a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java +++ b/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java @@ -6,8 +6,8 @@ import java.util.Map; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; import cokr.xit.fims.cmmn.CmmnQuery; -import cokr.xit.fims.mngt.FineIntegrationDepartment; -import cokr.xit.fims.mngt.FineIntegrationSigungu; +import cokr.xit.fims.mngt.FimsDepartment; +import cokr.xit.fims.mngt.FimsSigungu; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; @@ -77,7 +77,7 @@ public interface FactionMapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean updateSgg(FineIntegrationSigungu sgg) { + default boolean updateSgg(FimsSigungu sgg) { return sgg != null && updateSgg(params().set("sgg", sgg)) == 1; } @@ -153,7 +153,7 @@ public interface FactionMapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean insert(FineIntegrationDepartment dept) { + default boolean insert(FimsDepartment dept) { return dept != null && insertDept(params().set("dept", dept)) == 1; } @@ -173,7 +173,7 @@ public interface FactionMapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean update(FineIntegrationDepartment dept) { + default boolean update(FimsDepartment dept) { return dept != null && updateDept(params().set("dept", dept)) == 1; } diff --git a/src/main/java/cokr/xit/fims/mngt/service/FactionService.java b/src/main/java/cokr/xit/fims/mngt/service/FactionService.java index 4b00d00d..3e3beb90 100644 --- a/src/main/java/cokr/xit/fims/mngt/service/FactionService.java +++ b/src/main/java/cokr/xit/fims/mngt/service/FactionService.java @@ -3,13 +3,13 @@ package cokr.xit.fims.mngt.service; import java.util.List; import cokr.xit.fims.cmmn.CmmnQuery; -import cokr.xit.fims.mngt.FineIntegrationDepartment; -import cokr.xit.fims.mngt.FineIntegrationSigungu; +import cokr.xit.fims.mngt.FimsDepartment; +import cokr.xit.fims.mngt.FimsSigungu; import cokr.xit.foundation.data.DataObject; public interface FactionService { - String updateSgg(FineIntegrationSigungu sgg); + String updateSgg(FimsSigungu sgg); DataObject getSggInfo(CmmnQuery req); @@ -39,7 +39,7 @@ public interface FactionService { *
  • 그렇지 않으면 false
  • * */ - String create(FineIntegrationDepartment dept); + String create(FimsDepartment dept); /**부서 정보를 수정한다. * @param dept 부서 @@ -48,7 +48,7 @@ public interface FactionService { *
  • 그렇지 않으면 false
  • * */ - String update(FineIntegrationDepartment dept); + String update(FimsDepartment dept); /**부서 정보를 삭제한다. * @param deptCds 부서 코드 목록 diff --git a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java b/src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java index 2ca4574c..0bade06b 100644 --- a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java +++ b/src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Component; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.fims.cmmn.CmmnQuery; -import cokr.xit.fims.mngt.FineIntegrationDepartment; -import cokr.xit.fims.mngt.FineIntegrationSigungu; +import cokr.xit.fims.mngt.FimsDepartment; +import cokr.xit.fims.mngt.FimsSigungu; import cokr.xit.fims.mngt.dao.FactionMapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.UserInfo; @@ -60,7 +60,7 @@ public class FactionBean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean updateSgg(FineIntegrationSigungu sgg) { + public boolean updateSgg(FimsSigungu sgg) { return factionMapper.updateSgg(sgg); } @@ -105,7 +105,7 @@ public class FactionBean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean create(FineIntegrationDepartment dept) { + public boolean create(FimsDepartment dept) { return factionMapper.insert(dept); } @@ -116,7 +116,7 @@ public class FactionBean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean update(FineIntegrationDepartment dept) { + public boolean update(FimsDepartment dept) { return factionMapper.update(dept); } diff --git a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java b/src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java index 19d1d030..83bfc852 100644 --- a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java +++ b/src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java @@ -7,8 +7,8 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import cokr.xit.fims.cmmn.CmmnQuery; -import cokr.xit.fims.mngt.FineIntegrationDepartment; -import cokr.xit.fims.mngt.FineIntegrationSigungu; +import cokr.xit.fims.mngt.FimsDepartment; +import cokr.xit.fims.mngt.FimsSigungu; import cokr.xit.fims.mngt.service.FactionService; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -20,7 +20,7 @@ public class FactionServiceBean extends AbstractServiceBean implements FactionSe private FactionBean factionBean; @Override - public String updateSgg(FineIntegrationSigungu sgg) { + public String updateSgg(FimsSigungu sgg) { return factionBean.updateSgg(sgg) ? "[S]" : "[F]"; } @@ -46,12 +46,12 @@ public class FactionServiceBean extends AbstractServiceBean implements FactionSe } @Override - public String create(FineIntegrationDepartment dept) { + public String create(FimsDepartment dept) { return factionBean.create(dept) ? "[S]" : "[F]"; } @Override - public String update(FineIntegrationDepartment dept) { + public String update(FimsDepartment dept) { return factionBean.update(dept) ? "[S]" : "[F]"; } 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 6df0efaa..227975da 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java @@ -14,7 +14,7 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.service.StngService; -import cokr.xit.fims.mngt.FineIntegrationSigungu; +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; @@ -138,7 +138,7 @@ public class Mngt03Controller extends ApplicationController { * "saved": 수정되었으면 true, 그렇지 않으면 false * } */ - public ModelAndView updateSgg(FineIntegrationSigungu sgg, MultipartFile symbol, MultipartFile logo, MultipartFile offcs) { + public ModelAndView updateSgg(FimsSigungu sgg, MultipartFile symbol, MultipartFile logo, MultipartFile offcs) { ModelAndView mav = new ModelAndView("jsonView"); String sggCd = sgg.getSggID(); 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 0194b887..51a5c0da 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java @@ -8,7 +8,7 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CmmnQuery; -import cokr.xit.fims.mngt.FineIntegrationDepartment; +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; @@ -123,7 +123,7 @@ public class Mngt04Controller extends ApplicationController { * "saved": 저장되었으면 true, 그렇지 않으면 false * } */ - public ModelAndView createDept(FineIntegrationDepartment dept) { + public ModelAndView createDept(FimsDepartment dept) { ModelAndView mav = new ModelAndView("jsonView"); boolean saved = false; String rtnMsg = factionService.create(dept); @@ -142,7 +142,7 @@ public class Mngt04Controller extends ApplicationController { * "saved": 저장되었으면 true, 그렇지 않으면 false * } */ - public ModelAndView updateDept(FineIntegrationDepartment dept) { + public ModelAndView updateDept(FimsDepartment dept) { ModelAndView mav = new ModelAndView("jsonView"); boolean saved = false; String rtnMsg = factionService.update(dept); diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java index 206207a5..b6abe87a 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -14,8 +14,8 @@ import cokr.xit.fims.cmmn.OtptForm; import cokr.xit.fims.cmmn.OtptStngQuery; import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.mngt.FineIntegrationDepartment; -import cokr.xit.fims.mngt.FineIntegrationSigungu; +import cokr.xit.fims.mngt.FimsDepartment; +import cokr.xit.fims.mngt.FimsSigungu; import cokr.xit.fims.mngt.Ntc; import cokr.xit.fims.mngt.NtcQuery; import cokr.xit.fims.mngt.Schdl; @@ -685,7 +685,7 @@ public class CmnController { @Override @RequestMapping(name="시군구 정보 수정", value=METHOD_URL.updateSgg) - public ModelAndView updateSgg(FineIntegrationSigungu sgg, MultipartFile symbol, MultipartFile logo, MultipartFile offcs) { + public ModelAndView updateSgg(FimsSigungu sgg, MultipartFile symbol, MultipartFile logo, MultipartFile offcs) { return super.updateSgg(sgg, symbol, logo, offcs); } @@ -733,13 +733,13 @@ public class CmnController { @Override @RequestMapping(name="부서 등록", value=METHOD_URL.createDept) - public ModelAndView createDept(FineIntegrationDepartment dept) { + public ModelAndView createDept(FimsDepartment dept) { return super.createDept(dept); } @Override @RequestMapping(name="부서 수정", value=METHOD_URL.updateDept) - public ModelAndView updateDept(FineIntegrationDepartment dept) { + public ModelAndView updateDept(FimsDepartment dept) { return super.updateDept(dept); } } diff --git a/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml b/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml index bb06780c..6524df9a 100644 --- a/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml +++ b/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml @@ -162,7 +162,7 @@ UPDATE TB_SGG - +