시군구코드 조회 수정

src/main/java/cokr/xit/fims/crdn/dao/GlobalStngMapper.java

@@ -19,15 +19,11 @@ public interface GlobalStngMapper extends AbstractMapper {
 	 */
 	String selectBasicAmt(CrdnQuery query);
 
-	/**기관코드에 따른 시군구코드를 조회한다.<br />
+	/**부서코드에 따른 시군구코드를 조회한다.<br />
-	 * @param institute 기관코드
+	 * @param deptCode 부서코드
 	 * @return 시군구코드
 	 */
-	String selectSggCd(String institute);
+	String selectSggCd(String deptCode);
-
-	default String selectSggCdForCurrentUser() {
-		return selectSggCd(currentUser().getInstitute());
-	};
 
 	/**시군구코드에 따른 법정동명 목록을 조회한다.<br />
 	 * @param sggCd 시군구코드
@@ -35,12 +31,6 @@ public interface GlobalStngMapper extends AbstractMapper {
 	 */
 	List<String> selectStdgNmList(String sggCd);
 
-	default List<String> selectStdgNmListForCurrentUser() {
-		String sggCd = selectSggCd(currentUser().getInstitute());
-		return selectStdgNmList(sggCd);
-	};
-
-
 	/** 연계파일 레이아웃 정보를 조회한다.
 	 * @param query 연계파일 레이아웃 조회조건
 	 * @return 연계파일 레이아웃 정보

src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java

@@ -8,6 +8,12 @@ import cokr.xit.foundation.data.DataObject;
 
 public interface CrdnStngService {
 
+	/** 연계파일 레이아웃 정보를 조회한다.
+	 * @param sggCd 시군구코드, taskSeCd 과태료구분, instCd 기관코드, deptCd 부서코드
+	 * @return 연계파일 레이아웃 정보
+	 */
+	List<LayoutDescriptor> getLinkFileLayoutMetadata(String sggCd, String taskSeCd, String instCd, String deptCd);
+
 	/** 단속팀 목록을 조회한다.
 	 * @param query 단속팀 목록 조회 조건
 	 * @return 단속팀 목록
@@ -20,9 +26,5 @@ public interface CrdnStngService {
 	 */
 	DataObject getTeamInfo(String teamId);
 
-	/** 연계파일 레이아웃 정보를 조회한다.
+
-	 * @param sggCd 시군구코드, taskSeCd 과태료구분, instCd 기관코드, deptCd 부서코드
-	 * @return 연계파일 레이아웃 정보
-	 */
-	List<LayoutDescriptor> getLinkFileLayoutMetadata(String sggCd, String taskSeCd, String instCd, String deptCd);
 }

src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java

@@ -201,6 +201,21 @@ public class CrdnStngBean extends AbstractComponent {
 		return amt;
 	}
 
+	/** 연계파일 레이아웃 정보를 조회한다.
+	 * @param query 연계파일 레이아웃 조회조건
+	 * @return 연계파일 레이아웃 정보
+	 */
+	public List<LayoutDescriptor> getLinkFileLayoutMetadata(CrdnQuery query) {
+		return globalStngMapper.selectLinkFileLayoutMetadata(query);
+	}
+
+	public LayoutDescriptor getLinkFileLayoutMetadata(String fileLayoutId) {
+		CrdnQuery query = new CrdnQuery();
+		query.setFileLayoutId(fileLayoutId);
+		List<LayoutDescriptor> list = globalStngMapper.selectLinkFileLayoutMetadata(query);
+		return list == null ? null : list.get(0);
+	}
+
 	/**단속팀 목록을 조회한다.
 	 * @param query 단속팀 목록 조회조건
 	 * @return 단속팀 목록
@@ -217,18 +232,4 @@ public class CrdnStngBean extends AbstractComponent {
 		return crdnTeamMapper.selectTeamInfo(teamId);
 	}
 
-	/** 연계파일 레이아웃 정보를 조회한다.
-	 * @param query 연계파일 레이아웃 조회조건
-	 * @return 연계파일 레이아웃 정보
-	 */
-	public List<LayoutDescriptor> getLinkFileLayoutMetadata(CrdnQuery query) {
-		return globalStngMapper.selectLinkFileLayoutMetadata(query);
-	}
-
-	public LayoutDescriptor getLinkFileLayoutMetadata(String fileLayoutId) {
-		CrdnQuery query = new CrdnQuery();
-		query.setFileLayoutId(fileLayoutId);
-		List<LayoutDescriptor> list = globalStngMapper.selectLinkFileLayoutMetadata(query);
-		return list == null ? null : list.get(0);
-	}
 }

src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java

@@ -18,16 +18,6 @@ public class CrdnStngServiceBean extends AbstractServiceBean implements CrdnStng
 	@Resource(name="crdnStngBean")
 	protected CrdnStngBean crdnStngBean;
 
-	@Override
-	public List<DataObject> getTeamList(CrdnQuery query) {
-		return crdnStngBean.selectTeamList(query);
-	}
-
-	@Override
-	public DataObject getTeamInfo(String teamId) {
-		return crdnStngBean.selectTeamInfo(teamId);
-	}
-
 	@Override
 	public List<LayoutDescriptor> getLinkFileLayoutMetadata(String sggCd, String taskSeCd, String instCd, String deptCd) {
 		CrdnQuery query = new CrdnQuery();
@@ -38,4 +28,14 @@ public class CrdnStngServiceBean extends AbstractServiceBean implements CrdnStng
 		return crdnStngBean.getLinkFileLayoutMetadata(query);
 	}
 
+	@Override
+	public List<DataObject> getTeamList(CrdnQuery query) {
+		return crdnStngBean.selectTeamList(query);
+	}
+
+	@Override
+	public DataObject getTeamInfo(String teamId) {
+		return crdnStngBean.selectTeamInfo(teamId);
+	}
+
 }

src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java

@@ -17,6 +17,8 @@ import org.springframework.stereotype.Service;
 import cokr.xit.base.file.FileInfo;
 import cokr.xit.base.file.service.bean.FileBean;
 import cokr.xit.base.file.web.FileInfoFactory;
+import cokr.xit.base.user.ManagedUser;
+import cokr.xit.base.user.dao.UserMapper;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.dao.GlobalStngMapper;
 import cokr.xit.fims.crdn.parsing.SingleFileParser;
@@ -44,6 +46,9 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
 	private CrdnBean crdnBean;
 	@Resource(name = "globalStngMapper")
 	private GlobalStngMapper globalStngMapper;
+	@Resource(name="userMapper")
+	protected UserMapper userMapper;
+
 
 	@Override
 	public int createCrdns(List<String> interfaceSequences) {
@@ -86,12 +91,12 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
 
 		String fileGroupType = processInfo.get("fileGroupType");
 
-
 		Crdn crdn = new Crdn();
 		crdn.setCrdnRegSeCd("07");
 		crdn.setTaskSeCd(taskSeCd);
-		crdn.setSggCd(globalStngMapper.selectSggCdForCurrentUser());
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), institute);
-
+		String deptCd = currentUser.getDeptCode();
+		crdn.setSggCd(globalStngMapper.selectSggCd(deptCd));
 		Map<String, Object> dividedInfo = this.divideInformation(linkFileInfoList, fileGroupType);
 
 		DataObject metaFileInfo = (DataObject) dividedInfo.get("metaInfo");

src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java

@@ -140,9 +140,10 @@ public class Crdn05Controller extends ApplicationController {
 
 		String institute = currentUser().getInstitute();
 		String taskSeCd = hReq.getParameter("taskSeCd");
-		String sggCd = globalStngMapper.selectSggCdForCurrentUser();
 		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), institute);
 		String deptCd = currentUser.getDeptCode();
+		String sggCd = globalStngMapper.selectSggCd(deptCd);
+
 		List<LayoutDescriptor> layoutDescriptors = crdnStngService.getLinkFileLayoutMetadata(sggCd, taskSeCd, institute, deptCd);
 
 		for(int i=0; i < layoutDescriptors.size(); i++) {
@@ -195,9 +196,10 @@ public class Crdn05Controller extends ApplicationController {
 
 		String institute = currentUser().getInstitute();
 		String taskSeCd = hReq.getParameter("taskSeCd");
-		String sggCd = globalStngMapper.selectSggCdForCurrentUser();
 		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), institute);
 		String deptCd = currentUser.getDeptCode();
+		String sggCd = globalStngMapper.selectSggCd(deptCd);
+
 
 		List<LayoutDescriptor> layoutDescriptors = crdnStngService.getLinkFileLayoutMetadata(sggCd, taskSeCd, institute, deptCd);
 
@@ -241,9 +243,10 @@ public class Crdn05Controller extends ApplicationController {
 
 		String taskSeCd = hReq.getParameter("taskSeCd");
 		String institute = currentUser().getInstitute();
-		String sggCd = globalStngMapper.selectSggCdForCurrentUser();
 		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), institute);
 		String deptCd = currentUser.getDeptCode();
+		String sggCd = globalStngMapper.selectSggCd(deptCd);
+
 		List<LayoutDescriptor> layoutDescriptors = crdnStngService.getLinkFileLayoutMetadata(sggCd, taskSeCd, institute, deptCd);
 
 		Map<String, List<CommonCode>> codeInfo = getCodesOf("FIM007","WEB002","FIM005","FIM006","FIM005","FIM061");
@@ -371,9 +374,13 @@ public class Crdn05Controller extends ApplicationController {
 		mav.addObject("pageName", "crdn05030-info");
 		String urlTaskSeCd = hReq.getServletPath().split("/")[1];
 		mav.addObject("taskSeCd", urlTaskSeCd);
-		mav.addObject("sggCd", globalStngMapper.selectSggCdForCurrentUser());
 
-		mav.addObject("stdgNmList", globalStngMapper.selectStdgNmListForCurrentUser());
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
+		String curDeptCode = currentUser.getDeptCode();
+		String sggCd = globalStngMapper.selectSggCd(curDeptCode);
+		mav.addObject("sggCd", sggCd);
+
+		mav.addObject("stdgNmList", globalStngMapper.selectStdgNmList(sggCd));
 
 		String vltnByTask = "";
 
@@ -390,7 +397,7 @@ public class Crdn05Controller extends ApplicationController {
 		mav.addObject("VLTNList", commonCodes.get(vltnByTask));
 
 		CrdnQuery query = new CrdnQuery();
-		query.setSggCd(globalStngMapper.selectSggCdForCurrentUser());
+		query.setSggCd(sggCd);
 		query.setTaskSeCd(urlTaskSeCd);
 		List<DataObject> teamList = crdnStngService.getTeamList(query);
 
@@ -427,8 +434,9 @@ public class Crdn05Controller extends ApplicationController {
 	 */
 	public ModelAndView createCrdnDataByManual(HttpServletRequest hReq, Crdn crdn, MultipartFile[] newFileList) {
 		boolean saved = false;
-
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
-		crdn.setSggCd(globalStngMapper.selectSggCdForCurrentUser());
+		String deptCd = currentUser.getDeptCode();
+		crdn.setSggCd(globalStngMapper.selectSggCd(deptCd));
 
 		crdn.setCrdnRegSeCd("01");
 		crdn.setCrdnInptSeCd("03");//TODO : 사용자 기관의 시청,구청 구분

src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java

@@ -8,6 +8,8 @@ import javax.annotation.Resource;
 import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.base.code.CommonCode;
+import cokr.xit.base.user.ManagedUser;
+import cokr.xit.base.user.dao.UserMapper;
 import cokr.xit.base.web.ApplicationController;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
@@ -42,6 +44,9 @@ public class Crdn06Controller extends ApplicationController {
 	@Resource(name="crdnStngService")
 	private CrdnStngService crdnStngService;
 
+	@Resource(name="userMapper")
+	protected UserMapper userMapper;
+
 	@Resource(name="globalStngMapper")
 	protected GlobalStngMapper globalStngMapper;
 
@@ -111,7 +116,10 @@ public class Crdn06Controller extends ApplicationController {
 		ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn06020-info");
 
 		// 법정동
-		mav.addObject("stdgNmList", globalStngMapper.selectStdgNmListForCurrentUser());
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
+		String curDeptCode = currentUser.getDeptCode();
+		String sggCd = globalStngMapper.selectSggCd(curDeptCode);
+		mav.addObject("stdgNmList", globalStngMapper.selectStdgNmList(sggCd));
 
 		// 공통코드 - 위반 내역 코드
 		String vltnByTask = "";

src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java

@@ -16,6 +16,8 @@ import cokr.xit.base.code.CommonCode;
 import cokr.xit.base.file.FileInfo;
 import cokr.xit.base.file.FileInfo.Relation;
 import cokr.xit.base.file.web.FileInfoFactory;
+import cokr.xit.base.user.ManagedUser;
+import cokr.xit.base.user.dao.UserMapper;
 import cokr.xit.base.web.ApplicationController;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
@@ -51,6 +53,9 @@ public class Cvlc01Controller extends ApplicationController {
 	@Resource(name="globalStngMapper")
 	protected GlobalStngMapper globalStngMapper;
 
+	@Resource(name="userMapper")
+	protected UserMapper userMapper;
+
 	@Resource(name="crdnService")
 	private CrdnService crdnService;
 
@@ -151,7 +156,10 @@ public class Cvlc01Controller extends ApplicationController {
 
 		mav.addObject("openerPageName", hReq.getParameter("openerPageName"));
 
-		mav.addObject("stdgNmList", globalStngMapper.selectStdgNmListForCurrentUser());
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
+		String curDeptCode = currentUser.getDeptCode();
+		String sggCd = globalStngMapper.selectSggCd(curDeptCode);
+		mav.addObject("stdgNmList", globalStngMapper.selectStdgNmList(sggCd));
 
 		String vltnByTask = "";
 		switch(urlTaskSeCd) {
@@ -198,7 +206,9 @@ public class Cvlc01Controller extends ApplicationController {
 	 */
 	public ModelAndView saveCivilComplaintProcessSection(HttpServletRequest hReq, CrdnCvlcpt crdnCvlcpt, Crdn crdn, MultipartFile[] newFileList, MultipartFile[] modifyFileList) {
 
-		String sggCd = globalStngMapper.selectSggCdForCurrentUser();
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
+		String deptCd = currentUser.getDeptCode();
+		String sggCd = globalStngMapper.selectSggCd(deptCd);
 		crdn.setSggCd(sggCd);
 		crdnCvlcpt.setSggCd(sggCd);
 

src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java

@@ -8,6 +8,8 @@ import javax.annotation.Resource;
 import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.base.code.CommonCode;
+import cokr.xit.base.user.ManagedUser;
+import cokr.xit.base.user.dao.UserMapper;
 import cokr.xit.base.web.ApplicationController;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.dao.GlobalStngMapper;
@@ -41,6 +43,9 @@ public class Cvlc04Controller extends ApplicationController {
 	@Resource(name="globalStngMapper")
 	protected GlobalStngMapper globalStngMapper;
 
+	@Resource(name="userMapper")
+	private UserMapper userMapper;
+
 	/** 민원 개별 등록 메인화면을 연다.
 	 * @return fims/cvlc/cvlc04010-main
 	 */
@@ -61,8 +66,9 @@ public class Cvlc04Controller extends ApplicationController {
 	 * @return jsonView
 	 */
 	public ModelAndView getDmndDataList(CrdnQuery query) {
-
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
-		query.setSggCd(globalStngMapper.selectSggCdForCurrentUser());
+		String deptCd = currentUser.getDeptCode();
+		query.setSggCd(globalStngMapper.selectSggCd(deptCd));
 
 		setFetchSize(query);
 		return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getDmndDataList(query),"");
@@ -79,7 +85,9 @@ public class Cvlc04Controller extends ApplicationController {
 	 */
 	public ModelAndView createDmndDataInfo(CrdnCvlcpt crdnCvlcpt) {
 
-		crdnCvlcpt.setSggCd(globalStngMapper.selectSggCdForCurrentUser());
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
+		String deptCd = currentUser.getDeptCode();
+		crdnCvlcpt.setSggCd(globalStngMapper.selectSggCd(deptCd));
 
 		boolean saved = false;
 

src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java

@@ -71,7 +71,9 @@ public class Cvlc05Controller extends ApplicationController {
 		ModelAndView mav = new ModelAndView();
 		mav.setViewName("jsonView");
 
-		String currentSggCd = globalStngMapper.selectSggCdForCurrentUser();
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
+		String deptCd = currentUser.getDeptCode();
+		String currentSggCd = globalStngMapper.selectSggCd(deptCd);
 		crdnQuery.setSggCd(currentSggCd);
 		Map<String, Object> info = crdnCvlcptService.getCvlcptAnswerWordsInfo(crdnQuery);
 
@@ -106,7 +108,9 @@ public class Cvlc05Controller extends ApplicationController {
 	public ModelAndView saveCvlcptAnswerWordsInfo(HttpServletRequest hReq, CrdnCvlcpt crdnCvlcpt) {
 		boolean saved = false;
 
-		String currentSggCd = globalStngMapper.selectSggCdForCurrentUser();
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
+		String deptCd = currentUser.getDeptCode();
+		String currentSggCd = globalStngMapper.selectSggCd(deptCd);
 		crdnCvlcpt.setSggCd(currentSggCd);
 
 		String saveData = hReq.getParameter("saveData");

src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java

@@ -8,6 +8,8 @@ import javax.annotation.Resource;
 import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.base.code.CommonCode;
+import cokr.xit.base.user.ManagedUser;
+import cokr.xit.base.user.dao.UserMapper;
 import cokr.xit.base.web.ApplicationController;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.dao.GlobalStngMapper;
@@ -36,6 +38,9 @@ public class Cvlc06Controller extends ApplicationController {
 	@Resource(name="globalStngMapper")
 	private GlobalStngMapper globalStngMapper;
 
+	@Resource(name="userMapper")
+	private UserMapper userMapper;
+
 	/** 계도문 문구 관리 메인화면을 연다.
 	 * @return fims/cvlc/cvlc06010-main
 	 */
@@ -55,7 +60,9 @@ public class Cvlc06Controller extends ApplicationController {
 	 * @return fims/cvlc/cvlc06010-info
 	 */
 	public ModelAndView getWarningWordsList(CrdnQuery crdnQuery) {
-		String currentSggCd = globalStngMapper.selectSggCdForCurrentUser();
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
+		String deptCd = currentUser.getDeptCode();
+		String currentSggCd = globalStngMapper.selectSggCd(deptCd);
 		crdnQuery.setSggCd(currentSggCd);
 		return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getWarningWordsList(crdnQuery),"");
 	}
@@ -71,7 +78,9 @@ public class Cvlc06Controller extends ApplicationController {
 	public ModelAndView saveCvlcptAnswerWordsInfo(CrdnCvlcpt crdnCvlcpt) {
 		boolean saved = false;
 
-		String currentSggCd = globalStngMapper.selectSggCdForCurrentUser();
+		ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
+		String deptCd = currentUser.getDeptCode();
+		String currentSggCd = globalStngMapper.selectSggCd(deptCd);
 		crdnCvlcpt.setSggCd(currentSggCd);
 
 		saved = crdnCvlcptService.saveWarningWordsInfo(crdnCvlcpt);

src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml

@@ -44,10 +44,10 @@ SELECT AMT
 </select>
 
 <select id="selectSggCd" parameterType="string" resultType="string">
-/* 시군구코드 조회(globalStngMapper.selectSggCd) */
+/* 부서에 따른 시군구코드 조회(globalStngMapper.selectSggCd) */
 SELECT SGG_CD
-  FROM TB_SGG_INFO
+  FROM TB_DEPT_INFO
- WHERE INST_CD = #{institute}
+ WHERE DEPT_CD = #{deptCode}
 </select>
 
 <select id="selectStdgNmList" parameterType="string" resultType="string">