소스정리

main
이범준 5 months ago
parent 6bea84b159
commit a5b89589c4

@ -20,8 +20,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version> <java.version>17</java.version>
<sggCd>41480</sggCd> <sggCd>50000</sggCd>
<instCd>4060000</instCd> <instCd>6500000</instCd>
<profile>test</profile> <profile>test</profile>
</properties> </properties>

@ -12,8 +12,8 @@ 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.base.service.bean.OgdpBean;
import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnQuery;
import cokr.xit.fims.mngt.service.bean.FimsOgdpBean;
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 = "fimsOgdpBean") @Resource(name = "ogdpBean")
private FimsOgdpBean fimsOgdpBean; 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 {
fimsOgdpBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
String sggCd = (String)userInfo.getInfo().get("sggCd"); String sggCd = (String)userInfo.getInfo().get("sggCd");

@ -0,0 +1,71 @@
package cokr.xit.fims.base;
import cokr.xit.foundation.component.QueryRequest;
public class OgdpQuery extends QueryRequest {
private static final long serialVersionUID = 1L;
private String sggCd; // 시군구 코드
private String deptCd; // 부서 코드
private String instCd; // 기관 코드
private String useYn; // 사용 여부
private String delYn; // 삭제 여부
private String selectAdd;
public String getSggCd() {
return ifEmpty(sggCd, () -> null);
}
public <T extends OgdpQuery> T setSggCd(String sggCd) {
this.sggCd = sggCd;
return self();
}
public String getDeptCd() {
return ifEmpty(deptCd, () -> null);
}
public <T extends OgdpQuery> T setDeptCd(String deptCd) {
this.deptCd = deptCd;
return self();
}
public String getInstCd() {
return ifEmpty(instCd, () -> null);
}
public <T extends OgdpQuery> T setInstCd(String instCd) {
this.instCd = instCd;
return self();
}
public String getUseYn() {
return ifEmpty(useYn, () -> null);
}
public <T extends OgdpQuery> T setUseYn(String useYn) {
this.useYn = useYn;
return self();
}
public String getDelYn() {
return ifEmpty(delYn, () -> null);
}
public <T extends OgdpQuery> T setDelYn(String delYn) {
this.delYn = delYn;
return self();
}
public String getSelectAdd() {
return ifEmpty(selectAdd, () -> null);
}
public <T extends OgdpQuery> T setSelectAdd(String selectAdd) {
this.selectAdd = selectAdd;
return self();
}
}

@ -0,0 +1,31 @@
package cokr.xit.fims.base;
import cokr.xit.base.user.Sigungu;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class OgdpSigungu extends Sigungu {
/**
*
*/
private String symbolFilepath;
/**
*
*/
private String symbolFilename;
/**
*
*/
private String logoFilepath;
/**
*
*/
private String logoFilename;
}

@ -13,8 +13,8 @@ import cokr.xit.base.code.service.bean.CodeBean;
import cokr.xit.base.security.SecuredUserInfo; 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.base.service.bean.OgdpBean;
import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.mngt.service.bean.FimsOgdpBean;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@Controller @Controller
@ -26,8 +26,8 @@ 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="fimsOgdpBean") @Resource(name="ogdpBean")
private FimsOgdpBean fimsOgdpBean; private OgdpBean ogdpBean;
@Resource(name = "stngBean") @Resource(name = "stngBean")
private StngBean stngBean; private StngBean stngBean;
@ -55,10 +55,10 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
} }
mav.addObject("allOgdpList", fimsOgdpBean.selectAllOgdpList()); mav.addObject("allOgdpList", ogdpBean.selectAllOgdpList());
DataObject params = new DataObject().set("currentUser", currentUser()); DataObject params = new DataObject().set("currentUser", currentUser());
List<DataObject> ableOgdpList = fimsOgdpBean.selectAbleOgdpList(params); List<DataObject> ableOgdpList = ogdpBean.selectAbleOgdpList(params);
mav.addObject("ableOgdpList", ableOgdpList); mav.addObject("ableOgdpList", ableOgdpList);
return mav; return mav;
@ -71,7 +71,7 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
SecuredUserInfo userInfo = currentUser(); SecuredUserInfo userInfo = currentUser();
//시군구,기관,부서 //시군구,기관,부서
fimsOgdpBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
//관리자여부,업무권한여부 //관리자여부,업무권한여부
boolean isAdmin = userInfo.hasAuthorities("ROLE_ADMIN"); boolean isAdmin = userInfo.hasAuthorities("ROLE_ADMIN");
@ -118,9 +118,9 @@ 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("allOgdpList", fimsOgdpBean.selectAllOgdpList()); mav.addObject("allOgdpList", ogdpBean.selectAllOgdpList());
DataObject params = new DataObject().set("currentUser", currentUser()); DataObject params = new DataObject().set("currentUser", currentUser());
List<DataObject> ableOgdpList = fimsOgdpBean.selectAbleOgdpList(params); List<DataObject> ableOgdpList = ogdpBean.selectAbleOgdpList(params);
mav.addObject("ableOgdpList", ableOgdpList); mav.addObject("ableOgdpList", ableOgdpList);
return mav; return mav;

@ -0,0 +1,348 @@
package cokr.xit.fims.base.dao;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.annotations.Update;
import org.apache.ibatis.annotations.UpdateProvider;
import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
import cokr.xit.applib.SQLUtil;
import cokr.xit.fims.base.OgdpQuery;
import cokr.xit.fims.base.OgdpSigungu;
import cokr.xit.foundation.component.AbstractMapper;
import cokr.xit.foundation.data.DataObject;
@Mapper("ogdpMapper")
public interface OgdpMapper extends AbstractMapper {
/** , .<br />
* @param
* @return ,
*/
@Select(SQLUtil.SCRIPT_START+"""
/* 전체 기관,부서 목록 조회(ogdpMapper.selectAllOgdpList) */
SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS OGDP_CD
, CONCAT(A.SGG_NM, ' / ', A.INST_NM, ' : ', B.DEPT_NM) AS OGDP_NM
, A.INST_CD
, A.INST_NM
, B.DEPT_CD
, B.DEPT_NM
, A.SGG_CD
, A.SGG_NM
FROM TB_SGG A
LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD)
UNION
SELECT ('default/default') AS OGDP_CD
, CONCAT(' ',' / ',' ', ' : ', ' ') AS OGDP_NM
, 'default' AS INST_CD
, ' ' AS INST_NM
, 'default' AS DEPT_CD
, ' ' AS DEPT_NM
, 'default' AS SGG_CD
, ' ' AS SGG_NM
FROM DUAL
"""+SQLUtil.SCRIPT_END)
List<DataObject> selectAllOgdpList();
/** , .<br />
* @param stringMap
* @param
* @return ,
*/
@Select(SQLUtil.SCRIPT_START+"""
/* 사용가능한 기관,부서 목록 조회(ogdpMapper.selectAbleOgdpList) */
SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS OGDP_CD
, CONCAT(A.SGG_NM, ' / ', A.INST_NM, ' : ', B.DEPT_NM) AS OGDP_NM
, A.INST_CD
, A.INST_NM
, B.DEPT_CD
, B.DEPT_NM
, A.SGG_CD
, A.SGG_NM
FROM TB_SGG A
LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD)
<choose>
<when test='anonymous == "Y" '>
WHERE A.SGG_CD = #{sggCd}
</when>
<otherwise>
<if test="currentUser.institute != 'default'">
WHERE A.SGG_CD = #{currentUser.user.orgID}
</if>
<if test="currentUser.institute == 'default'">
UNION
SELECT 'default/default' AS OGDP_CD
, CONCAT(' ',' / ',' ', ' : ', ' ') AS OGDP_NM
, 'default' AS INST_CD
, ' ' AS INST_NM
, 'default' AS DEPT_CD
, ' ' AS DEPT_NM
, 'default' AS SGG_CD
, ' ' AS SGG_NM
FROM DUAL
</if>
</otherwise>
</choose>
"""+SQLUtil.SCRIPT_END)
List<DataObject> selectAbleOgdpList(Map<String, Object> params);
/** ,,,,, .<br />
* @param ID
* @return ,,,,,
*/
@Select(SQLUtil.SCRIPT_START+"""
/* 사용자의 시군구,기관,부서 조회(ogdpMapper.selectOgdpInfoOfUser) */
SELECT S.SGG_CD
, S.SGG_NM
, U.NSTT_CD AS INST_CD
, S.INST_NM
, U.DEPT_CD
, D.DEPT_NM
FROM TB_USER U
LEFT OUTER JOIN TB_SGG S ON (U.ORG_ID = S.SGG_CD)
LEFT OUTER JOIN TB_DEPT D ON (U.DEPT_CD = D.DEPT_CD)
WHERE U.USER_ID = #{userId}
"""+SQLUtil.SCRIPT_END)
DataObject selectOgdpInfoOfUser(String userId);
/** .<br />
* @param
* @return
*/
@Select(SQLUtil.SCRIPT_START+"""
/* 모든 시군구 조회(ogdpMapper.selectAllSggList) */
SELECT SGG_CD
, SGG_NM
, (SELECT (CASE WHEN COUNT(*) > 0 THEN 'Y' ELSE 'N' END) FROM TB_USER WHERE NSTT_CD = A.INST_CD) AS USER_USE_YN
FROM TB_SGG A
WHERE USE_YN = 'Y'
"""+SQLUtil.SCRIPT_END)
List<DataObject> selectAllSggList();
/** .
* @param sgg
* @return
* <ul><li> true</li>
* <li> false</li>
* </ul>
*/
default boolean updateSgg(OgdpSigungu sgg) {
return sgg != null && updateSgg(params().set("sgg", sgg)) == 1;
}
/** .
* @param params
* <ul><li>"sgg" - </li>
* <li>"currentUser" - </li>
* </ul>
* @return
*/
@Update(SQLUtil.SCRIPT_START+"""
/* 시군구 설정정보 수정 (ogdpMapper.updateSgg) */
UPDATE TB_SGG
SET MDFCN_DT =
"""
+SQLUtil.now
+"""
, MDFR = #{sgg.modifiedBy}
<if test="sgg.symbolFilepath != null">
, SYMBOL_FILE_PATH = #{sgg.symbolFilepath} <!-- -->
, SYMBOL_FILE_NM = #{sgg.symbolFilename} <!-- -->
</if>
<if test="sgg.logoFilepath != null">
, LOGO_FILE_PATH = #{sgg.logoFilepath} <!-- -->
, LOGO_FILE_NM = #{sgg.logoFilename} <!-- -->
</if>
<if test="sgg.officialSealFilepath != null">
, OFFCS_FILE_PATH = #{sgg.officialSealFilepath} <!-- -->
, OFFCS_FILE_NM = #{sgg.officialSealFilename} <!-- -->
</if>
WHERE SGG_CD = #{sgg.sggID}
"""+SQLUtil.SCRIPT_END)
int updateSgg(Map<String, Object> params);
/** .
* @param req
* @return
*/
default DataObject selectSggInfo(OgdpQuery req) {
// 사용 여부 확인
if (req.getUseYn() == null) {
req.setUseYn("Y");
}
return selectSgg(req);
}
/** .
* @param req
* @return
*/
@SelectProvider(type=OgdpMapper.class, method="selectSggProvider")
DataObject selectSgg(OgdpQuery req);
public static String selectSggProvider() {
String comment = " /* 시군구 객체 가져오기(ogdpMapper.selectSgg) */ ";
String selectFrom = """
SELECT S.SGG_CD <!-- -->
, S.SGG_NM <!-- -->
, S.INST_SE_CD <!-- -->
, S.INST_CD <!-- -->
, S.INST_NM <!-- -->
, (CASE
WHEN S.INST_DADDR IS NULL OR S.INST_DADDR = ''
THEN S.INST_ADDR
ELSE CONCAT(S.INST_ADDR,' ',S.INST_DADDR)
END) AS INST_FULL_ADDR <!-- -->
, S.INST_ADDR <!-- -->
, S.INST_DADDR <!-- -->
, S.INST_ZIP <!-- -->
, S.SYMBOL_FILE_PATH <!-- -->
, S.SYMBOL_FILE_NM <!-- -->
, S.LOGO_FILE_PATH <!-- -->
, S.LOGO_FILE_NM <!-- -->
, S.OFFCS_FILE_PATH <!-- -->
, S.OFFCS_FILE_NM <!-- -->
FROM TB_SGG S
""";
String where = """
<where>
<if test="sggCd != null">
AND S.SGG_CD = #{sggCd} <!-- -->
</if>
<if test="useYn != null">
AND S.USE_YN = #{useYn} <!-- -->
</if>
</where>
""";
return SQLUtil.SCRIPT_START
+ comment
+ selectFrom + where
+ SQLUtil.SCRIPT_END;
}
@UpdateProvider(type=OgdpMapper.class, method="updateDeptProvider")
int updateDept(Map<String, Object> params);
public static String updateDeptProvider(Map<String, Object> params) {
String comment = "/* 부서 수정(ogdpMapper.updateDept) */ ";
String updateSet = """
UPDATE TB_DEPT
SET MDFCN_DT =
"""
+SQLUtil.now
+"""
<!-- -->
, MDFR = #{dept.modifiedBy} <!-- -->
""";
String where = """
WHERE DEPT_CD = #{dept.deptID}
AND USE_YN = 'Y'
""";
String updateSetAdd = params.get("updateSetAdd") == null ? "" : (String)params.get("updateSetAdd");
return SQLUtil.SCRIPT_START
+ comment
+ updateSet + updateSetAdd + where
+ SQLUtil.SCRIPT_END;
}
@SelectProvider(type=OgdpMapper.class, method="selectDeptInfoProvider")
DataObject selectDeptInfo(OgdpQuery req);
public static String selectDeptInfoProvider(OgdpQuery req) {
String comment = "/* 부서 객체 가져오기(ogdpMapper.selectDeptInfo) */ ";
String selectFromWhere = selectDept(req);
return SQLUtil.SCRIPT_START
+ comment
+ selectFromWhere
+ SQLUtil.SCRIPT_END;
}
@SelectProvider(type=OgdpMapper.class, method="selectDeptListProvider")
List<DataObject> selectDeptList(OgdpQuery query);
public static String selectDeptListProvider(OgdpQuery req) {
String comment = "/* 부서 객체 목록 가져오기(ogdpMapper.selectDeptList) */ ";
String selectFromWhere = selectDept(req);
return SQLUtil.SCRIPT_START
+ comment
+ SQLUtil.pagingPrefix
+ selectFromWhere
+ SQLUtil.orderBy
+ SQLUtil.pagingSuffix
+ SQLUtil.SCRIPT_END;
}
public static String selectDept(OgdpQuery req) {
String select = """
SELECT D.DEPT_CD <!-- -->
, D.SGG_CD <!-- -->
, (SELECT SGG_NM FROM TB_SGG WHERE SGG_CD = D.SGG_CD) AS SGG_NM <!-- -->
, D.INST_CD <!-- -->
, (SELECT INST_NM FROM TB_SGG WHERE INST_CD = D.INST_CD) AS INST_NM <!-- -->
, D.DEPT_NM <!-- -->
, D.DEPT_TELNO <!-- -->
, D.DEPT_FXNO <!-- -->
, D.USE_YN <!-- -->
, (CASE D.USE_YN WHEN 'Y' THEN '' WHEN 'N' THEN '' ELSE '' END) AS USE_YN_NM <!-- -->
, D.REG_DT <!-- -->
, D.RGTR <!-- -->
, D.MDFCN_DT <!-- -->
, D.MDFR <!-- -->
""";
String fromWhere = """
FROM TB_DEPT D
<where>
<if test="sggCd != null">
AND D.SGG_CD = #{sggCd} <!-- -->
</if>
<if test="deptCd != null">
AND D.DEPT_CD = #{deptCd} <!-- -->
</if>
<if test="instCd != null">
AND D.INST_CD = #{instCd} <!-- -->
</if>
<if test="useYn != null">
AND D.USE_YN = #{useYn} <!-- -->
</if>
</where>
""";
String selectAdd = req.getSelectAdd() == null ? "" : req.getSelectAdd();
return select + selectAdd + fromWhere;
}
}

@ -1,22 +1,25 @@
package cokr.xit.fims.mngt.service.bean; package cokr.xit.fims.base.service.bean;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import cokr.xit.applib.ogdp.OgdpQuery;
import cokr.xit.applib.ogdp.dao.OgdpMapper;
import cokr.xit.applib.ogdp.service.bean.AbstractOgdpBean;
import cokr.xit.base.user.Department; import cokr.xit.base.user.Department;
import cokr.xit.fims.base.OgdpQuery;
import cokr.xit.fims.base.OgdpSigungu;
import cokr.xit.fims.base.dao.OgdpMapper;
import cokr.xit.fims.mngt.FimsDepartment; import cokr.xit.fims.mngt.FimsDepartment;
import cokr.xit.foundation.UserInfo;
import cokr.xit.foundation.component.AbstractBean;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
@Component("fimsOgdpBean") @Component("ogdpBean")
public class FimsOgdpBean extends AbstractOgdpBean { public class OgdpBean extends AbstractBean {
public static String selectAdd = """ public static String selectAdd = """
, D.CVLCPT_LINK_SE_CD <!-- --> , D.CVLCPT_LINK_SE_CD <!-- -->
@ -46,7 +49,70 @@ public class FimsOgdpBean extends AbstractOgdpBean {
@Resource(name="ogdpMapper") @Resource(name="ogdpMapper")
private OgdpMapper ogdpMapper; private OgdpMapper ogdpMapper;
@Override
public Object selectAllOgdpList() {
return ogdpMapper.selectAllOgdpList();
}
public List<DataObject> selectAbleOgdpList(DataObject params) {
return ogdpMapper.selectAbleOgdpList(params);
}
public List<DataObject> selectAllSggList(){
return ogdpMapper.selectAllSggList();
}
public DataObject selectOgdpInfoOfUser(String userId){
return ogdpMapper.selectOgdpInfoOfUser(userId);
}
/**userInfo ,, .
* @param userInfo
* @return
*/
public void initUserInfo(UserInfo userInfo) {
DataObject ogdpInfo = ogdpMapper.selectOgdpInfoOfUser(userInfo.getId());
Map<String, Object> infoMap = userInfo.getInfo();
if(ogdpInfo == null) {
infoMap.put("sggCd", "");
infoMap.put("sggNm", "");
infoMap.put("instCd", "");
infoMap.put("instNm", "");
infoMap.put("deptCd", "");
infoMap.put("deptNm", "");
} else {
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);
}
/** .
* @param sgg
* @return
* <ul><li> true</li>
* <li> false</li>
* </ul>
*/
public boolean updateSgg(OgdpSigungu sgg) {
return ogdpMapper.updateSgg(sgg);
}
/** .
* @param req
* @return
*/
public DataObject getSggInfo(OgdpQuery req) {
return ogdpMapper.selectSggInfo(req);
}
public List<DataObject> getDeptList(OgdpQuery query) { public List<DataObject> getDeptList(OgdpQuery query) {
// 기본 정렬 // 기본 정렬
if (query.getOrderBy() == null) { if (query.getOrderBy() == null) {
@ -62,7 +128,7 @@ public class FimsOgdpBean extends AbstractOgdpBean {
return ogdpMapper.selectDeptList(query); return ogdpMapper.selectDeptList(query);
} }
@Override
public DataObject getDeptInfo(OgdpQuery query) { public DataObject getDeptInfo(OgdpQuery query) {
query.setSelectAdd(selectAdd); query.setSelectAdd(selectAdd);
@ -73,7 +139,7 @@ public class FimsOgdpBean extends AbstractOgdpBean {
@Override
public boolean updateDept(Department dept) { public boolean updateDept(Department dept) {
if(dept != null && dept instanceof FimsDepartment fimsDept) { if(dept != null && dept instanceof FimsDepartment fimsDept) {
String updateSetAdd = """ String updateSetAdd = """

@ -14,9 +14,9 @@ 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.base.security.Authority; import cokr.xit.base.security.Authority;
import cokr.xit.base.security.SecuredUserInfo; import cokr.xit.base.security.SecuredUserInfo;
import cokr.xit.fims.base.service.bean.OgdpBean;
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.FimsOgdpBean;
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 = "fimsOgdpBean") @Resource(name = "ogdpBean")
private FimsOgdpBean fimsOgdpBean; 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();
} }
fimsOgdpBean.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();
} }
fimsOgdpBean.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();
fimsOgdpBean.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("")) {
fimsOgdpBean.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("")) {
fimsOgdpBean.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"))

@ -6,10 +6,10 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import cokr.xit.fims.base.service.bean.OgdpBean;
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.FimsOgdpBean;
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 = "fimsOgdpBean") @Resource(name = "ogdpBean")
private FimsOgdpBean fimsOgdpBean; 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();
fimsOgdpBean.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);

@ -24,6 +24,7 @@ import cokr.xit.base.file.web.FileInfoFactory;
import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.ManagedUser;
import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.base.web.ApplicationController; import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.base.service.bean.OgdpBean;
import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.cmmn.ftp.FTPUtil; import cokr.xit.fims.cmmn.ftp.FTPUtil;
import cokr.xit.fims.cmmn.ftp.RemoteSystemInfo; import cokr.xit.fims.cmmn.ftp.RemoteSystemInfo;
@ -42,7 +43,6 @@ 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.FimsOgdpBean;
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 = "fimsOgdpBean") @Resource(name = "ogdpBean")
private FimsOgdpBean fimsOgdpBean; private 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();
fimsOgdpBean.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");

@ -25,6 +25,7 @@ import cokr.xit.base.file.service.bean.FileBean;
import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.ManagedUser;
import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.base.web.ApplicationController; import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.base.service.bean.OgdpBean;
import cokr.xit.fims.cmmn.FimsPrintOption; import cokr.xit.fims.cmmn.FimsPrintOption;
import cokr.xit.fims.cmmn.hwp.format.CvlcptOrgn; import cokr.xit.fims.cmmn.hwp.format.CvlcptOrgn;
import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.service.bean.StngBean;
@ -37,7 +38,6 @@ 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.FimsOgdpBean;
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 = "fimsOgdpBean") @Resource(name = "ogdpBean")
private FimsOgdpBean fimsOgdpBean; 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();
fimsOgdpBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);

@ -26,6 +26,7 @@ import cokr.xit.base.file.service.FileService;
import cokr.xit.base.file.web.FileInfoFactory; import cokr.xit.base.file.web.FileInfoFactory;
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.base.service.bean.OgdpBean;
import cokr.xit.fims.cmmn.FimsPrintOption; import cokr.xit.fims.cmmn.FimsPrintOption;
import cokr.xit.fims.cmmn.hwp.format.DlbrDecsnList; import cokr.xit.fims.cmmn.hwp.format.DlbrDecsnList;
import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.service.bean.StngBean;
@ -36,7 +37,6 @@ 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.FimsOgdpBean;
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;
@ -90,8 +90,8 @@ public class Excl02Controller extends ApplicationController {
@Resource(name="stngBean") @Resource(name="stngBean")
private StngBean stngBean; private StngBean stngBean;
@Resource(name = "fimsOgdpBean") @Resource(name = "ogdpBean")
private FimsOgdpBean fimsOgdpBean; private OgdpBean ogdpBean;
/** (fims/excl/excl02/010-main) . /** (fims/excl/excl02/010-main) .
* *
@ -377,7 +377,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();
fimsOgdpBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);

@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import cokr.xit.applib.ogdp.OgdpQuery;
import cokr.xit.applib.ogdp.OgdpSigungu;
import cokr.xit.base.web.ApplicationController; import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.base.OgdpQuery;
import cokr.xit.fims.base.OgdpSigungu;
import cokr.xit.fims.base.service.bean.OgdpBean;
import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnQuery;
import cokr.xit.fims.cmmn.service.StngService; import cokr.xit.fims.cmmn.service.StngService;
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.service.bean.FimsOgdpBean;
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;
@ -48,8 +48,8 @@ public class Mngt03Controller extends ApplicationController {
; ;
} }
@Resource(name="fimsOgdpBean") @Resource(name="ogdpBean")
private FimsOgdpBean fimsOgdpBean; private OgdpBean ogdpBean;
/** 설정 정보 서비스 */ /** 설정 정보 서비스 */
@Resource(name = "stngService") @Resource(name = "stngService")
@ -79,7 +79,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 = fimsOgdpBean.selectAllSggList(); List<DataObject> sggList = ogdpBean.selectAllSggList();
mav.addObject("sggList", sggList); mav.addObject("sggList", sggList);
} else { } else {
@ -91,7 +91,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");
fimsOgdpBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
mav.addObject("sggCd", userInfo.getInfo().get("sggCd")); mav.addObject("sggCd", userInfo.getInfo().get("sggCd"));
} }
@ -105,7 +105,7 @@ public class Mngt03Controller extends ApplicationController {
@RequestMapping(name="시군구 조회", value=METHOD_URL.getSggInfo) @RequestMapping(name="시군구 조회", value=METHOD_URL.getSggInfo)
public ModelAndView getSggInfo(OgdpQuery req) { public ModelAndView getSggInfo(OgdpQuery req) {
ModelAndView mav = new ModelAndView("jsonView"); ModelAndView mav = new ModelAndView("jsonView");
DataObject sggInfo = fimsOgdpBean.getSggInfo(req); DataObject sggInfo = ogdpBean.getSggInfo(req);
mav.addObject("sggInfo", sggInfo); mav.addObject("sggInfo", sggInfo);
return mav; return mav;
} }
@ -158,7 +158,7 @@ public class Mngt03Controller extends ApplicationController {
sgg.setOfficialSealFilepath(newOffcs.get("filePath")); sgg.setOfficialSealFilepath(newOffcs.get("filePath"));
sgg.setOfficialSealFilename(newOffcs.get("fileName")); sgg.setOfficialSealFilename(newOffcs.get("fileName"));
} }
boolean saved = fimsOgdpBean.updateSgg(sgg); boolean saved = ogdpBean.updateSgg(sgg);
mav.addObject("saved", saved); mav.addObject("saved", saved);
return mav; return mav;

@ -8,13 +8,13 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import cokr.xit.applib.ogdp.OgdpQuery;
import cokr.xit.base.user.SigunguQuery; import cokr.xit.base.user.SigunguQuery;
import cokr.xit.base.user.service.SigunguDepartmentService; import cokr.xit.base.user.service.SigunguDepartmentService;
import cokr.xit.base.web.ApplicationController; import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.base.OgdpQuery;
import cokr.xit.fims.base.service.bean.OgdpBean;
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.service.bean.FimsOgdpBean;
import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.DataObject;
/** .<br /> /** .<br />
@ -40,8 +40,8 @@ public class Mngt04Controller extends ApplicationController {
private SigunguDepartmentService sggDeptService; private SigunguDepartmentService sggDeptService;
/** 소속 정보 서비스 */ /** 소속 정보 서비스 */
@Resource(name = "fimsOgdpBean") @Resource(name = "ogdpBean")
private FimsOgdpBean fimsOgdpBean; private OgdpBean ogdpBean;
/** . /** .
@ -71,7 +71,7 @@ public class Mngt04Controller extends ApplicationController {
setFetchSize(query); setFetchSize(query);
return setCollectionInfo(new ModelAndView("jsonView"), fimsOgdpBean.getDeptList(query),"",""); return setCollectionInfo(new ModelAndView("jsonView"), ogdpBean.getDeptList(query),"","");
} }
@ -87,7 +87,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 = fimsOgdpBean.getDeptInfo(query); deptInfo = ogdpBean.getDeptInfo(query);
} else { } else {
deptInfo = null; deptInfo = null;
} }
@ -113,7 +113,7 @@ public class Mngt04Controller extends ApplicationController {
@RequestMapping(name="부서 수정", value=METHOD_URL.updateDept) @RequestMapping(name="부서 수정", value=METHOD_URL.updateDept)
public ModelAndView updateDept(FimsDepartment dept) { public ModelAndView updateDept(FimsDepartment dept) {
ModelAndView mav = new ModelAndView("jsonView"); ModelAndView mav = new ModelAndView("jsonView");
boolean saved = fimsOgdpBean.updateDept(dept); boolean saved = ogdpBean.updateDept(dept);
mav.addObject("saved", saved); mav.addObject("saved", saved);
return mav; return mav;

@ -29,13 +29,14 @@ import org.springframework.stereotype.Component;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import cokr.xit.applib.ogdp.OgdpQuery;
import cokr.xit.base.code.CommonCode; import cokr.xit.base.code.CommonCode;
import cokr.xit.base.code.service.bean.CodeBean; import cokr.xit.base.code.service.bean.CodeBean;
import cokr.xit.base.file.ZIP; import cokr.xit.base.file.ZIP;
import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.FileQuery;
import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.base.file.service.bean.FileBean;
import cokr.xit.base.user.service.bean.UserBean; import cokr.xit.base.user.service.bean.UserBean;
import cokr.xit.fims.base.OgdpQuery;
import cokr.xit.fims.base.service.bean.OgdpBean;
import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnQuery;
import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.Crdn;
@ -43,7 +44,6 @@ 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.FimsOgdpBean;
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;
@ -111,8 +111,8 @@ public class NisIndivBean extends AbstractBean {
protected StngBean stngBean; protected StngBean stngBean;
/** 부서 정보 DAO */ /** 부서 정보 DAO */
@Resource(name = "fimsOgdpBean") @Resource(name = "ogdpBean")
private FimsOgdpBean fimsOgdpBean; private OgdpBean ogdpBean;
/** . /** .
* @param req * @param req
@ -145,7 +145,7 @@ public class NisIndivBean extends AbstractBean {
DataObject userInfo = userBean.getUserInfo(currentUser().getId()); DataObject userInfo = userBean.getUserInfo(currentUser().getId());
// 2. 부서 정보 // 2. 부서 정보
DataObject deptInfo = fimsOgdpBean.getDeptInfo(new OgdpQuery().setDeptCd(userInfo.string("DEPT_CD"))); DataObject deptInfo = ogdpBean.getDeptInfo(new OgdpQuery().setDeptCd(userInfo.string("DEPT_CD")));
// 3. 세외수입 과태료대장에 연계할 단속 정보를 조회 // 3. 세외수입 과태료대장에 연계할 단속 정보를 조회
DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId()); DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId());
@ -347,7 +347,7 @@ public class NisIndivBean extends AbstractBean {
DataObject userInfo = userBean.getUserInfo(currentUser().getId()); DataObject userInfo = userBean.getUserInfo(currentUser().getId());
// 2. 부서 정보 // 2. 부서 정보
DataObject deptInfo = fimsOgdpBean.getDeptInfo(new OgdpQuery().setDeptCd(userInfo.string("DEPT_CD"))); DataObject deptInfo = ogdpBean.getDeptInfo(new OgdpQuery().setDeptCd(userInfo.string("DEPT_CD")));
// 3. 세외수입 과태료대장에 연계할 단속 정보를 조회 // 3. 세외수입 과태료대장에 연계할 단속 정보를 조회
DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId()); DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId());

@ -24,6 +24,7 @@ import cokr.xit.base.file.service.FileQuery;
import cokr.xit.base.file.service.bean.FileBean; 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.base.service.bean.OgdpBean;
import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnQuery;
import cokr.xit.fims.cmmn.FimsPrintOption; import cokr.xit.fims.cmmn.FimsPrintOption;
import cokr.xit.fims.cmmn.OtptStngQuery; import cokr.xit.fims.cmmn.OtptStngQuery;
@ -38,7 +39,6 @@ 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.FimsOgdpBean;
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;
@ -160,8 +160,8 @@ public class Sndb01Controller extends ApplicationController {
@Resource(name="fileBean") @Resource(name="fileBean")
private FileBean fileBean; private FileBean fileBean;
@Resource(name = "fimsOgdpBean") @Resource(name = "ogdpBean")
private FimsOgdpBean fimsOgdpBean; private OgdpBean ogdpBean;
@Resource(name="svbtcBean") @Resource(name="svbtcBean")
private SvbtcBean svbtcBean; private SvbtcBean svbtcBean;
@ -1788,7 +1788,7 @@ public class Sndb01Controller extends ApplicationController {
@RequestMapping(name="공시송달 한글 저장", value=METHOD_URL.makeSvbtcFileFromHwpFormat) @RequestMapping(name="공시송달 한글 저장", value=METHOD_URL.makeSvbtcFileFromHwpFormat)
public ModelAndView makeSvbtcFileFromHwpFormat(SndbQuery req) { public ModelAndView makeSvbtcFileFromHwpFormat(SndbQuery req) {
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
fimsOgdpBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
Print print = new Print(); Print print = new Print();
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);
@ -2010,7 +2010,7 @@ public class Sndb01Controller extends ApplicationController {
Print print = new Print(); Print print = new Print();
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
fimsOgdpBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
print.setPrintRequestUserInfo(userInfo); print.setPrintRequestUserInfo(userInfo);
//출력물 기본 설정 //출력물 기본 설정
@ -2152,7 +2152,7 @@ public class Sndb01Controller extends ApplicationController {
} }
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
fimsOgdpBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
ModelAndView mav = new ModelAndView("downloadView"); ModelAndView mav = new ModelAndView("downloadView");
@ -2245,7 +2245,7 @@ public class Sndb01Controller extends ApplicationController {
} }
UserInfo userInfo = currentUser(); UserInfo userInfo = currentUser();
fimsOgdpBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
ModelAndView mav = new ModelAndView("downloadView"); ModelAndView mav = new ModelAndView("downloadView");

@ -27,6 +27,7 @@ import cokr.xit.base.file.service.bean.FileBean;
import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.ManagedUser;
import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.base.web.ApplicationController; import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.base.service.bean.OgdpBean;
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.cmmn.OtptStngQuery; import cokr.xit.fims.cmmn.OtptStngQuery;
@ -48,7 +49,6 @@ 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.FimsOgdpBean;
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 = "fimsOgdpBean") @Resource(name = "ogdpBean")
private FimsOgdpBean fimsOgdpBean; 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();
fimsOgdpBean.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();
fimsOgdpBean.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();
fimsOgdpBean.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();
fimsOgdpBean.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();
fimsOgdpBean.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();
fimsOgdpBean.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();
fimsOgdpBean.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();
fimsOgdpBean.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();
fimsOgdpBean.initUserInfo(userInfo); ogdpBean.initUserInfo(userInfo);
sndng.setSggCd((String)userInfo.getInfo().get("sggCd")); sndng.setSggCd((String)userInfo.getInfo().get("sggCd"));

Loading…
Cancel
Save