From 8bc14484f02d78cffc8196b163e7c84e508eb228 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 1 Dec 2022 18:20:43 +0900 Subject: [PATCH] =?UTF-8?q?refactor:[PMS:#2940]=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=A2=85=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/com/cmm/util/MagicDBAPIUtil.java | 13 ++++--- .../web/InternalApprovManageController.java | 16 +++++++-- .../adjRppl/service/AdjRpplService.java | 2 ++ .../adjRppl/service/impl/AdjRpplDAO.java | 4 +++ .../service/impl/AdjRpplServiceImpl.java | 4 +++ .../kccadr/adjrppl/AdjRppl_SQL_Mysql.xml | 10 ++++++ .../internalApprovManageDetailFileView.jsp | 35 ++++--------------- .../iam/internalApprovManageDetail.jsp | 34 +++++++++++++----- 8 files changed, 75 insertions(+), 43 deletions(-) diff --git a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java index 8e40d377..da8be385 100644 --- a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java +++ b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java @@ -14,9 +14,12 @@ public final class MagicDBAPIUtil { private static final Logger log = LoggerFactory.getLogger(MagicDBAPIUtil.class); // 정책 명 -// @Value("#{globalSettings['Globals.MagicDB.PolicyName']}") private static String POLICY_NAME = "POLICY001"; + +// @Value("#{globalSettings['Globals.MagicDB.PolicyName']}") +// private static String POLICY_NAME; + /** * @methodName : encryptAdjReqMgrPastData * @author : 이호영 @@ -32,13 +35,13 @@ public final class MagicDBAPIUtil { } public static String encryptOnlyOneString(String stringVal) { -// return MagicDBAPI.encrypt(POLICY_NAME, stringVal); - return stringVal; + return MagicDBAPI.encrypt(POLICY_NAME, stringVal); +// return stringVal; } public static String decryptOnlyOneString(String stringVal) { -// return MagicDBAPI.decrypt(POLICY_NAME, stringVal); - return stringVal; + return MagicDBAPI.decrypt(POLICY_NAME, stringVal); +// return stringVal; } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java index c23e4c61..3906e954 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; +import ch.qos.logback.classic.Logger; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -43,6 +44,8 @@ import kcc.kccadr.adjPgrMgr.ent.service.EntService; import kcc.kccadr.adjPgrMgr.ent.service.EntVO; import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageService; import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; +import kcc.kccadr.adjRppl.service.AdjRpplService; +import kcc.kccadr.adjRppl.service.AdjRpplVO; import kcc.kccadr.adjcclt.service.AdjstConciliatorService; import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; @@ -104,6 +107,9 @@ public class InternalApprovManageController { //조정사건 이력관리 일련번호 @Resource(name="adrHstryMgrSeqGnrService") private EgovIdGnrService adrHstryMgrSeqGnrService; + + @Resource(name="adjRpplService") + private AdjRpplService adjRpplService; // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @@ -238,8 +244,14 @@ public class InternalApprovManageController { /* 신청 취지, 원인 글자수 줄여서 Temp에 넣음 */ - info.setReqTempCn1(StringUtils.abbreviate(info.getReqCn1(), 320)); - info.setReqTempCn2(StringUtils.abbreviate(info.getReqCn2(), 320)); + info.setReqTempCn1(StringUtils.abbreviate(info.getReqCn1(), 250)); + info.setReqTempCn2(StringUtils.abbreviate(info.getReqCn2(), 250)); + + // 20221201 이호영 + // 법인일 경우 법인명+대표자명 노출 + AdjRpplVO rpplVO = adjRpplService.findOfRpplBizNm(info.getAdrSeq()); + info.setRpplUsrTy(rpplVO.getRpplUsrTy()); + info.setRpplBizNm(rpplVO.getRpplBizNm()); model.addAttribute("info", info); model.addAttribute("approvLine", approvLine); diff --git a/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java b/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java index bb6238e5..8f3016fd 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java @@ -41,4 +41,6 @@ public interface AdjRpplService { public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) throws Exception; public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception; + + public AdjRpplVO findOfRpplBizNm(String adrSeq); } diff --git a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java index 0e29ae62..ca4a66c6 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java @@ -65,4 +65,8 @@ public class AdjRpplDAO extends EgovAbstractDAO { public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception { return (AdjRpplVO) select("adjRpplDAO.selectAdjRpplInfo", adjRpplVO); } + + public AdjRpplVO findOfRpplBizNm(String adrSeq) { + return (AdjRpplVO) select("adjRpplDAO.findOfRpplBizNm", adrSeq); + } } diff --git a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java index 0f3e2ee6..a80abbee 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java @@ -88,6 +88,10 @@ public class AdjRpplServiceImpl extends EgovAbstractServiceImpl implements AdjR public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception { return adjRpplDAO.selectAdjRpplInfo(adjRpplVO); } + @Override + public AdjRpplVO findOfRpplBizNm(String adrSeq) { + return adjRpplDAO.findOfRpplBizNm(adrSeq); + } } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml index 18cc0e2e..12e4463b 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml @@ -110,4 +110,14 @@ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView.jsp index 91070d5e..8ede7b54 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView.jsp @@ -210,7 +210,6 @@
- @@ -219,11 +218,6 @@ - @@ -235,21 +229,6 @@ - @@ -266,18 +245,18 @@

- + + + - - + + - - + +
- - - - 일자
-

- - - - - <%-- - - --%> - - - - -

-

${list.frstRegistPnttm}

 - - +<%-- --%> +<%-- --%> '); return false;">${list.adrDocTy} - - +<%-- --%> +<%-- --%> <%--   --%> - - - +<%-- --%> +<%-- --%> +<%-- --%>

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp index 156f202c..95aa1557 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp @@ -11,6 +11,7 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<% pageContext.setAttribute("replaceChar", "\n"); %> <% /** @@ -1012,7 +1013,18 @@

신청인

 + + + (대표: ) + + + + + +

신청인의 대리인

 @@ -1138,15 +1150,23 @@

신청취지
+ ${fn:replace(info.reqTempCn1, replaceChar, "
")} + 		+ ${fn:replace(info.reqCn1, replaceChar, "
")} +

신청원인
+ ${fn:replace(info.reqTempCn2, replaceChar, "
")} + 		+ ${fn:replace(info.reqCn2, replaceChar, "
")} +
@@ -1167,9 +1187,7 @@ <%-- --%> <%-- --%> -
-
-
+

결재진행