diff --git a/src/main/java/cokr/xit/fims/cmmn/web/StngController.java b/src/main/java/cokr/xit/fims/cmmn/web/StngController.java
index 3bdae70b..d4cf50e7 100644
--- a/src/main/java/cokr/xit/fims/cmmn/web/StngController.java
+++ b/src/main/java/cokr/xit/fims/cmmn/web/StngController.java
@@ -22,7 +22,6 @@ import cokr.xit.fims.cmmn.service.StngService;
import cokr.xit.fims.cmmn.service.bean.ExtrStngBean;
import cokr.xit.fims.cmmn.service.bean.OtptStngBean;
import cokr.xit.fims.cmmn.service.bean.StngBean;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.stat.dao.StatMapper;
import cokr.xit.foundation.data.DataObject;
@@ -65,9 +64,6 @@ public class StngController extends ApplicationController {
@Resource(name = "userMapper")
private UserMapper userMapper;
- @Resource(name = "globalStngMapper")
- private GlobalStngMapper globalStngMapper;
-
@Resource(name = "statMapper")
private StatMapper statMapper;
diff --git a/src/main/java/cokr/xit/fims/crdn/dao/GlobalStngMapper.java b/src/main/java/cokr/xit/fims/crdn/dao/CrdnStngMapper.java
similarity index 94%
rename from src/main/java/cokr/xit/fims/crdn/dao/GlobalStngMapper.java
rename to src/main/java/cokr/xit/fims/crdn/dao/CrdnStngMapper.java
index 39f5488c..8e026ca4 100644
--- a/src/main/java/cokr/xit/fims/crdn/dao/GlobalStngMapper.java
+++ b/src/main/java/cokr/xit/fims/crdn/dao/CrdnStngMapper.java
@@ -10,8 +10,8 @@ import cokr.xit.fims.crdn.receive.eqpmnt.LayoutDescriptor;
import cokr.xit.foundation.component.AbstractMapper;
import cokr.xit.foundation.data.DataObject;
-@Mapper("globalStngMapper")
-public interface GlobalStngMapper extends AbstractMapper {
+@Mapper("crdnStngMapper")
+public interface CrdnStngMapper extends AbstractMapper {
/**기본금액을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.CrdnStngBean#getBasicAmt(CrdnQuery)} 참고
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java
index 69b183b2..d7e92cc7 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java
@@ -27,8 +27,8 @@ import cokr.xit.fims.crdn.CrdnQuery;
import cokr.xit.fims.crdn.dao.CrdnInfoMapper;
import cokr.xit.fims.crdn.dao.CrdnInstMapper;
import cokr.xit.fims.crdn.dao.CrdnListMapper;
+import cokr.xit.fims.crdn.dao.CrdnStngMapper;
import cokr.xit.fims.crdn.dao.CrdnUpdtMapper;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.dao.ImportMapper;
import cokr.xit.fims.crdn.send.nxrp.AttachedTxtMaker;
import cokr.xit.fims.crdn.send.nxrp.LinkFileMaker;
@@ -62,8 +62,8 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
@Resource(name="crdnInfoMapper")
private CrdnInfoMapper crdnInfoMapper;
- @Resource(name="globalStngMapper")
- private GlobalStngMapper globalStngMapper;
+ @Resource(name="crdnStngMapper")
+ private CrdnStngMapper crdnStngMapper;
@Resource(name="totalInfoMapper")
private TotalInfoMapper totalInfoMapper;
@@ -448,7 +448,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
Map stdgQuery = new HashMap<>();
stdgQuery.put("sggCd", crdnInfo.string("SGG_CD"));
stdgQuery.put("emdNm", crdnInfo.string("CRDN_STDG_NM"));
- List stdgCds = globalStngMapper.selectStdgCdListByStdgNm(stdgQuery);
+ List stdgCds = crdnStngMapper.selectStdgCdListByStdgNm(stdgQuery);
if(stdgCds != null && stdgCds.size() == 1 && stdgCds.get(0) != null && !stdgCds.get(0).equals("")) {
crdnInfo.put("STDG_CD", stdgCds.get(0));
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java
index 89c31e2d..741347ec 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java
@@ -12,9 +12,9 @@ import cokr.xit.fims.crdn.Crdn;
import cokr.xit.fims.crdn.CrdnQuery;
import cokr.xit.fims.crdn.ExmptnVhcl;
import cokr.xit.fims.crdn.Team;
+import cokr.xit.fims.crdn.dao.CrdnStngMapper;
import cokr.xit.fims.crdn.dao.CrdnTeamMapper;
import cokr.xit.fims.crdn.dao.ExmptnVhclMapper;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.receive.eqpmnt.LayoutDescriptor;
import cokr.xit.foundation.AbstractComponent;
import cokr.xit.foundation.data.DataObject;
@@ -31,8 +31,8 @@ public class CrdnStngBean extends AbstractComponent {
public static String[] CAR_GROUP2 = {"11","13"}; //승용자동차등
public static String[] CAR_GROUP3 = {"31"}; //이륜자동차등
- @Resource(name = "globalStngMapper")
- private GlobalStngMapper globalStngMapper;
+ @Resource(name = "crdnStngMapper")
+ private CrdnStngMapper crdnStngMapper;
@Resource(name = "crdnTeamMapper")
private CrdnTeamMapper crdnTeamMapper;
@@ -120,7 +120,7 @@ public class CrdnStngBean extends AbstractComponent {
query.setDtlAmtDcsnCd("02");
}
- int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
+ int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(crdnStngMapper.selectBasicAmt(query), () -> "0"));
if(ffnlgCrdnAmt > 0 && ifEmpty(crdn.getOvtimeYn(), ()-> "").equals("Y")) {
ffnlgCrdnAmt += 10000;
@@ -142,7 +142,7 @@ public class CrdnStngBean extends AbstractComponent {
query.setAmtDcsnCd("03");
}
- int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
+ int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(crdnStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgCrdnAmt;
amt[1] = ffnlgCrdnAmt;
@@ -151,7 +151,7 @@ public class CrdnStngBean extends AbstractComponent {
query.setAmtDcsnCdGroupId("FIM006");
query.setAmtDcsnCd(crdn.getVltnCd());
- int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
+ int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(crdnStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgCrdnAmt;
amt[1] = (int)(ffnlgCrdnAmt * 0.8);
@@ -160,7 +160,7 @@ public class CrdnStngBean extends AbstractComponent {
query.setAmtDcsnCdGroupId("FIM061");
query.setAmtDcsnCd(crdn.getVltnCd());
- int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
+ int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(crdnStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgCrdnAmt;
amt[1] = (int)(ffnlgCrdnAmt * 0.8);
@@ -190,7 +190,7 @@ public class CrdnStngBean extends AbstractComponent {
}
;
- int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
+ int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(crdnStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgCrdnAmt;
boolean isPenaltyAmt = (crdn.getFfnlgCarmdlCd().equals("13") || crdn.getFfnlgCarmdlCd().equals("14")); //과징금
if(isPenaltyAmt) {
@@ -406,13 +406,13 @@ public class CrdnStngBean extends AbstractComponent {
* @return 연계파일 레이아웃 정보
*/
public List getLinkFileLayoutMetadata(CrdnQuery query) {
- return globalStngMapper.selectLinkFileLayoutMetadata(query);
+ return crdnStngMapper.selectLinkFileLayoutMetadata(query);
}
public LayoutDescriptor getLinkFileLayoutMetadata(String fileLayoutId) {
CrdnQuery query = new CrdnQuery();
query.setFileLayoutId(fileLayoutId);
- List list = globalStngMapper.selectLinkFileLayoutMetadata(query);
+ List list = crdnStngMapper.selectLinkFileLayoutMetadata(query);
return list == null ? null : list.get(0);
}
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java
index 1cf158b8..ce8c239b 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java
@@ -22,7 +22,6 @@ import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.fims.crdn.Crdn;
import cokr.xit.fims.crdn.Team;
import cokr.xit.fims.crdn.dao.CrdnTeamMapper;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.receive.eqpmnt.SingleFileParser;
import cokr.xit.fims.crdn.service.CrdnService;
import cokr.xit.fims.crdn.service.ImportService;
@@ -46,8 +45,7 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
private CrdnService crdnService;
@Resource(name = "crdnBean")
private CrdnBean crdnBean;
- @Resource(name = "globalStngMapper")
- private GlobalStngMapper globalStngMapper;
+
@Resource(name="userMapper")
protected UserMapper userMapper;
@Resource(name = "crdnTeamMapper")
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
index b41583ea..e3134ac1 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
@@ -23,7 +23,6 @@ import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.CrdnQuery;
import cokr.xit.fims.crdn.dao.CrdnInfoMapper;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.service.CrdnService;
import cokr.xit.fims.crdn.service.CrdnStngService;
import cokr.xit.foundation.data.DataObject;
@@ -54,9 +53,6 @@ public class Crdn02Controller extends ApplicationController {
@Resource(name="crdnInfoMapper")
private CrdnInfoMapper crdnInfoMapper;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
protected UserMapper userMapper;
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java
index e816ff28..fa90a708 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java
@@ -22,7 +22,6 @@ import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.crdn.Crdn;
import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.service.CrdnService;
import cokr.xit.fims.crdn.service.CrdnStngService;
import cokr.xit.foundation.data.DataObject;
@@ -49,9 +48,6 @@ public class Crdn03Controller extends ApplicationController {
@Resource(name="crdnStngService")
private CrdnStngService crdnStngService;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
protected UserMapper userMapper;
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
index 66517872..adff2675 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
@@ -29,7 +29,7 @@ import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.Crdn;
import cokr.xit.fims.crdn.CrdnQuery;
import cokr.xit.fims.crdn.dao.CrdnInstMapper;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
+import cokr.xit.fims.crdn.dao.CrdnStngMapper;
import cokr.xit.fims.crdn.receive.eqpmnt.AttachedTxtParser;
import cokr.xit.fims.crdn.receive.eqpmnt.LayoutDescriptor;
import cokr.xit.fims.crdn.receive.eqpmnt.LayoutDiscriminator;
@@ -84,12 +84,12 @@ public class Crdn05Controller extends ApplicationController {
@Resource(name="crdnInstMapper")
private CrdnInstMapper crdnInstMapper;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
protected UserMapper userMapper;
+ @Resource(name="crdnStngMapper")
+ private CrdnStngMapper crdnStngMapper;
+
@Resource(name="factionBean")
protected FactionBean factionBean;
@@ -164,7 +164,7 @@ public class Crdn05Controller extends ApplicationController {
List layoutDescriptors = crdnStngService.getLinkFileLayoutMetadata(sggCd, taskSeCd, institute, deptCd);
for(int i=0; i < layoutDescriptors.size(); i++) {
- DataObject remoteInfo = globalStngMapper.selectRemoteInfo(layoutDescriptors.get(i).getFileLayoutId());
+ DataObject remoteInfo = crdnStngMapper.selectRemoteInfo(layoutDescriptors.get(i).getFileLayoutId());
if(remoteInfo == null) {
continue;
}
@@ -401,8 +401,8 @@ public class Crdn05Controller extends ApplicationController {
String curDeptCode = currentUser.getDeptCode();
String sggCd = currentUser.getOrgID();
mav.addObject("sggCd", sggCd);
-
- mav.addObject("stdgNmList", globalStngMapper.selectStdgNmList(sggCd));
+ List stdgNmList = crdnStngMapper.selectStdgNmList(sggCd);
+ mav.addObject("stdgNmList", stdgNmList);
String vltnByTask = "";
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
index e2643e69..2e94e80e 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
@@ -24,7 +24,7 @@ import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.Crdn;
import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
+import cokr.xit.fims.crdn.dao.CrdnStngMapper;
import cokr.xit.fims.crdn.service.CrdnService;
import cokr.xit.fims.crdn.service.CrdnStngService;
import cokr.xit.foundation.data.DataObject;
@@ -61,8 +61,8 @@ public class Crdn06Controller extends ApplicationController {
@Resource(name="userMapper")
protected UserMapper userMapper;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
+ @Resource(name="crdnStngMapper")
+ protected CrdnStngMapper crdnStngMapper;
@Resource(name = "fileBean")
private FileBean fileBean;
@@ -270,7 +270,8 @@ public class Crdn06Controller extends ApplicationController {
ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
String curDeptCode = currentUser.getDeptCode();
String sggCd = currentUser.getOrgID();
- mav.addObject("stdgNmList", globalStngMapper.selectStdgNmList(sggCd));
+ List stdgNmList = crdnStngMapper.selectStdgNmList(sggCd);
+ mav.addObject("stdgNmList", stdgNmList);
// 공통코드 - 위반 내역 코드
String vltnByTask = "";
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java
index 9c249d78..821449cd 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java
@@ -14,7 +14,6 @@ import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.CrdnQuery;
import cokr.xit.fims.crdn.Team;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.service.CrdnStngService;
/**단속팀 관리 서비스 웹 컨트롤러.
@@ -39,9 +38,6 @@ public class Crdn07Controller extends ApplicationController {
@Resource(name="crdnStngService")
private CrdnStngService crdnStngService;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
protected UserMapper userMapper;
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java
index 09f21625..d06d07bf 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java
@@ -22,7 +22,6 @@ import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.crdn.CrdnQuery;
import cokr.xit.fims.crdn.ExmptnVhcl;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.service.CrdnStngService;
import cokr.xit.foundation.data.DataObject;
@@ -52,9 +51,6 @@ public class Crdn08Controller extends ApplicationController {
@Resource(name="userMapper")
private UserMapper userMapper;
- @Resource(name="globalStngMapper")
- private GlobalStngMapper globalStngMapper;
-
/** 면제차량 관리 메인화면을 연다.
* @return fims/crdn/crdn08010-main
*/
diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java
index e2658b3c..79f648fe 100644
--- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java
+++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java
@@ -19,7 +19,6 @@ import cokr.xit.fims.crdn.CrdnQuery;
import cokr.xit.fims.crdn.dao.CrdnInfoMapper;
import cokr.xit.fims.crdn.dao.CrdnInstMapper;
import cokr.xit.fims.crdn.dao.CrdnUpdtMapper;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.cvlc.CrdnCvlcpt;
import cokr.xit.fims.cvlc.dao.AnswerWordsMapper;
import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper;
@@ -45,9 +44,6 @@ public class CrdnCvlcptMainBean extends AbstractComponent {
@Resource(name = "userMapper")
private UserMapper userMapper;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Resource(name = "crdnCvlcptMapper")
private CrdnCvlcptMapper crdnCvlcptMapper;
diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java
index e704ff7d..19045f9a 100644
--- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java
+++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java
@@ -22,7 +22,6 @@ import cokr.xit.fims.crdn.CrdnQuery;
import cokr.xit.fims.crdn.dao.CrdnInfoMapper;
import cokr.xit.fims.crdn.dao.CrdnInstMapper;
import cokr.xit.fims.crdn.dao.CrdnUpdtMapper;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.service.bean.CrdnStngBean;
import cokr.xit.fims.cvlc.CrdnCvlcpt;
import cokr.xit.fims.cvlc.dao.AnswerWordsMapper;
@@ -87,9 +86,6 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
@Resource(name="crdnUpdtMapper")
protected CrdnUpdtMapper crdnUpdtMapper;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Override
public List getCivilComplaintList(CrdnQuery query) {
List dataObjectList = new ArrayList();
diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java
index 43e9b4ed..eee43001 100644
--- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java
+++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java
@@ -31,7 +31,7 @@ import cokr.xit.fims.cmmn.hwp.format.CvlcptOrgn;
import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.Crdn;
import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
+import cokr.xit.fims.crdn.dao.CrdnStngMapper;
import cokr.xit.fims.crdn.service.CrdnService;
import cokr.xit.fims.cvlc.CrdnCvlcpt;
import cokr.xit.fims.cvlc.service.CrdnCvlcptService;
@@ -62,8 +62,6 @@ public class Cvlc01Controller extends ApplicationController {
;
}
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
@Resource(name="userMapper")
protected UserMapper userMapper;
@@ -86,6 +84,9 @@ public class Cvlc01Controller extends ApplicationController {
@Resource(name = "crdnCvlcptMainBean")
private CrdnCvlcptMainBean crdnCvlcptMainBean;
+ @Resource(name="crdnStngMapper")
+ private CrdnStngMapper crdnStngMapper;
+
/** 민원 접수 자료 메인화면을 연다.
* @return fims/cvlc/cvlc01010-main
*/
@@ -281,7 +282,8 @@ public class Cvlc01Controller extends ApplicationController {
ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
String curDeptCode = currentUser.getDeptCode();
String sggCd = currentUser.getOrgID();
- mav.addObject("stdgNmList", globalStngMapper.selectStdgNmList(sggCd));
+ List stdgNmList = crdnStngMapper.selectStdgNmList(sggCd);
+ mav.addObject("stdgNmList", stdgNmList);
String vltnByTask = "";
switch(urlTaskSeCd) {
diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java
index 55142b53..b8d9c762 100644
--- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java
+++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java
@@ -25,7 +25,6 @@ import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.Crdn;
import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.service.CrdnService;
import cokr.xit.fims.cvlc.CrdnCvlcpt;
import cokr.xit.fims.cvlc.service.CrdnCvlcptService;
@@ -56,9 +55,6 @@ public class Cvlc02Controller extends ApplicationController {
@Resource(name="crdnCvlcptService")
private CrdnCvlcptService crdnCvlcptService;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
protected UserMapper userMapper;
diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java
index fb4beff5..697c0ae6 100644
--- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java
+++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java
@@ -22,7 +22,6 @@ import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.service.CrdnService;
import cokr.xit.fims.cvlc.service.CrdnCvlcptService;
import cokr.xit.foundation.data.DataObject;
@@ -48,9 +47,6 @@ public class Cvlc03Controller extends ApplicationController {
@Resource(name="crdnCvlcptService")
private CrdnCvlcptService crdnCvlcptService;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
protected UserMapper userMapper;
diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java
index 6cfec989..1f9674cc 100644
--- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java
+++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java
@@ -13,7 +13,6 @@ import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.crdn.service.CrdnService;
import cokr.xit.fims.cvlc.CrdnCvlcpt;
import cokr.xit.fims.cvlc.service.CrdnCvlcptService;
@@ -41,9 +40,6 @@ public class Cvlc04Controller extends ApplicationController {
@Resource(name="crdnCvlcptService")
private CrdnCvlcptService crdnCvlcptService;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
private UserMapper userMapper;
diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java
index 865e9f71..ac4eb2da 100644
--- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java
+++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java
@@ -14,7 +14,6 @@ import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.cvlc.CrdnCvlcpt;
import cokr.xit.fims.cvlc.service.CrdnCvlcptService;
import cokr.xit.foundation.UserInfo;
@@ -40,9 +39,6 @@ public class Cvlc05Controller extends ApplicationController {
@Resource(name="crdnCvlcptService")
private CrdnCvlcptService crdnCvlcptService;
- @Resource(name="globalStngMapper")
- private GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
private UserMapper userMapper;
diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java
index f0b58353..503ad75c 100644
--- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java
+++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java
@@ -13,7 +13,6 @@ import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.cvlc.CrdnCvlcpt;
import cokr.xit.fims.cvlc.service.CrdnCvlcptService;
@@ -39,9 +38,6 @@ public class Cvlc06Controller extends ApplicationController {
@Resource(name = "stngBean")
private StngBean stngBean;
- @Resource(name="globalStngMapper")
- private GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
private UserMapper userMapper;
diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java
index 14942f87..2e992056 100644
--- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java
+++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java
@@ -19,7 +19,6 @@ import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.CmmnUtil;
import cokr.xit.fims.cmmn.service.bean.StngBean;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.levy.LevyQuery;
import cokr.xit.fims.levy.Rduct;
import cokr.xit.fims.levy.service.RductService;
@@ -61,9 +60,6 @@ public class Levy02Controller extends ApplicationController {
@Resource(name="userMapper")
protected UserMapper userMapper;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
/**과태료 감경 대장 관리 메인화면(levy/levy02010-main)을 연다.
* 조건없는 {@link #getRductList(RductQuery) 과태료 감경 대장 조회 결과}를 포함시킨다.
* @return /rduct/rduct-main
diff --git a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java b/src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java
index 01f1d366..2ca4574c 100644
--- a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java
+++ b/src/main/java/cokr/xit/fims/mngt/service/bean/FactionBean.java
@@ -9,7 +9,6 @@ import org.springframework.stereotype.Component;
import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.fims.cmmn.CmmnQuery;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.mngt.FineIntegrationDepartment;
import cokr.xit.fims.mngt.FineIntegrationSigungu;
import cokr.xit.fims.mngt.dao.FactionMapper;
@@ -23,9 +22,6 @@ public class FactionBean extends AbstractComponent {
@Resource(name = "factionMapper")
private FactionMapper factionMapper;
- @Resource(name = "globalStngMapper")
- private GlobalStngMapper globalStngMapper;
-
@Resource(name = "userMapper")
private UserMapper userMapper;
diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java
index 3a99f0fc..e7f7ac43 100644
--- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java
+++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java
@@ -43,7 +43,6 @@ import cokr.xit.fims.cmmn.service.bean.StngBean;
import cokr.xit.fims.crdn.Crdn;
import cokr.xit.fims.crdn.CrdnQuery;
import cokr.xit.fims.crdn.dao.CrdnListMapper;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.mngt.service.bean.FactionBean;
import cokr.xit.fims.mngt.service.bean.TaskBean;
import cokr.xit.fims.sprt.Keyword;
@@ -97,9 +96,6 @@ public class Sprt01Controller extends ApplicationController {
@Resource(name="integrationSearchService")
private IntegrationSearchService integrationSearchService;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
protected UserMapper userMapper;
diff --git a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java
index 6a639dc4..9d422f5a 100644
--- a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java
+++ b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java
@@ -14,7 +14,6 @@ import cokr.xit.base.user.ManagedUser;
import cokr.xit.base.user.dao.UserMapper;
import cokr.xit.base.web.ApplicationController;
import cokr.xit.fims.cmmn.service.bean.StngBean;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
import cokr.xit.fims.stat.CodeSubsetInfo;
import cokr.xit.fims.stat.GroupInfo;
import cokr.xit.fims.stat.NumberValueInfo;
@@ -46,9 +45,6 @@ public class Stat01Controller extends ApplicationController {
@Resource(name="statService")
private StatService statService;
- @Resource(name="globalStngMapper")
- protected GlobalStngMapper globalStngMapper;
-
@Resource(name="userMapper")
protected UserMapper userMapper;
diff --git a/src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-stng-mapper.xml
similarity index 90%
rename from src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml
rename to src/main/resources/sql/mapper/fims/crdn/crdn-stng-mapper.xml
index 842c1f8a..c2accb92 100644
--- a/src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn-stng-mapper.xml
@@ -1,10 +1,10 @@
-
+