From 62a81f850979d11d9aa30a1fa79f77bc899bba00 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 15 Sep 2023 18:19:21 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D,=EC=88=98=EC=A0=95=20=ED=99=94=EB=A9=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95(=EA=B8=B0=EA=B4=80,=EB=B6=80=EC=84=9C=20=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=20=EC=B6=94=EA=B0=80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/base/UserController.java | 25 ++++++ .../cokr/xit/fims/cmmn/dao/FactionMapper.java | 37 ++++++++ .../resources/sql/mapper/base/user-mapper.xml | 1 + .../sql/mapper/fims/cmmn/faction-mapper.xml | 50 +++++++++++ .../WEB-INF/jsp/base/user/user-info.jsp | 90 +++++++++++++++---- .../css/fims/framework/common/xit-core.css | 4 + 6 files changed, 189 insertions(+), 18 deletions(-) create mode 100644 src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java create mode 100644 src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml diff --git a/src/main/java/cokr/xit/fims/base/UserController.java b/src/main/java/cokr/xit/fims/base/UserController.java index a40b9fe3..0cc9435c 100644 --- a/src/main/java/cokr/xit/fims/base/UserController.java +++ b/src/main/java/cokr/xit/fims/base/UserController.java @@ -19,17 +19,42 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.user.ManagedUser; import cokr.xit.fims.cmmn.DirectoryStructureToJson; import cokr.xit.fims.cmmn.DirectoryStructureToJson.Node; +import cokr.xit.fims.cmmn.dao.FactionMapper; import cokr.xit.fims.crdn.service.bean.ImportServiceBean; +import cokr.xit.foundation.data.DataObject; import cokr.xit.interfaces.smg.service.bean.SmgServiceBean; @Controller public class UserController extends cokr.xit.base.user.web.UserController { + + @Resource(name="factionMapper") + FactionMapper factionMapper; + @Resource SmgServiceBean smgServiceBean; @Resource ImportServiceBean importServiceBean; + @Override + public ModelAndView main() { + ModelAndView mav = super.main(); + return mav; + } + + @Override + public ModelAndView getInfo(String userID) { + ModelAndView mav = super.getInfo(userID); + + mav.addObject("allFactionList", factionMapper.selectAllFactionList()); + + DataObject params = new DataObject().set("currentUser", currentUser()); + List ableFactionList = factionMapper.selectAbleFactionList(params); + mav.addObject("ableFactionList", ableFactionList); + + return mav; + } + @RequestMapping(name="최고관리자 메인",value="/superUser/main.do") public ModelAndView superUserMain() { ModelAndView mav = new ModelAndView(); diff --git a/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java b/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java new file mode 100644 index 00000000..92722ed7 --- /dev/null +++ b/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java @@ -0,0 +1,37 @@ +package cokr.xit.fims.cmmn.dao; + +import java.util.List; +import java.util.Map; + +import org.egovframe.rte.psl.dataaccess.mapper.Mapper; + +import cokr.xit.foundation.component.AbstractMapper; +import cokr.xit.foundation.data.DataObject; + +/** 소속 정보 DAO +* +*

상세 설명: +* +* 

+* ============ 변경 이력 ============
+* 2023-09-15	leebj 최초 작성
+* ================================
+*
+*/ +@Mapper("factionMapper") +public interface FactionMapper extends AbstractMapper { + + /**모든 기관,부서 목록을 반환한다.
+ * @param + * @return 기관,부서 목록 + */ + List selectAllFactionList(); + + /**사용가능한 기관,부서 목록을 반환한다.
+ * @param stringMap + * @param + * @return 기관,부서 목록 + */ + List selectAbleFactionList(Map params); + +} diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml index bc46fb60..c2b818d4 100644 --- a/src/main/resources/sql/mapper/base/user-mapper.xml +++ b/src/main/resources/sql/mapper/base/user-mapper.xml @@ -180,6 +180,7 @@ UPDATE TB_USER SET , GRP_ID = #{groupID} , ORG_ID = #{orgID} , NSTT_CD = #{institute} + , DEPT_CD = #{deptCode} , CRTFC_DN = #{certificateDn} , MDFCN_DT = , MDFR = #{modifiedBy} diff --git a/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml new file mode 100644 index 00000000..f6e8ce5c --- /dev/null +++ b/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp index 9dcb9941..82b35edb 100644 --- a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp @@ -4,19 +4,58 @@
-
+
+ +
+ +
+
+
+
+
+
+
-
-
@@ -26,7 +65,7 @@
-
@@ -36,7 +75,7 @@