소속 관리 파일명 변경

main
이범준 6 months ago
parent ec55c53c69
commit fe4ae930bb

@ -12,7 +12,7 @@ import org.springframework.web.servlet.ModelAndView;
import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.ManagedUser;
import cokr.xit.base.user.service.UserService; 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.fims.task.TaskRequestMappingHandlerMapping;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
import cokr.xit.foundation.web.AbstractController; import cokr.xit.foundation.web.AbstractController;
@ -24,8 +24,8 @@ public class MainController extends AbstractController {
@Autowired @Autowired
private TaskRequestMappingHandlerMapping requestHandlers; private TaskRequestMappingHandlerMapping requestHandlers;
@Resource(name="factionMapper") @Resource(name="ogdpMapper")
FactionMapper factionMapper; OgdpMapper ogdpMapper;
@Resource(name="userService") @Resource(name="userService")
private UserService userService; private UserService userService;
@ -39,13 +39,13 @@ public class MainController extends AbstractController {
public ModelAndView signupPage(String institute) { public ModelAndView signupPage(String institute) {
ModelAndView mav = new ModelAndView("fims/user/user-info"); ModelAndView mav = new ModelAndView("fims/user/user-info");
mav.addObject("allFactionList", factionMapper.selectAllFactionList()); mav.addObject("allOgdpList", ogdpMapper.selectAllOgdpList());
DataObject params = new DataObject(); DataObject params = new DataObject();
params.set("anonymous", "Y"); params.set("anonymous", "Y");
params.set("institute", institute); params.set("institute", institute);
List<DataObject> ableFactionList = factionMapper.selectAbleFactionList(params); List<DataObject> ableOgdpList = ogdpMapper.selectAbleOgdpList(params);
mav.addObject("ableFactionList", ableFactionList); mav.addObject("ableOgdpList", ableOgdpList);
mav.addObject("userInfo", "{}"); mav.addObject("userInfo", "{}");
@ -71,7 +71,7 @@ public class MainController extends AbstractController {
@RequestMapping(name="기관 목록", value="/instList.do") @RequestMapping(name="기관 목록", value="/instList.do")
public ModelAndView instList(String account, String institute) { public ModelAndView instList(String account, String institute) {
List<DataObject> instList = factionMapper.selectAllInstList(); List<DataObject> instList = ogdpMapper.selectAllInstList();
return new ModelAndView("jsonView") return new ModelAndView("jsonView")
.addObject("instList", instList); .addObject("instList", instList);
} }

@ -13,7 +13,7 @@ import org.springframework.web.servlet.ModelAndView;
import cokr.xit.base.code.service.CodeQuery; import cokr.xit.base.code.service.CodeQuery;
import cokr.xit.base.code.service.bean.CodeBean; import cokr.xit.base.code.service.bean.CodeBean;
import cokr.xit.fims.cmmn.CmmnQuery; 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.fims.mngt.service.bean.TaskBean;
import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.UserInfo;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -26,8 +26,8 @@ public class CodeController extends cokr.xit.base.code.web.CodeController {
@Resource(name = "taskBean") @Resource(name = "taskBean")
private TaskBean taskBean; private TaskBean taskBean;
@Resource(name = "factionBean") @Resource(name = "ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
@RequestMapping(name="모든 업무구분코드 조회",value="/getAllTaskSeCd.do") @RequestMapping(name="모든 업무구분코드 조회",value="/getAllTaskSeCd.do")
public ModelAndView getAllTaskSeCd() { public ModelAndView getAllTaskSeCd() {
@ -52,7 +52,7 @@ public class CodeController extends cokr.xit.base.code.web.CodeController {
mav.addObject("sggHasTask", "Y"); mav.addObject("sggHasTask", "Y");
} else { } else {
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
String sggCd = (String)userInfo.getInfo().get("sggCd"); String sggCd = (String)userInfo.getInfo().get("sggCd");

@ -14,8 +14,8 @@ import cokr.xit.base.security.SecuredUserInfo;
import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.ManagedUser;
import cokr.xit.base.user.service.UserService; import cokr.xit.base.user.service.UserService;
import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.mngt.dao.FactionMapper; import cokr.xit.fims.mngt.dao.OgdpMapper;
import cokr.xit.fims.mngt.service.bean.FactionBean; import cokr.xit.fims.mngt.service.bean.OgdpBean;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@Controller @Controller
@ -30,11 +30,11 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
@Resource(name = "codeBean") @Resource(name = "codeBean")
private CodeBean codeBean; private CodeBean codeBean;
@Resource(name="factionBean") @Resource(name="ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
@Resource(name="factionMapper") @Resource(name="ogdpMapper")
private FactionMapper factionMapper; private OgdpMapper ogdpMapper;
@Resource(name = "stngBean") @Resource(name = "stngBean")
private StngBean stngBean; private StngBean stngBean;
@ -49,11 +49,11 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
public ModelAndView getInfo(String userID) { public ModelAndView getInfo(String userID) {
ModelAndView mav = super.getInfo(userID); ModelAndView mav = super.getInfo(userID);
mav.addObject("allFactionList", factionMapper.selectAllFactionList()); mav.addObject("allOgdpList", ogdpMapper.selectAllOgdpList());
DataObject params = new DataObject().set("currentUser", currentUser()); DataObject params = new DataObject().set("currentUser", currentUser());
List<DataObject> ableFactionList = factionMapper.selectAbleFactionList(params); List<DataObject> ableOgdpList = ogdpMapper.selectAbleOgdpList(params);
mav.addObject("ableFactionList", ableFactionList); mav.addObject("ableOgdpList", ableOgdpList);
return mav; return mav;
} }
@ -65,7 +65,7 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
SecuredUserInfo userInfo = currentUser(); SecuredUserInfo userInfo = currentUser();
//시군구,기관,부서 //시군구,기관,부서
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
//관리자여부,업무권한여부 //관리자여부,업무권한여부
boolean isAdmin = userInfo.hasAuthorities("ROLE_ADMIN"); boolean isAdmin = userInfo.hasAuthorities("ROLE_ADMIN");
@ -112,10 +112,10 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
DataObject userInfo = userService.getUserInfo(currentUser().getId()); DataObject userInfo = userService.getUserInfo(currentUser().getId());
mav.addObject("userInfo", toJson(userInfo)); mav.addObject("userInfo", toJson(userInfo));
mav.addObject("allFactionList", factionMapper.selectAllFactionList()); mav.addObject("allOgdpList", ogdpMapper.selectAllOgdpList());
DataObject params = new DataObject().set("currentUser", currentUser()); DataObject params = new DataObject().set("currentUser", currentUser());
List<DataObject> ableFactionList = factionMapper.selectAbleFactionList(params); List<DataObject> ableOgdpList = ogdpMapper.selectAbleOgdpList(params);
mav.addObject("ableFactionList", ableFactionList); mav.addObject("ableOgdpList", ableOgdpList);
return mav; return mav;
} }

@ -5,7 +5,7 @@ import java.util.List;
import cokr.xit.applib.Print; import cokr.xit.applib.Print;
import cokr.xit.applib.hwp.format.HWPFormat; import cokr.xit.applib.hwp.format.HWPFormat;
import cokr.xit.fims.cmmn.FimsPrintOption; 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.DataFormat;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -39,7 +39,7 @@ public class CrdnConfirm extends HWPFormat {
String dd = printRequestYmd.substring(6, 8); String dd = printRequestYmd.substring(6, 8);
String ymd = yyyy+"년 "+mm+"월 "+dd+"일"; 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); DataObject one = data.get(currentRunCount);

@ -7,7 +7,7 @@ import java.util.stream.IntStream;
import cokr.xit.applib.Print; import cokr.xit.applib.Print;
import cokr.xit.applib.hwp.format.HWPFormat; import cokr.xit.applib.hwp.format.HWPFormat;
import cokr.xit.fims.cmmn.FimsPrintOption; 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.DataFormat;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -66,7 +66,7 @@ public class CrdnList extends HWPFormat {
writer.setValue("총금액", DataFormat.n_nn0(globalTotalAmount)); writer.setValue("총금액", DataFormat.n_nn0(globalTotalAmount));
String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm"); String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm");
instNm = FactionUtil.getLastWord(instNm); instNm = OgdpUtil.getLastWord(instNm);
writer.setValue("발신", instNm); writer.setValue("발신", instNm);
List<DataObject> list = IntStream.rangeClosed(1, this.data.size()).boxed().map(i -> { List<DataObject> list = IntStream.rangeClosed(1, this.data.size()).boxed().map(i -> {

@ -6,7 +6,7 @@ import java.util.List;
import cokr.xit.applib.Print; import cokr.xit.applib.Print;
import cokr.xit.applib.hwp.format.HWPFormat; import cokr.xit.applib.hwp.format.HWPFormat;
import cokr.xit.fims.cmmn.FimsPrintOption; 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.DataFormat;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -47,7 +47,7 @@ public class RcvmtConfirm extends HWPFormat {
@Override @Override
public void runAsWriter() { 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); DataObject one = data.get(currentRunCount);

@ -14,7 +14,7 @@ import cokr.xit.applib.hwp.OffcsCellFinder;
import cokr.xit.applib.hwp.format.HWPFormat; import cokr.xit.applib.hwp.format.HWPFormat;
import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.cmmn.FimsPrintOption; 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.DataFormat;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
import kr.dogfoot.hwplib.object.bodytext.control.table.Cell; import kr.dogfoot.hwplib.object.bodytext.control.table.Cell;
@ -87,8 +87,8 @@ public class ReportOnClaims extends HWPFormat {
writer.setValue("연월일", ymd); writer.setValue("연월일", ymd);
String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm"); String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm");
instNm = FactionUtil.getLastWord(instNm); instNm = OgdpUtil.getLastWord(instNm);
instNm = FactionUtil.getInstituteLeader(instNm, false); instNm = OgdpUtil.getInstituteLeader(instNm, false);
writer.setValue("발신", instNm); writer.setValue("발신", instNm);
List<DataObject> list = IntStream.rangeClosed(1, this.data.size()).boxed().map(i -> { List<DataObject> list = IntStream.rangeClosed(1, this.data.size()).boxed().map(i -> {

@ -14,7 +14,7 @@ import cokr.xit.applib.hwp.OffcsCellFinder;
import cokr.xit.applib.hwp.format.HWPFormat; import cokr.xit.applib.hwp.format.HWPFormat;
import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.cmmn.FimsPrintOption; 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.DataFormat;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
import kr.dogfoot.hwplib.object.bodytext.control.table.Cell; import kr.dogfoot.hwplib.object.bodytext.control.table.Cell;
@ -92,8 +92,8 @@ public class RequestForDelivery extends HWPFormat {
String ymd = yyyy+"년 "+mm+"월 "+dd+"일"; String ymd = yyyy+"년 "+mm+"월 "+dd+"일";
writer.setValue("연월일", ymd); writer.setValue("연월일", ymd);
instNm = FactionUtil.getLastWord(instNm); instNm = OgdpUtil.getLastWord(instNm);
instNm = FactionUtil.getInstituteLeader(instNm, false); instNm = OgdpUtil.getInstituteLeader(instNm, false);
writer.setValue("발신", instNm); writer.setValue("발신", instNm);
List<DataObject> list = IntStream.rangeClosed(1, this.data.size()).boxed().map(i -> { List<DataObject> list = IntStream.rangeClosed(1, this.data.size()).boxed().map(i -> {

@ -6,7 +6,7 @@ import java.util.Map;
import cokr.xit.applib.Print; import cokr.xit.applib.Print;
import cokr.xit.fims.cmmn.FimsPrintOption; 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.DataFormat;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -223,8 +223,8 @@ public class Advntce extends PDFPrintFormat {
case "offcsText" -> { case "offcsText" -> {
String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm"); String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm");
instNm = FactionUtil.getLastWord(instNm); instNm = OgdpUtil.getLastWord(instNm);
instNm = FactionUtil.getInstituteLeader(instNm, true); instNm = OgdpUtil.getInstituteLeader(instNm, true);
result = instNm; result = instNm;
} }
case "offcs" -> { case "offcs" -> {

@ -7,7 +7,7 @@ import java.util.Map;
import cokr.xit.applib.Print; import cokr.xit.applib.Print;
import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.cmmn.FimsPrintOption; 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.DataFormat;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -298,8 +298,8 @@ public class Nht extends PDFPrintFormat {
case "offcsText" -> { case "offcsText" -> {
String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm"); String instNm = (String) print.getPrintRequestUserInfo().getInfo().get("instNm");
instNm = FactionUtil.getLastWord(instNm); instNm = OgdpUtil.getLastWord(instNm);
instNm = FactionUtil.getInstituteLeader(instNm, true); instNm = OgdpUtil.getInstituteLeader(instNm, true);
result = instNm; result = instNm;
} }
case "offcs" -> { case "offcs" -> {

@ -16,7 +16,7 @@ import cokr.xit.base.security.Authority;
import cokr.xit.base.security.SecuredUserInfo; import cokr.xit.base.security.SecuredUserInfo;
import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnQuery;
import cokr.xit.fims.cmmn.dao.StngMapper; 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.fims.mngt.service.bean.TaskBean;
import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.UserInfo;
import cokr.xit.foundation.component.AbstractBean; import cokr.xit.foundation.component.AbstractBean;
@ -27,8 +27,8 @@ public class StngBean extends AbstractBean {
@Resource(name = "codeBean") @Resource(name = "codeBean")
private CodeBean codeBean; private CodeBean codeBean;
@Resource(name = "factionBean") @Resource(name = "ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
@Resource(name = "stngMapper") @Resource(name = "stngMapper")
private StngMapper stngMapper; private StngMapper stngMapper;
@ -49,14 +49,14 @@ public class StngBean extends AbstractBean {
if(userInfo.getInstitute().equals("default")) { if(userInfo.getInstitute().equals("default")) {
return new DataObject(); return new DataObject();
} }
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
return stngMapper.selectDeptStng((String)userInfo.getInfo().get("deptCd")); return stngMapper.selectDeptStng((String)userInfo.getInfo().get("deptCd"));
} else if(type.equals("sgg")){ } else if(type.equals("sgg")){
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
if(userInfo.getInstitute().equals("default")) { if(userInfo.getInstitute().equals("default")) {
return new DataObject(); return new DataObject();
} }
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
return stngMapper.selectSggStng((String)userInfo.getInfo().get("sggCd")); return stngMapper.selectSggStng((String)userInfo.getInfo().get("sggCd"));
} else { } else {
return null; return null;
@ -71,7 +71,7 @@ public class StngBean extends AbstractBean {
public boolean updateDtbnActno(String dtbnBankNm, String dtbnActno) { public boolean updateDtbnActno(String dtbnBankNm, String dtbnActno) {
Map<String, String> params = new HashMap<String, String>(); Map<String, String> params = new HashMap<String, String>();
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
params.put("mdfr", userInfo.getId()); params.put("mdfr", userInfo.getId());
params.put("deptCd", (String)userInfo.getInfo().get("deptCd")); params.put("deptCd", (String)userInfo.getInfo().get("deptCd"));
params.put("dtbnBankNm", dtbnBankNm); params.put("dtbnBankNm", dtbnBankNm);
@ -99,7 +99,7 @@ public class StngBean extends AbstractBean {
} else if(isAdmin) { //관리자 } else if(isAdmin) { //관리자
Map<String, Object> info = userInfo.getInfo(); Map<String, Object> info = userInfo.getInfo();
if(info == null || info.get("sggCd") == null || info.get("sggCd").equals("")) { 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")) 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(); SecuredUserInfo userInfo = currentUser();
Map<String, Object> info = userInfo.getInfo(); Map<String, Object> info = userInfo.getInfo();
if(info == null || info.get("sggCd") == null || info.get("sggCd").equals("")) { if(info == null || info.get("sggCd") == null || info.get("sggCd").equals("")) {
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
} }
List<String> taskSeCdListForSgg = taskBean.getTasks((new CmmnQuery()).setSggCd((String)userInfo.getInfo().get("sggCd")).setUseYn("Y")) List<String> taskSeCdListForSgg = taskBean.getTasks((new CmmnQuery()).setSggCd((String)userInfo.getInfo().get("sggCd")).setUseYn("Y"))

@ -9,7 +9,7 @@ import org.springframework.web.servlet.ModelAndView;
import cokr.xit.fims.cmmn.dao.ExtrStngMapper; import cokr.xit.fims.cmmn.dao.ExtrStngMapper;
import cokr.xit.fims.cmmn.service.LinkService; import cokr.xit.fims.cmmn.service.LinkService;
import cokr.xit.fims.cmmn.service.bean.LinkBean; 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.UserInfo;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
import cokr.xit.foundation.web.AbstractController; import cokr.xit.foundation.web.AbstractController;
@ -24,8 +24,8 @@ public class LinkController extends AbstractController {
@Resource(name = "linkService") @Resource(name = "linkService")
private LinkService linkService; private LinkService linkService;
@Resource(name = "factionBean") @Resource(name = "ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
@Resource(name = "extrStngMapper") @Resource(name = "extrStngMapper")
private ExtrStngMapper extrStngMapper; private ExtrStngMapper extrStngMapper;
@ -36,7 +36,7 @@ public class LinkController extends AbstractController {
boolean saved = false; boolean saved = false;
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
String sggCd = (String) userInfo.getInfo().get("sggCd"); String sggCd = (String) userInfo.getInfo().get("sggCd");
System.out.println("파라미터 : "+ param); System.out.println("파라미터 : "+ param);

@ -42,7 +42,7 @@ import cokr.xit.fims.crdn.service.CrdnService;
import cokr.xit.fims.crdn.service.CrdnStngService; import cokr.xit.fims.crdn.service.CrdnStngService;
import cokr.xit.fims.crdn.service.ImportService; import cokr.xit.fims.crdn.service.ImportService;
import cokr.xit.fims.crdn.service.bean.CrdnStngBean; 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.fims.task.Task;
import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.UserInfo;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -95,8 +95,8 @@ public class Crdn05Controller extends ApplicationController {
@Resource(name="crdnStngMapper") @Resource(name="crdnStngMapper")
private CrdnStngMapper crdnStngMapper; private CrdnStngMapper crdnStngMapper;
@Resource(name="factionBean") @Resource(name="ogdpBean")
protected FactionBean factionBean; protected OgdpBean ogdpBean;
@Resource(name = "stngBean") @Resource(name = "stngBean")
private StngBean stngBean; private StngBean stngBean;
@ -481,7 +481,7 @@ public class Crdn05Controller extends ApplicationController {
boolean saved = false; boolean saved = false;
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
crdn.setSggCd((String)userInfo.getInfo().get("sggCd")); crdn.setSggCd((String)userInfo.getInfo().get("sggCd"));
crdn.setCrdnRegSeCd("01"); crdn.setCrdnRegSeCd("01");

@ -37,7 +37,7 @@ import cokr.xit.fims.crdn.service.CrdnService;
import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.cvlc.CrdnCvlcpt;
import cokr.xit.fims.cvlc.service.CrdnCvlcptService; import cokr.xit.fims.cvlc.service.CrdnCvlcptService;
import cokr.xit.fims.cvlc.service.bean.CrdnCvlcptMainBean; 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.fims.task.Task;
import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.UserInfo;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -82,8 +82,8 @@ public class Cvlc01Controller extends ApplicationController {
@Resource(name = "fileBean") @Resource(name = "fileBean")
private FileBean fileBean; private FileBean fileBean;
@Resource(name = "factionBean") @Resource(name = "ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
@Resource(name = "crdnCvlcptMainBean") @Resource(name = "crdnCvlcptMainBean")
private CrdnCvlcptMainBean crdnCvlcptMainBean; private CrdnCvlcptMainBean crdnCvlcptMainBean;
@ -221,7 +221,7 @@ public class Cvlc01Controller extends ApplicationController {
FimsPrintOption printOption = new FimsPrintOption(); FimsPrintOption printOption = new FimsPrintOption();
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);

@ -10,7 +10,7 @@ import cokr.xit.base.file.FileInfo;
import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.fims.excl.LevyExclQuery;
import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.excl.OpnnSbmsn;
import cokr.xit.fims.excl.service.OpnnSbmsnService; 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.component.AbstractServiceBean;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -32,8 +32,8 @@ public class OpnnSbmsnServiceBean extends AbstractServiceBean implements OpnnSbm
protected OpnnSbmsnBean opnnSbmsnBean; protected OpnnSbmsnBean opnnSbmsnBean;
/* Bean */ /* Bean */
@Resource(name="factionBean") @Resource(name="ogdpBean")
protected FactionBean factionBean; protected OgdpBean ogdpBean;
@Override @Override
public List<DataObject> getOpnnSbmsnList(LevyExclQuery req) { public List<DataObject> getOpnnSbmsnList(LevyExclQuery req) {

@ -35,7 +35,7 @@ import cokr.xit.fims.excl.OpnnDlbrMbr;
import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.excl.OpnnSbmsn;
import cokr.xit.fims.excl.service.OpnnDlbrMbrService; import cokr.xit.fims.excl.service.OpnnDlbrMbrService;
import cokr.xit.fims.excl.service.OpnnSbmsnService; 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.fims.task.Task;
import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.UserInfo;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -89,8 +89,8 @@ public class Excl02Controller extends ApplicationController {
@Resource(name="stngBean") @Resource(name="stngBean")
private StngBean stngBean; private StngBean stngBean;
@Resource(name="factionBean") @Resource(name="ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
/** (fims/excl/excl02/010-main) . /** (fims/excl/excl02/010-main) .
* *
@ -374,7 +374,7 @@ public class Excl02Controller extends ApplicationController {
@RequestMapping(name="의견제출 심의의결서 출력", value=METHOD_URL.makeDlbrDecsnFileFromHwpFormat) @RequestMapping(name="의견제출 심의의결서 출력", value=METHOD_URL.makeDlbrDecsnFileFromHwpFormat)
public ModelAndView makeDlbrDecsnFileFromHwpFormat(LevyExclQuery req) { public ModelAndView makeDlbrDecsnFileFromHwpFormat(LevyExclQuery req) {
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);

@ -1,9 +1,9 @@
package cokr.xit.fims.mngt; package cokr.xit.fims.mngt;
public class FactionUtil { public class OgdpUtil {
public static String getLastWord(String faction) { public static String getLastWord(String ogdp) {
String splitString[] = faction.split(" ", -1); String splitString[] = ogdp.split(" ", -1);
return splitString[splitString.length-1]; return splitString[splitString.length-1];
} }

@ -21,27 +21,27 @@ import cokr.xit.foundation.data.DataObject;
* ================================ * ================================
* </pre> * </pre>
*/ */
@Mapper("factionMapper") @Mapper("ogdpMapper")
public interface FactionMapper extends AbstractMapper { public interface OgdpMapper extends AbstractMapper {
/** , .<br /> /** , .<br />
* @param * @param
* @return , * @return ,
*/ */
List<DataObject> selectAllFactionList(); List<DataObject> selectAllOgdpList();
/** , .<br /> /** , .<br />
* @param stringMap * @param stringMap
* @param * @param
* @return , * @return ,
*/ */
List<DataObject> selectAbleFactionList(Map<String, Object> params); List<DataObject> selectAbleOgdpList(Map<String, Object> params);
/** ,,,,, .<br /> /** ,,,,, .<br />
* @param ID * @param ID
* @return ,,,,, * @return ,,,,,
*/ */
DataObject selectFactionInfoOfUser(String userId); DataObject selectOgdpInfoOfUser(String userId);
/** .<br /> /** .<br />
* @param * @param

@ -7,7 +7,7 @@ import cokr.xit.fims.mngt.FimsDepartment;
import cokr.xit.fims.mngt.FimsSigungu; import cokr.xit.fims.mngt.FimsSigungu;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
public interface FactionService { public interface OgdpService {
String updateSgg(FimsSigungu sgg); String updateSgg(FimsSigungu sgg);

@ -11,16 +11,16 @@ import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnQuery;
import cokr.xit.fims.mngt.FimsDepartment; import cokr.xit.fims.mngt.FimsDepartment;
import cokr.xit.fims.mngt.FimsSigungu; 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.UserInfo;
import cokr.xit.foundation.component.AbstractBean; import cokr.xit.foundation.component.AbstractBean;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@Component("factionBean") @Component("ogdpBean")
public class FactionBean extends AbstractBean { public class OgdpBean extends AbstractBean {
@Resource(name = "factionMapper") @Resource(name = "ogdpMapper")
private FactionMapper factionMapper; private OgdpMapper ogdpMapper;
@Resource(name = "userMapper") @Resource(name = "userMapper")
private UserMapper userMapper; private UserMapper userMapper;
@ -31,10 +31,10 @@ public class FactionBean extends AbstractBean {
*/ */
public void initUserInfo(UserInfo userInfo) { public void initUserInfo(UserInfo userInfo) {
DataObject factionInfo = factionMapper.selectFactionInfoOfUser(userInfo.getId()); DataObject ogdpInfo = ogdpMapper.selectOgdpInfoOfUser(userInfo.getId());
Map<String, Object> infoMap = userInfo.getInfo(); Map<String, Object> infoMap = userInfo.getInfo();
if(factionInfo == null) { if(ogdpInfo == null) {
infoMap.put("sggCd", ""); infoMap.put("sggCd", "");
infoMap.put("sggNm", ""); infoMap.put("sggNm", "");
infoMap.put("instCd", ""); infoMap.put("instCd", "");
@ -42,12 +42,12 @@ public class FactionBean extends AbstractBean {
infoMap.put("deptCd", ""); infoMap.put("deptCd", "");
infoMap.put("deptNm", ""); infoMap.put("deptNm", "");
} else { } else {
infoMap.put("sggCd", factionInfo.string("SGG_CD")); infoMap.put("sggCd", ogdpInfo.string("SGG_CD"));
infoMap.put("sggNm", factionInfo.string("SGG_NM")); infoMap.put("sggNm", ogdpInfo.string("SGG_NM"));
infoMap.put("instCd", factionInfo.string("INST_CD")); infoMap.put("instCd", ogdpInfo.string("INST_CD"));
infoMap.put("instNm", factionInfo.string("INST_NM")); infoMap.put("instNm", ogdpInfo.string("INST_NM"));
infoMap.put("deptCd", factionInfo.string("DEPT_CD")); infoMap.put("deptCd", ogdpInfo.string("DEPT_CD"));
infoMap.put("deptNm", factionInfo.string("DEPT_NM")); infoMap.put("deptNm", ogdpInfo.string("DEPT_NM"));
} }
userInfo.setInfo(infoMap); userInfo.setInfo(infoMap);
@ -61,7 +61,7 @@ public class FactionBean extends AbstractBean {
* </ul> * </ul>
*/ */
public boolean updateSgg(FimsSigungu sgg) { public boolean updateSgg(FimsSigungu sgg) {
return factionMapper.updateSgg(sgg); return ogdpMapper.updateSgg(sgg);
} }
/** . /** .
@ -69,7 +69,7 @@ public class FactionBean extends AbstractBean {
* @return * @return
*/ */
public DataObject getSggInfo(CmmnQuery req) { public DataObject getSggInfo(CmmnQuery req) {
return factionMapper.selectSggInfo(req); return ogdpMapper.selectSggInfo(req);
} }
@ -79,7 +79,7 @@ public class FactionBean extends AbstractBean {
* @return * @return
*/ */
public List<DataObject> getDeptList(CmmnQuery req) { public List<DataObject> getDeptList(CmmnQuery req) {
return factionMapper.selectDeptList(req); return ogdpMapper.selectDeptList(req);
} }
/** . /** .
@ -87,7 +87,7 @@ public class FactionBean extends AbstractBean {
* @return * @return
*/ */
public List<DataObject> getDepts(CmmnQuery req) { public List<DataObject> getDepts(CmmnQuery req) {
return factionMapper.selectDepts(req); return ogdpMapper.selectDepts(req);
} }
/** . /** .
@ -95,7 +95,7 @@ public class FactionBean extends AbstractBean {
* @return * @return
*/ */
public DataObject getDeptInfo(CmmnQuery req) { public DataObject getDeptInfo(CmmnQuery req) {
return factionMapper.selectDeptInfo(req); return ogdpMapper.selectDeptInfo(req);
} }
/** . /** .
@ -106,7 +106,7 @@ public class FactionBean extends AbstractBean {
* </ul> * </ul>
*/ */
public boolean create(FimsDepartment dept) { public boolean create(FimsDepartment dept) {
return factionMapper.insert(dept); return ogdpMapper.insert(dept);
} }
/** . /** .
@ -117,7 +117,7 @@ public class FactionBean extends AbstractBean {
* </ul> * </ul>
*/ */
public boolean update(FimsDepartment dept) { public boolean update(FimsDepartment dept) {
return factionMapper.update(dept); return ogdpMapper.update(dept);
} }
/** . /** .
@ -128,6 +128,6 @@ public class FactionBean extends AbstractBean {
* </ul> * </ul>
*/ */
public boolean remove(String... deptCds) { public boolean remove(String... deptCds) {
return factionMapper.setStatus("N", deptCds) > 0 ? true : false; return ogdpMapper.setStatus("N", deptCds) > 0 ? true : false;
} }
} }

@ -9,55 +9,55 @@ import org.springframework.stereotype.Service;
import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnQuery;
import cokr.xit.fims.mngt.FimsDepartment; import cokr.xit.fims.mngt.FimsDepartment;
import cokr.xit.fims.mngt.FimsSigungu; 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.component.AbstractServiceBean;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@Service("factionService") @Service("ogdpService")
public class FactionServiceBean extends AbstractServiceBean implements FactionService { public class OgdpServiceBean extends AbstractServiceBean implements OgdpService {
@Resource(name = "factionBean") @Resource(name = "ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
@Override @Override
public String updateSgg(FimsSigungu sgg) { public String updateSgg(FimsSigungu sgg) {
return factionBean.updateSgg(sgg) ? "[S]" : "[F]"; return ogdpBean.updateSgg(sgg) ? "[S]" : "[F]";
} }
@Override @Override
public DataObject getSggInfo(CmmnQuery req) { public DataObject getSggInfo(CmmnQuery req) {
return factionBean.getSggInfo(req); return ogdpBean.getSggInfo(req);
} }
@Override @Override
public List<DataObject> getDeptList(CmmnQuery req) { public List<DataObject> getDeptList(CmmnQuery req) {
return factionBean.getDeptList(req); return ogdpBean.getDeptList(req);
} }
@Override @Override
public List<DataObject> getDepts(CmmnQuery req) { public List<DataObject> getDepts(CmmnQuery req) {
return factionBean.getDepts(req); return ogdpBean.getDepts(req);
} }
@Override @Override
public DataObject getDeptInfo(CmmnQuery req) { public DataObject getDeptInfo(CmmnQuery req) {
return factionBean.getDeptInfo(req); return ogdpBean.getDeptInfo(req);
} }
@Override @Override
public String create(FimsDepartment dept) { public String create(FimsDepartment dept) {
return factionBean.create(dept) ? "[S]" : "[F]"; return ogdpBean.create(dept) ? "[S]" : "[F]";
} }
@Override @Override
public String update(FimsDepartment dept) { public String update(FimsDepartment dept) {
return factionBean.update(dept) ? "[S]" : "[F]"; return ogdpBean.update(dept) ? "[S]" : "[F]";
} }
@Override @Override
public String remove(String... deptCds) { public String remove(String... deptCds) {
boolean result = factionBean.remove(deptCds); boolean result = ogdpBean.remove(deptCds);
if(result) { if(result) {
return "[S]"; return "[S]";
} else { } else {

@ -12,7 +12,7 @@ import cokr.xit.base.user.ManagedUser;
import cokr.xit.base.web.ApplicationController; import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.mngt.Ntc; import cokr.xit.fims.mngt.Ntc;
import cokr.xit.fims.mngt.NtcQuery; 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.fims.mngt.service.NtcService;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@ -40,8 +40,8 @@ public class Mngt01Controller extends ApplicationController {
@Resource(name="ntcService") @Resource(name="ntcService")
private NtcService ntcService; private NtcService ntcService;
@Resource(name = "factionMapper") @Resource(name = "ogdpMapper")
private FactionMapper factionMapper; private OgdpMapper ogdpMapper;
/** . /** .
* @return fims/mngt/mngt01010-main * @return fims/mngt/mngt01010-main
@ -96,7 +96,7 @@ public class Mngt01Controller extends ApplicationController {
} }
mav.addObject("ntcInfo", json ? info : toJson(info)); mav.addObject("ntcInfo", json ? info : toJson(info));
List<DataObject> allSggList = factionMapper.selectAllSggList(); List<DataObject> allSggList = ogdpMapper.selectAllSggList();
mav.addObject("sggList", allSggList); mav.addObject("sggList", allSggList);
return mav; return mav;

@ -19,9 +19,9 @@ import cokr.xit.fims.cmmn.service.StngService;
import cokr.xit.fims.mngt.FimsSigungu; import cokr.xit.fims.mngt.FimsSigungu;
import cokr.xit.fims.mngt.Task; import cokr.xit.fims.mngt.Task;
import cokr.xit.fims.mngt.VltnQuery; import cokr.xit.fims.mngt.VltnQuery;
import cokr.xit.fims.mngt.dao.FactionMapper; import cokr.xit.fims.mngt.dao.OgdpMapper;
import cokr.xit.fims.mngt.service.FactionService; import cokr.xit.fims.mngt.service.OgdpService;
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.mngt.service.bean.TaskBean;
import cokr.xit.fims.mngt.service.bean.VltnBean; import cokr.xit.fims.mngt.service.bean.VltnBean;
import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.UserInfo;
@ -50,15 +50,15 @@ public class Mngt03Controller extends ApplicationController {
} }
/** 소속 정보 서비스 */ /** 소속 정보 서비스 */
@Resource(name = "factionService") @Resource(name = "ogdpService")
private FactionService factionService; private OgdpService ogdpService;
/** 소속 정보 Bean */ /** 소속 정보 Bean */
@Resource(name = "factionBean") @Resource(name = "ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
@Resource(name = "factionMapper") @Resource(name = "ogdpMapper")
private FactionMapper factionMapper; private OgdpMapper ogdpMapper;
/** 설정 정보 서비스 */ /** 설정 정보 서비스 */
@Resource(name = "stngService") @Resource(name = "stngService")
@ -88,7 +88,7 @@ public class Mngt03Controller extends ApplicationController {
mav.setViewName("fims/mngt/select-sgg"); mav.setViewName("fims/mngt/select-sgg");
mav.addObject("pageName", "selectSgg"); mav.addObject("pageName", "selectSgg");
List<DataObject> sggList = factionMapper.selectAllSggList(); List<DataObject> sggList = ogdpMapper.selectAllSggList();
mav.addObject("sggList", sggList); mav.addObject("sggList", sggList);
} else { } else {
@ -100,7 +100,7 @@ public class Mngt03Controller extends ApplicationController {
} else { } else {
mav.setViewName("fims/mngt/mngt03010-main"); mav.setViewName("fims/mngt/mngt03010-main");
mav.addObject("pageName", "mngt03010"); mav.addObject("pageName", "mngt03010");
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
mav.addObject("sggCd", userInfo.getInfo().get("sggCd")); mav.addObject("sggCd", userInfo.getInfo().get("sggCd"));
} }
@ -114,7 +114,7 @@ public class Mngt03Controller extends ApplicationController {
@RequestMapping(name="시군구 조회", value=METHOD_URL.getSggInfo) @RequestMapping(name="시군구 조회", value=METHOD_URL.getSggInfo)
public ModelAndView getSggInfo(CmmnQuery req) { public ModelAndView getSggInfo(CmmnQuery req) {
ModelAndView mav = new ModelAndView("jsonView"); ModelAndView mav = new ModelAndView("jsonView");
DataObject sggInfo = factionService.getSggInfo(req); DataObject sggInfo = ogdpService.getSggInfo(req);
mav.addObject("sggInfo", sggInfo); mav.addObject("sggInfo", sggInfo);
return mav; return mav;
} }
@ -168,7 +168,7 @@ public class Mngt03Controller extends ApplicationController {
sgg.setOfficialSealFilename(newOffcs.get("fileName")); sgg.setOfficialSealFilename(newOffcs.get("fileName"));
} }
boolean saved = false; boolean saved = false;
String rtnMsg = factionService.updateSgg(sgg); String rtnMsg = ogdpService.updateSgg(sgg);
if(rtnMsg.contains("[S]")) { if(rtnMsg.contains("[S]")) {
saved = true; saved = true;
} }

@ -11,9 +11,9 @@ import org.springframework.web.servlet.ModelAndView;
import cokr.xit.base.web.ApplicationController; import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnQuery;
import cokr.xit.fims.mngt.FimsDepartment; import cokr.xit.fims.mngt.FimsDepartment;
import cokr.xit.fims.mngt.dao.FactionMapper; import cokr.xit.fims.mngt.dao.OgdpMapper;
import cokr.xit.fims.mngt.service.FactionService; import cokr.xit.fims.mngt.service.OgdpService;
import cokr.xit.fims.mngt.service.bean.FactionBean; import cokr.xit.fims.mngt.service.bean.OgdpBean;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
/** .<br /> /** .<br />
@ -38,15 +38,15 @@ public class Mngt04Controller extends ApplicationController {
} }
/** 소속 정보 서비스 */ /** 소속 정보 서비스 */
@Resource(name = "factionService") @Resource(name = "ogdpService")
private FactionService factionService; private OgdpService ogdpService;
/** 소속 정보 Bean */ /** 소속 정보 Bean */
@Resource(name = "factionBean") @Resource(name = "ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
@Resource(name = "factionMapper") @Resource(name = "ogdpMapper")
private FactionMapper factionMapper; private OgdpMapper ogdpMapper;
/** . /** .
* @return fims/mngt/mngt04010-main * @return fims/mngt/mngt04010-main
@ -58,7 +58,7 @@ public class Mngt04Controller extends ApplicationController {
mav.setViewName("fims/mngt/mngt04010-main"); mav.setViewName("fims/mngt/mngt04010-main");
mav.addObject("pageName", "mngt04010"); mav.addObject("pageName", "mngt04010");
List<DataObject> allSggList = factionMapper.selectAllSggList(); List<DataObject> allSggList = ogdpMapper.selectAllSggList();
mav.addObject("sggList", allSggList); mav.addObject("sggList", allSggList);
@ -66,7 +66,7 @@ public class Mngt04Controller extends ApplicationController {
} }
/** .<br /> /** .<br />
* {@link FactionService#getDeptList(CmmnQuery)} * {@link OgdpService#getDeptList(CmmnQuery)}
* @param query * @param query
* @return jsonView * @return jsonView
*/ */
@ -75,7 +75,7 @@ public class Mngt04Controller extends ApplicationController {
setFetchSize(query); 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(); DataObject deptInfo = new DataObject();
if(!ifEmpty(query.getDeptCd(), ()->"").equals("")) { if(!ifEmpty(query.getDeptCd(), ()->"").equals("")) {
deptInfo = factionService.getDeptInfo(query); deptInfo = ogdpService.getDeptInfo(query);
} else { } else {
deptInfo = null; deptInfo = null;
} }
@ -115,7 +115,7 @@ public class Mngt04Controller extends ApplicationController {
public ModelAndView removeDept(String... deptCds) { public ModelAndView removeDept(String... deptCds) {
ModelAndView mav = new ModelAndView("jsonView"); ModelAndView mav = new ModelAndView("jsonView");
boolean saved = false; boolean saved = false;
String rtnMsg = factionService.remove(deptCds); String rtnMsg = ogdpService.remove(deptCds);
if(rtnMsg.contains("[S]")) { if(rtnMsg.contains("[S]")) {
saved = true; saved = true;
} }
@ -135,7 +135,7 @@ public class Mngt04Controller extends ApplicationController {
public ModelAndView createDept(FimsDepartment dept) { public ModelAndView createDept(FimsDepartment dept) {
ModelAndView mav = new ModelAndView("jsonView"); ModelAndView mav = new ModelAndView("jsonView");
boolean saved = false; boolean saved = false;
String rtnMsg = factionService.create(dept); String rtnMsg = ogdpService.create(dept);
if(rtnMsg.contains("[S]")) { if(rtnMsg.contains("[S]")) {
saved = true; saved = true;
} }
@ -155,7 +155,7 @@ public class Mngt04Controller extends ApplicationController {
public ModelAndView updateDept(FimsDepartment dept) { public ModelAndView updateDept(FimsDepartment dept) {
ModelAndView mav = new ModelAndView("jsonView"); ModelAndView mav = new ModelAndView("jsonView");
boolean saved = false; boolean saved = false;
String rtnMsg = factionService.update(dept); String rtnMsg = ogdpService.update(dept);
if(rtnMsg.contains("[S]")) { if(rtnMsg.contains("[S]")) {
saved = true; saved = true;
} }

@ -42,7 +42,7 @@ import cokr.xit.fims.crdn.dao.CrdnInfoMapper;
import cokr.xit.fims.crdn.dao.CrdnStngMapper; import cokr.xit.fims.crdn.dao.CrdnStngMapper;
import cokr.xit.fims.crdn.dao.CrdnUpdtMapper; import cokr.xit.fims.crdn.dao.CrdnUpdtMapper;
import cokr.xit.fims.mngt.dao.TaskMapper; 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.A01;
import cokr.xit.fims.nxrp.A03Rqst; import cokr.xit.fims.nxrp.A03Rqst;
import cokr.xit.fims.nxrp.NisIndivQuery; import cokr.xit.fims.nxrp.NisIndivQuery;
@ -110,8 +110,8 @@ public class NisIndivBean extends AbstractBean {
protected StngBean stngBean; protected StngBean stngBean;
/** 부서 정보 DAO */ /** 부서 정보 DAO */
@Resource(name = "factionBean") @Resource(name = "ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
/** . /** .
* @param req * @param req
@ -144,7 +144,7 @@ public class NisIndivBean extends AbstractBean {
DataObject userInfo = userBean.getUserInfo(currentUser().getId()); DataObject userInfo = userBean.getUserInfo(currentUser().getId());
// 2. 부서 정보 // 2. 부서 정보
DataObject deptInfo = factionBean.getDeptInfo(new CmmnQuery().setDeptCd(userInfo.string("DEPT_CD"))); DataObject deptInfo = ogdpBean.getDeptInfo(new CmmnQuery().setDeptCd(userInfo.string("DEPT_CD")));
// 3. 세외수입 과태료대장에 연계할 단속 정보를 조회 // 3. 세외수입 과태료대장에 연계할 단속 정보를 조회
DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId()); DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId());
@ -346,7 +346,7 @@ public class NisIndivBean extends AbstractBean {
DataObject userInfo = userBean.getUserInfo(currentUser().getId()); DataObject userInfo = userBean.getUserInfo(currentUser().getId());
// 2. 부서 정보 // 2. 부서 정보
DataObject deptInfo = factionBean.getDeptInfo(new CmmnQuery().setDeptCd(userInfo.string("DEPT_CD"))); DataObject deptInfo = ogdpBean.getDeptInfo(new CmmnQuery().setDeptCd(userInfo.string("DEPT_CD")));
// 3. 세외수입 과태료대장에 연계할 단속 정보를 조회 // 3. 세외수입 과태료대장에 연계할 단속 정보를 조회
DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId()); DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId());

@ -6,7 +6,7 @@ import javax.annotation.Resource;
import org.springframework.stereotype.Service; 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.SndbQuery;
import cokr.xit.fims.sndb.Svbtc; import cokr.xit.fims.sndb.Svbtc;
import cokr.xit.fims.sndb.service.SvbtcService; import cokr.xit.fims.sndb.service.SvbtcService;
@ -31,8 +31,8 @@ public class SvbtcServiceBean extends AbstractServiceBean implements SvbtcServic
private SvbtcBean svbtcBean; private SvbtcBean svbtcBean;
/* Bean */ /* Bean */
@Resource(name="factionBean") @Resource(name="ogdpBean")
protected FactionBean factionBean; protected OgdpBean ogdpBean;
@Override @Override
public List<DataObject> getSvbtcList(SndbQuery req) { public List<DataObject> getSvbtcList(SndbQuery req) {

@ -24,10 +24,10 @@ import cokr.xit.base.file.service.bean.FileBean;
import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.ManagedUser;
import cokr.xit.base.web.ApplicationController; import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnQuery;
import cokr.xit.fims.cmmn.FimsPrintOption;
import cokr.xit.fims.cmmn.OtptStngQuery; import cokr.xit.fims.cmmn.OtptStngQuery;
import cokr.xit.fims.cmmn.OutsourcingFileMaker; import cokr.xit.fims.cmmn.OutsourcingFileMaker;
import cokr.xit.fims.cmmn.OutsourcingStngQuery; import cokr.xit.fims.cmmn.OutsourcingStngQuery;
import cokr.xit.fims.cmmn.FimsPrintOption;
import cokr.xit.fims.cmmn.dao.OtptStngMapper; import cokr.xit.fims.cmmn.dao.OtptStngMapper;
import cokr.xit.fims.cmmn.hwp.format.SvbtcList; import cokr.xit.fims.cmmn.hwp.format.SvbtcList;
import cokr.xit.fims.cmmn.pdf.print.format.Advntce; 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.FormatMaker;
import cokr.xit.fims.cmmn.xls.StyleMaker; import cokr.xit.fims.cmmn.xls.StyleMaker;
import cokr.xit.fims.crdn.Crdn; 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.mngt.service.bean.TaskBean;
import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.SndbQuery;
import cokr.xit.fims.sndb.Sndng; import cokr.xit.fims.sndb.Sndng;
@ -153,8 +153,8 @@ public class Sndb01Controller extends ApplicationController {
@Resource(name="fileBean") @Resource(name="fileBean")
private FileBean fileBean; private FileBean fileBean;
@Resource(name="factionBean") @Resource(name="ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
@Resource(name="svbtcBean") @Resource(name="svbtcBean")
private SvbtcBean svbtcBean; private SvbtcBean svbtcBean;
@ -1657,7 +1657,7 @@ public class Sndb01Controller extends ApplicationController {
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);
@ -1866,7 +1866,7 @@ public class Sndb01Controller extends ApplicationController {
Print print = new Print(); Print print = new Print();
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);
//출력물 기본 설정 //출력물 기본 설정

@ -10,7 +10,7 @@ import cokr.xit.base.file.service.bean.FileBean;
import cokr.xit.fims.cmmn.dao.OtptStngMapper; import cokr.xit.fims.cmmn.dao.OtptStngMapper;
import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.dao.CrdnListMapper; 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.SprtQuery;
import cokr.xit.fims.sprt.dao.IntegrationSearchMapper; import cokr.xit.fims.sprt.dao.IntegrationSearchMapper;
import cokr.xit.fims.sprt.service.IntegrationSearchService; import cokr.xit.fims.sprt.service.IntegrationSearchService;
@ -34,8 +34,8 @@ public class IntegrationSearchServiceBean extends AbstractServiceBean implements
@Resource(name="integrationSearchBean") @Resource(name="integrationSearchBean")
protected IntegrationSearchBean integrationSearchBean; protected IntegrationSearchBean integrationSearchBean;
@Resource(name="factionBean") @Resource(name="ogdpBean")
protected FactionBean factionBean; protected OgdpBean ogdpBean;
@Resource(name="crdnListMapper") @Resource(name="crdnListMapper")
protected CrdnListMapper crdnListMapper; protected CrdnListMapper crdnListMapper;

@ -48,7 +48,7 @@ import cokr.xit.fims.cmmn.xls.StyleMaker;
import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.Crdn;
import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.CrdnQuery;
import cokr.xit.fims.crdn.dao.CrdnListMapper; 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.mngt.service.bean.TaskBean;
import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.SndbQuery;
import cokr.xit.fims.sndb.Sndng; import cokr.xit.fims.sndb.Sndng;
@ -127,8 +127,8 @@ public class Sprt01Controller extends ApplicationController {
@Resource(name = "taskBean") @Resource(name = "taskBean")
private TaskBean taskBean; private TaskBean taskBean;
@Resource(name = "factionBean") @Resource(name = "ogdpBean")
private FactionBean factionBean; private OgdpBean ogdpBean;
@Resource(name = "mediaBean") @Resource(name = "mediaBean")
private MediaBean mediaBean; private MediaBean mediaBean;
@ -457,7 +457,7 @@ public class Sprt01Controller extends ApplicationController {
FimsPrintOption printOption = new FimsPrintOption(); FimsPrintOption printOption = new FimsPrintOption();
printOption.setPrivateInfoYn(privateInfoYn); printOption.setPrivateInfoYn(privateInfoYn);
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);
@ -483,7 +483,7 @@ public class Sprt01Controller extends ApplicationController {
FimsPrintOption printOption = new FimsPrintOption(); FimsPrintOption printOption = new FimsPrintOption();
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);
@ -558,7 +558,7 @@ public class Sprt01Controller extends ApplicationController {
printOption.setGlobalVariable(globalVariable); printOption.setGlobalVariable(globalVariable);
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);
@ -584,7 +584,7 @@ public class Sprt01Controller extends ApplicationController {
DataObject deptStngInfo = stngBean.getStng("dept"); DataObject deptStngInfo = stngBean.getStng("dept");
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);
@ -624,7 +624,7 @@ public class Sprt01Controller extends ApplicationController {
public ModelAndView makeRcvmtConfirmFileFromHwpFormat(String... crdnIds) { public ModelAndView makeRcvmtConfirmFileFromHwpFormat(String... crdnIds) {
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);
@ -662,7 +662,7 @@ public class Sprt01Controller extends ApplicationController {
@RequestMapping(name="사전통지서 pdf 파일 생성", value=METHOD_URL.makeAdvntcePdf) @RequestMapping(name="사전통지서 pdf 파일 생성", value=METHOD_URL.makeAdvntcePdf)
public ModelAndView makeAdvntcePdf(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) { public ModelAndView makeAdvntcePdf(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) {
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); sndng.setSggCd((String)userInfo.getInfo().get("sggCd"));
@ -782,7 +782,7 @@ public class Sprt01Controller extends ApplicationController {
@RequestMapping(name="사전통지서 외주 파일 생성", value=METHOD_URL.makeAdvntceOutsourcing) @RequestMapping(name="사전통지서 외주 파일 생성", value=METHOD_URL.makeAdvntceOutsourcing)
public ModelAndView makeAdvntceOutsourcing(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) { public ModelAndView makeAdvntceOutsourcing(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) {
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); 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) { public ModelAndView makeNhtPdf(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) {
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); sndng.setSggCd((String)userInfo.getInfo().get("sggCd"));
@ -1022,7 +1022,7 @@ public class Sprt01Controller extends ApplicationController {
@RequestMapping(name="고지서 외주 파일 생성", value=METHOD_URL.makeNhtOutsourcing) @RequestMapping(name="고지서 외주 파일 생성", value=METHOD_URL.makeNhtOutsourcing)
public ModelAndView makeNhtOutsourcing(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) { public ModelAndView makeNhtOutsourcing(String[] crdnIds, Sndng sndng, FimsPrintOption printOption) {
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
factionBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); sndng.setSggCd((String)userInfo.getInfo().get("sggCd"));

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cokr.xit.fims.mngt.dao.FactionMapper"> <mapper namespace="cokr.xit.fims.mngt.dao.OgdpMapper">
<select id="selectAllFactionList" resultType="dataobject"> <select id="selectAllOgdpList" resultType="dataobject">
/* 전체 기관,부서 목록 조회(factionMapper.selectAllFactionList) */ /* 전체 기관,부서 목록 조회(ogdpMapper.selectAllOgdpList) */
SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS FACTION_CD SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS OGDP_CD
, CONCAT(A.INST_NM,' / ',B.DEPT_NM) AS FACTION_NM , CONCAT(A.INST_NM,' / ',B.DEPT_NM) AS OGDP_NM
, A.INST_CD , A.INST_CD
, A.INST_NM , A.INST_NM
, B.DEPT_CD , B.DEPT_CD
@ -15,8 +15,8 @@ SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS FACTION_CD
FROM TB_SGG A FROM TB_SGG A
LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD) LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD)
UNION UNION
SELECT ('default/default') AS FACTION_CD SELECT ('default/default') AS OGDP_CD
, CONCAT('기본 기관',' / ','기본 부서') AS FACTION_NM , CONCAT('기본 기관',' / ','기본 부서') AS OGDP_NM
, 'default' AS INST_CD , 'default' AS INST_CD
, '기본 기관' AS INST_NM , '기본 기관' AS INST_NM
, 'default' AS DEPT_CD , 'default' AS DEPT_CD
@ -26,10 +26,10 @@ SELECT ('default/default') AS FACTION_CD
FROM DUAL FROM DUAL
</select> </select>
<select id="selectAbleFactionList" parameterType="map" resultType="dataobject"> <select id="selectAbleOgdpList" parameterType="map" resultType="dataobject">
/* 사용가능한 기관,부서 목록 조회(factionMapper.selectAbleFactionList) */ /* 사용가능한 기관,부서 목록 조회(ogdpMapper.selectAbleOgdpList) */
SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS FACTION_CD SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS OGDP_CD
, CONCAT(A.INST_NM,' / ',B.DEPT_NM) AS FACTION_NM , CONCAT(A.INST_NM,' / ',B.DEPT_NM) AS OGDP_NM
, A.INST_CD , A.INST_CD
, A.INST_NM , A.INST_NM
, B.DEPT_CD , B.DEPT_CD
@ -48,8 +48,8 @@ LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD)
</if> </if>
<if test="currentUser.institute == 'default'"> <if test="currentUser.institute == 'default'">
UNION UNION
SELECT 'default/default' AS FACTION_CD SELECT 'default/default' AS OGDP_CD
, CONCAT('기본 기관',' / ','기본 부서') AS FACTION_NM , CONCAT('기본 기관',' / ','기본 부서') AS OGDP_NM
, 'default' AS INST_CD , 'default' AS INST_CD
, '기본 기관' AS INST_NM , '기본 기관' AS INST_NM
, 'default' AS DEPT_CD , 'default' AS DEPT_CD
@ -63,8 +63,8 @@ LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD)
</select> </select>
<select id="selectFactionInfoOfUser" parameterType="string" resultType="dataobject"> <select id="selectOgdpInfoOfUser" parameterType="string" resultType="dataobject">
/* 사용자의 시군구,기관,부서 조회(factionMapper.selectFactionInfoOfUser) */ /* 사용자의 시군구,기관,부서 조회(ogdpMapper.selectOgdpInfoOfUser) */
SELECT S.SGG_CD SELECT S.SGG_CD
, S.SGG_NM , S.SGG_NM
, U.NSTT_CD AS INST_CD , U.NSTT_CD AS INST_CD
@ -78,7 +78,7 @@ SELECT S.SGG_CD
</select> </select>
<select id="selectAllSggList" parameterType="string" resultType="dataobject"> <select id="selectAllSggList" parameterType="string" resultType="dataobject">
/* 모든 시군구 조회(factionMapper.selectAllSggList) */ /* 모든 시군구 조회(ogdpMapper.selectAllSggList) */
SELECT SGG_CD SELECT SGG_CD
, SGG_NM , SGG_NM
FROM TB_SGG FROM TB_SGG
@ -86,7 +86,7 @@ SELECT SGG_CD
</select> </select>
<select id="selectAllInstList" parameterType="string" resultType="dataobject"> <select id="selectAllInstList" parameterType="string" resultType="dataobject">
/* 모든 기관 조회(factionMapper.selectAllInstList) */ /* 모든 기관 조회(ogdpMapper.selectAllInstList) */
SELECT INST_CD SELECT INST_CD
, INST_NM , INST_NM
FROM TB_SGG FROM TB_SGG
@ -118,7 +118,7 @@ SELECT S.SGG_CD <!-- 시군구 코드 -->
</sql> </sql>
<select id="selectSggs" parameterType="map" resultType="dataobject"> <select id="selectSggs" parameterType="map" resultType="dataobject">
/* 시군구 객체 가져오기(factionMapper.selectSggs) */ /* 시군구 객체 가져오기(ogdpMapper.selectSggs) */
<include refid="selectSgg" /> <include refid="selectSgg" />
<where> <where>
<if test="sggCd != null"> <if test="sggCd != null">
@ -132,14 +132,14 @@ SELECT S.SGG_CD <!-- 시군구 코드 -->
</select> </select>
<select id="selectSggCdByDeptCd" parameterType="string" resultType="string"> <select id="selectSggCdByDeptCd" parameterType="string" resultType="string">
/* 부서에 따른 시군구코드 조회(factionMapper.selectSggCdByDeptCd) */ /* 부서에 따른 시군구코드 조회(ogdpMapper.selectSggCdByDeptCd) */
SELECT SGG_CD SELECT SGG_CD
FROM TB_DEPT FROM TB_DEPT
WHERE DEPT_CD = #{deptCd} WHERE DEPT_CD = #{deptCd}
</select> </select>
<update id="updateSgg" parameterType="map"> <update id="updateSgg" parameterType="map">
/* 시군구 설정정보 수정 (factionMapper.updateSgg) */ /* 시군구 설정정보 수정 (ogdpMapper.updateSgg) */
UPDATE TB_SGG UPDATE TB_SGG
SET MDFCN_DT = <include refid="utility.now" /> SET MDFCN_DT = <include refid="utility.now" />
, MDFR = #{sgg.modifiedBy} , MDFR = #{sgg.modifiedBy}
@ -239,7 +239,7 @@ UPDATE TB_SGG
</sql> </sql>
<select id="selectDeptList" parameterType="map" resultType="dataobject"> <select id="selectDeptList" parameterType="map" resultType="dataobject">
/* 부서 목록 조회(factionMapper.selectDeptList) */ /* 부서 목록 조회(ogdpMapper.selectDeptList) */
<include refid="utility.paging-prefix" /> <include refid="utility.paging-prefix" />
<include refid="selectDept" /> <include refid="selectDept" />
WHERE D.SGG_CD = #{sggCd} <!-- 시군구 코드 --> WHERE D.SGG_CD = #{sggCd} <!-- 시군구 코드 -->
@ -257,7 +257,7 @@ UPDATE TB_SGG
</select> </select>
<select id="selectDepts" parameterType="map" resultType="dataobject"> <select id="selectDepts" parameterType="map" resultType="dataobject">
/* 부서 객체 가져오기(factionMapper.selectDepts) */ /* 부서 객체 가져오기(ogdpMapper.selectDepts) */
<include refid="selectDept" /> <include refid="selectDept" />
<where> <where>
<if test="sggCd != null"> <if test="sggCd != null">
@ -277,7 +277,7 @@ UPDATE TB_SGG
</select> </select>
<insert id="insertDept" parameterType="map"> <insert id="insertDept" parameterType="map">
/* 부서 등록(factionMapper.insertDept) */ /* 부서 등록(ogdpMapper.insertDept) */
INSERT INSERT
INTO TB_DEPT ( INTO TB_DEPT (
DEPT_CD <!-- 부서 코드 --> DEPT_CD <!-- 부서 코드 -->
@ -349,7 +349,7 @@ UPDATE TB_SGG
</insert> </insert>
<update id="updateDept" parameterType="map"> <update id="updateDept" parameterType="map">
/* 부서 수정(factionMapper.updateDept) */ /* 부서 수정(ogdpMapper.updateDept) */
UPDATE TB_DEPT UPDATE TB_DEPT
SET SGG_CD = #{dept.sggID} <!-- 시군구 코드 --> SET SGG_CD = #{dept.sggID} <!-- 시군구 코드 -->
, INST_CD = #{dept.instCode} <!-- 기관 코드 --> , INST_CD = #{dept.instCode} <!-- 기관 코드 -->
@ -384,7 +384,7 @@ UPDATE TB_SGG
</update> </update>
<update id="setStatus" parameterType="map"> <update id="setStatus" parameterType="map">
/* 부서 사용 여부 변경(factionMapper.setStatus) */ /* 부서 사용 여부 변경(ogdpMapper.setStatus) */
UPDATE TB_DEPT UPDATE TB_DEPT
SET USE_YN = #{useYn} <!-- 사용 여부 --> SET USE_YN = #{useYn} <!-- 사용 여부 -->
, MDFCN_DT = <include refid="utility.now" /> <!-- 수정 일시 --> , MDFCN_DT = <include refid="utility.now" /> <!-- 수정 일시 -->

@ -15,10 +15,10 @@
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
>선택</button> >선택</button>
<ul class="dropdown-menu oy-auto mh-px-300"> <ul class="dropdown-menu oy-auto mh-px-300">
<c:forEach items="${ableFactionList}" var="item"> <c:forEach items="${ableOgdpList}" var="item">
<li> <li>
<a class="dropdown-item" <a class="dropdown-item"
onclick="setFactionCodeValues('${item.INST_CD}','${item.DEPT_CD}','${item.SGG_CD}')">${item.FACTION_NM}</a> onclick="setOgdpCodeValues('${item.INST_CD}','${item.DEPT_CD}','${item.SGG_CD}')">${item.OGDP_NM}</a>
</li> </li>
</c:forEach> </c:forEach>
</ul> </ul>
@ -28,7 +28,7 @@
<select name="institute" class="form-select no-bgi" data-map="NSTT_CD" <select name="institute" class="form-select no-bgi" data-map="NSTT_CD"
required title="기관/부서" disabled> required title="기관/부서" disabled>
<option value=""></option> <option value=""></option>
<c:forEach items="${allFactionList}" var="item"> <c:forEach items="${allOgdpList}" var="item">
<option value="${item.INST_CD}">${item.INST_NM}</option> <option value="${item.INST_CD}">${item.INST_NM}</option>
</c:forEach> </c:forEach>
</select> </select>
@ -36,7 +36,7 @@
<select name="deptCode" class="form-select no-bgi" data-map="DEPT_CD" <select name="deptCode" class="form-select no-bgi" data-map="DEPT_CD"
required title="기관/부서" disabled> required title="기관/부서" disabled>
<option value=""></option> <option value=""></option>
<c:forEach items="${allFactionList}" var="item"> <c:forEach items="${allOgdpList}" var="item">
<option value="${item.DEPT_CD}">${item.DEPT_NM}</option> <option value="${item.DEPT_CD}">${item.DEPT_NM}</option>
</c:forEach> </c:forEach>
</select> </select>
@ -171,9 +171,9 @@
</div> </div>
</form> </form>
<datalist id="allFactionList"> <datalist id="allOgdpList">
<c:forEach items="${allFactionList}" var="item"> <c:forEach items="${allOgdpList}" var="item">
<option value="${item.FACTION_CD}">${item.FACTION_NM}</option> <option value="${item.OGDP_CD}">${item.OGDP_NM}</option>
</c:forEach> </c:forEach>
</datalist> </datalist>
@ -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='institute']").val(institute).trigger("change");
$("#infoPrefix-form [name='deptCode']").val(deptCode).trigger("change"); $("#infoPrefix-form [name='deptCode']").val(deptCode).trigger("change");

@ -42,10 +42,10 @@
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
>선택</button> >선택</button>
<ul class="dropdown-menu oy-auto mh-px-300"> <ul class="dropdown-menu oy-auto mh-px-300">
<c:forEach items="${ableFactionList}" var="item"> <c:forEach items="${ableOgdpList}" var="item">
<li> <li>
<a class="dropdown-item" <a class="dropdown-item"
onclick="setFactionCodeValues('${item.INST_CD}','${item.DEPT_CD}','${item.SGG_CD}')">${item.FACTION_NM}</a> onclick="setOgdpCodeValues('${item.INST_CD}','${item.DEPT_CD}','${item.SGG_CD}')">${item.OGDP_NM}</a>
</li> </li>
</c:forEach> </c:forEach>
</ul> </ul>
@ -55,7 +55,7 @@
<select name="institute" class="form-select no-bgi" data-map="NSTT_CD" <select name="institute" class="form-select no-bgi" data-map="NSTT_CD"
required title="기관/부서" disabled> required title="기관/부서" disabled>
<option value=""></option> <option value=""></option>
<c:forEach items="${allFactionList}" var="item"> <c:forEach items="${allOgdpList}" var="item">
<option value="${item.INST_CD}">${item.INST_NM}</option> <option value="${item.INST_CD}">${item.INST_NM}</option>
</c:forEach> </c:forEach>
</select> </select>
@ -63,7 +63,7 @@
<select name="deptCode" class="form-select no-bgi" data-map="DEPT_CD" <select name="deptCode" class="form-select no-bgi" data-map="DEPT_CD"
required title="기관/부서" disabled> required title="기관/부서" disabled>
<option value=""></option> <option value=""></option>
<c:forEach items="${allFactionList}" var="item"> <c:forEach items="${allOgdpList}" var="item">
<option value="${item.DEPT_CD}">${item.DEPT_NM}</option> <option value="${item.DEPT_CD}">${item.DEPT_NM}</option>
</c:forEach> </c:forEach>
</select> </select>
@ -203,9 +203,9 @@
</div> </div>
</div> </div>
</form> </form>
<datalist id="allFactionList"> <datalist id="allOgdpList">
<c:forEach items="${allFactionList}" var="item"> <c:forEach items="${allOgdpList}" var="item">
<option value="${item.FACTION_CD}">${item.FACTION_NM}</option> <option value="${item.OGDP_CD}">${item.OGDP_NM}</option>
</c:forEach> </c:forEach>
</datalist> </datalist>
@ -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='institute']").val(institute).trigger("change");
$("#user-form [name='deptCode']").val(deptCode).trigger("change"); $("#user-form [name='deptCode']").val(deptCode).trigger("change");

Loading…
Cancel
Save