From aa3fa1d0ac4b1ba9ea21800ebfc980a864c96a16 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 28 Aug 2023 17:15:08 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=B5=EB=B3=80=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=EB=A7=A4=ED=81=AC=EB=A1=9C=20=EB=AC=B8=EC=9E=90=EC=82=BD?= =?UTF-8?q?=EC=9E=85=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/cvlc/web/Cvlc05Controller.java | 10 +++ .../WEB-INF/jsp/fims/crdn/crdn02020-main.jsp | 2 +- .../WEB-INF/jsp/fims/crdn/crdn02050-info.jsp | 4 +- .../WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp | 2 +- .../WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp | 66 +++++++++++++++++-- .../resources/js/fims/cvlc/answerWords.js | 39 +++++++++-- 6 files changed, 110 insertions(+), 13 deletions(-) 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 e759f6b9..bfd830c1 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java @@ -10,11 +10,14 @@ import org.springframework.web.bind.annotation.RequestMapping; 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; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.cvlc.service.CrdnCvlcptService; +import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; /**민원신고답변 문구 관리 서비스 웹 컨트롤러.
@@ -29,6 +32,9 @@ public class Cvlc05Controller extends ApplicationController { @Resource(name="globalStngMapper") private GlobalStngMapper globalStngMapper; + @Resource(name="userMapper") + private UserMapper userMapper; + /** 민원신고 답변 문구 관리 메인화면을 연다. * @return fims/cvlc/cvlc05010-main */ @@ -38,6 +44,10 @@ public class Cvlc05Controller extends ApplicationController { mav.addObject("pageName", "cvlc05010-main"); mav.addObject("module", "type='module'"); + mav.addObject("currentUserName", UserInfo.current().getName()); + ManagedUser currentUser = userMapper.getUser(UserInfo.current().getAccount(), UserInfo.current().getInstitute()); + mav.addObject("currentUserTelno", currentUser.getPhoneNo()); + Map> commonCodes = getCodesOf("FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02020-main.jsp index 03def8aa..528a5813 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02020-main.jsp @@ -149,7 +149,7 @@ - + @@ -276,6 +288,7 @@