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 3e7dc7e9..36ebce35 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -20,6 +20,7 @@ import cokr.xit.base.user.ManagedUser; 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.CrdnQuery; import cokr.xit.fims.crdn.dao.CrdnInfoMapper; import cokr.xit.fims.crdn.dao.GlobalStngMapper; @@ -59,6 +60,9 @@ public class Crdn02Controller extends ApplicationController { @Resource(name="userMapper") protected UserMapper userMapper; + @Resource(name = "stngBean") + private StngBean stngBean; + /** 단속 자료 검사 메인화면을 연다. * @return fims/crdn/crdn02010-main */ @@ -73,6 +77,7 @@ public class Crdn02Controller extends ApplicationController { mav.addObject("FIM003List", commonCodes.get("FIM003")); mav.addObject("FIM010List", commonCodes.get("FIM010")); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); return mav; 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 b18f8466..01ffc33d 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -26,6 +26,7 @@ import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.ftp.FTPUtil; import cokr.xit.fims.cmmn.ftp.RemoteSystemInfo; import cokr.xit.fims.cmmn.service.bean.FactionBean; +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; @@ -92,6 +93,9 @@ public class Crdn05Controller extends ApplicationController { @Resource(name="factionBean") protected FactionBean factionBean; + @Resource(name = "stngBean") + private StngBean stngBean; + /** 단속 자료 등록 메인화면을 연다. * @return fims/crdn/crdn05010-main */ @@ -102,6 +106,7 @@ public class Crdn05Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM003", "FIM026", "FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); addCodes(commonCodes, mav, "FIM003", "FIM026"); return mav; } @@ -137,6 +142,7 @@ public class Crdn05Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); return mav; } 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 eaa51bd7..700adb2f 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -19,6 +19,7 @@ import cokr.xit.base.user.ManagedUser; 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.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.GlobalStngMapper; @@ -58,6 +59,9 @@ public class Crdn06Controller extends ApplicationController { @Resource(name="globalStngMapper") protected GlobalStngMapper globalStngMapper; + @Resource(name = "stngBean") + private StngBean stngBean; + /** 단속 관리 메인화면을 연다. * @return fims/crdn/crdn06010-main */ @@ -72,6 +76,7 @@ public class Crdn06Controller extends ApplicationController { mav.addObject("FIM005List", commonCodes.get("FIM005")); mav.addObject("FIM010List", commonCodes.get("FIM010")); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM022", "FIM026", "FIM034"); return mav; } 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 f9530c10..ce3f7f5c 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java @@ -11,6 +11,7 @@ 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.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.Team; import cokr.xit.fims.crdn.dao.GlobalStngMapper; @@ -44,6 +45,9 @@ public class Crdn07Controller extends ApplicationController { @Resource(name="userMapper") protected UserMapper userMapper; + @Resource(name = "stngBean") + private StngBean stngBean; + /** 단속팀 관리 메인화면을 연다. * @return fims/crdn/crdn07010-main */ @@ -54,6 +58,7 @@ public class Crdn07Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM054","FIM071","FIM002"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); mav.addObject("FIM071List", commonCodes.get("FIM071")); mav.addObject("FIM002List", commonCodes.get("FIM002")); addCodes(commonCodes, mav, "FIM054"); 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 6bcd867e..105b787b 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -26,6 +26,7 @@ import cokr.xit.base.user.ManagedUser; 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.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.GlobalStngMapper; @@ -69,6 +70,9 @@ public class Cvlc01Controller extends ApplicationController { @Resource(name="crdnCvlcptService") private CrdnCvlcptService crdnCvlcptService; + @Resource(name = "stngBean") + private StngBean stngBean; + /** 민원 접수 자료 메인화면을 연다. * @return fims/cvlc/cvlc01010-main */ @@ -79,6 +83,7 @@ public class Cvlc01Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM026","FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); addCodes(commonCodes, mav, "FIM026"); mav.addObject("currentUserName", UserInfo.current().getName()); 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 e8909719..473d1577 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -21,6 +21,7 @@ import cokr.xit.base.user.ManagedUser; 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.CrdnQuery; import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnService; @@ -59,6 +60,9 @@ public class Cvlc02Controller extends ApplicationController { @Resource(name="userMapper") protected UserMapper userMapper; + @Resource(name = "stngBean") + private StngBean stngBean; + /** 민원 답변 대상 자료 메인화면을 연다. * @return fims/cvlc/cvlc02010-main */ @@ -70,6 +74,7 @@ public class Cvlc02Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM017","FIM022", "FIM026", "FIM054"); mav.addObject("FIM017List", commonCodes.get("FIM017")); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); addCodes(commonCodes, mav, "FIM022"); addCodes(commonCodes, mav, "FIM026"); return mav; 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 8b64997e..4565a7e5 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -20,6 +20,7 @@ import cokr.xit.base.user.ManagedUser; 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.CrdnQuery; import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnService; @@ -53,6 +54,9 @@ public class Cvlc03Controller extends ApplicationController { @Resource(name="userMapper") protected UserMapper userMapper; + @Resource(name = "stngBean") + private StngBean stngBean; + /** 민원 관리 메인화면을 연다. * @return fims/cvlc/cvlc03010-main */ @@ -63,6 +67,7 @@ public class Cvlc03Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM022","FIM026", "FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); addCodes(commonCodes, mav, "FIM022", "FIM026"); return mav; } 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 0a835e1a..a7b8a69e 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java @@ -11,6 +11,7 @@ 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.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnService; @@ -46,6 +47,9 @@ public class Cvlc04Controller extends ApplicationController { @Resource(name="userMapper") private UserMapper userMapper; + @Resource(name = "stngBean") + private StngBean stngBean; + /** 민원 개별 등록 메인화면을 연다. * @return fims/cvlc/cvlc04010-main */ @@ -56,6 +60,7 @@ public class Cvlc04Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM054","FIM063"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); addCodes(commonCodes, mav, "FIM063"); return mav; } 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 f1eb155e..6dbaa749 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java @@ -12,6 +12,7 @@ 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.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.cvlc.CrdnCvlcpt; @@ -45,6 +46,9 @@ public class Cvlc05Controller extends ApplicationController { @Resource(name="userMapper") private UserMapper userMapper; + @Resource(name = "stngBean") + private StngBean stngBean; + /** 민원신고 답변 문구 관리 메인화면을 연다. * @return fims/cvlc/cvlc05010-main */ @@ -60,6 +64,7 @@ public class Cvlc05Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); return mav; } 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 4cabfbc4..23f0383b 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java @@ -11,6 +11,7 @@ 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.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.cvlc.CrdnCvlcpt; @@ -35,6 +36,9 @@ public class Cvlc06Controller extends ApplicationController { @Resource(name="crdnCvlcptService") private CrdnCvlcptService crdnCvlcptService; + @Resource(name = "stngBean") + private StngBean stngBean; + @Resource(name="globalStngMapper") private GlobalStngMapper globalStngMapper; @@ -52,7 +56,7 @@ public class Cvlc06Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); - + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); return mav; } 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 9b85e2dc..936a0055 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java @@ -10,6 +10,7 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.levy.LevyQuery; import cokr.xit.fims.levy.Rduct; import cokr.xit.fims.levy.service.RductService; @@ -45,6 +46,9 @@ public class Levy02Controller extends ApplicationController { @Resource(name = "rductService") private RductService rductService; + @Resource(name = "stngBean") + private StngBean stngBean; + /**과태료 감경 대장 관리 메인화면(levy/levy02010-main)을 연다. * 조건없는 {@link #getRductList(RductQuery) 과태료 감경 대장 조회 결과}를 포함시킨다. * @return /rduct/rduct-main @@ -75,6 +79,7 @@ public class Levy02Controller extends ApplicationController { // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); addCodes(commonCodes, mav, "FIM010", "FIM019"); return mav.addObject("rductList", toJson(mav.getModel().get("rductList"))); 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 dc4da525..b7c07141 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -578,6 +578,7 @@ public class Sprt01Controller extends ApplicationController { mav.addObject("FIM047List", commonCodes.get("FIM047")); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); mav.addObject("FIM078List", commonCodes.get("FIM078")); mav.addObject("FIM080List", commonCodes.get("FIM080")); addCodes(commonCodes, mav, "FIM047", "FIM054", "FIM078","FIM080"); 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 04147a32..a3d195f8 100644 --- a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java +++ b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java @@ -13,6 +13,7 @@ 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.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.stat.CodeSubsetInfo; import cokr.xit.fims.stat.GroupInfo; @@ -54,6 +55,9 @@ public class Stat01Controller extends ApplicationController { @Resource(name="statMapper") protected StatMapper statMapper; + @Resource(name = "stngBean") + private StngBean stngBean; + /** * @return */ @@ -153,6 +157,7 @@ public class Stat01Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM054","FIM002"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); mav.addObject("FIM002List", commonCodes.get("FIM002")); return mav; @@ -177,6 +182,7 @@ public class Stat01Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM054","FIM002"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); mav.addObject("FIM002List", commonCodes.get("FIM002")); return mav; @@ -202,6 +208,7 @@ public class Stat01Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); return mav; } @@ -225,6 +232,7 @@ public class Stat01Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); return mav; } @@ -248,6 +256,7 @@ public class Stat01Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM054","FIM002"); mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); mav.addObject("FIM002List", commonCodes.get("FIM002")); return mav; diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp index c24b8e3a..5aef0ed5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp @@ -31,7 +31,7 @@
- +