refactor:[PMS:#2940] 수정 종료
This commit is contained in:
hylee
parent
0739d38f04
commit
8bc14484f0
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -110,4 +110,14 @@
|
||||
|
||||
</select>
|
||||
|
||||
<select id="adjRpplDAO.findOfRpplBizNm" parameterClass="String" resultClass="AdjRpplVO">
|
||||
|
||||
SELECT a.rppl_usr_ty AS rpplUsrTy
|
||||
, a.rppl_biz_nm AS rpplBizNm
|
||||
FROM adr_rppl a
|
||||
WHERE a.adr_seq = #adrSeq#
|
||||
AND a.rppl_ty = '10'
|
||||
|
||||
</select>
|
||||
|
||||
</sqlMap>
|
||||
@ -210,7 +210,6 @@
|
||||
<div class="tbType03">
|
||||
<table>
|
||||
<colgroup>
|
||||
<col style="width: 42px;">
|
||||
<col style="width: 15%;">
|
||||
<col style="width: 25%;">
|
||||
<col style="width: auto;">
|
||||
@ -219,11 +218,6 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
<!-- <input type="checkbox" name="checkAll" id="checkAll" onclick="fncCheckAll(this, 'ckAdrList')"> -->
|
||||
<input type="checkbox" name="chkAll" value="All" title="모두체크">
|
||||
<label for="checkAll"></label>
|
||||
</th>
|
||||
<th>
|
||||
일자
|
||||
<button type="button" class="btn_sort">▲</button>
|
||||
</th>
|
||||
@ -235,21 +229,6 @@
|
||||
<tbody>
|
||||
<c:forEach var="list" items="${list}" varStatus="status">
|
||||
<tr>
|
||||
<td>
|
||||
<p>
|
||||
<c:choose>
|
||||
<c:when test="${list.adrDocCn1 eq 'Y' && list.adrDocCn2 eq '0'}">
|
||||
<input name="chk" type="checkbox" value="" title="체크" disabled="disabled">
|
||||
</c:when>
|
||||
<%-- <c:when test="${list.adrDocCn1 eq 'Y' && list.adrDocCn2 ne '0'}">
|
||||
|
||||
</c:when> --%>
|
||||
<c:otherwise>
|
||||
<input name="chk" type="checkbox" value="${list.atchFileId}-${list.fileSn}" title="체크">
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</p>
|
||||
</td>
|
||||
<td>
|
||||
<p>${list.frstRegistPnttm}</p>
|
||||
</td>
|
||||
@ -266,18 +245,18 @@
|
||||
</p>
|
||||
</td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${list.adrDocCn2 eq '0' }">
|
||||
<%-- <c:choose> --%>
|
||||
<%-- <c:when test="${list.adrDocCn2 eq '0' }"> --%>
|
||||
<a href="#" onclick="fn_adjstReq_preview('<c:out value="${info.adrSeq}" />'); return false;">${list.adrDocTy}</a>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<%-- </c:when> --%>
|
||||
<%-- <c:otherwise> --%>
|
||||
<%-- <a href="<c:url value='/cmm/fms/FileDown.do?atchFileId=${list.atchFileId}&&fileSn=${list.fileSn}'/>" title="첨부파일 다운로드" targe="_blank">
|
||||
<c:out value="${list.adrDocTy}"></c:out>
|
||||
</a> --%>
|
||||
<!-- pdf 뷰어로 일단 보여주기_이준호_221109 -->
|
||||
<a href="http://192.168.0.176:8085/streamdocs/view/sd;streamdocsId=oeVmgWE9e_IUJP_bTHVkhtjmWBCUBmNwkxGenGKMF4U"><c:out value="${list.adrDocTy}"/></a>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<%-- <a href="http://192.168.0.176:8085/streamdocs/view/sd;streamdocsId=oeVmgWE9e_IUJP_bTHVkhtjmWBCUBmNwkxGenGKMF4U"><c:out value="${list.adrDocTy}"/></a> --%>
|
||||
<%-- </c:otherwise> --%>
|
||||
<%-- </c:choose> --%>
|
||||
</td>
|
||||
<td>
|
||||
<p>
|
||||
|
||||
@ -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"); %>
|
||||
<un:useConstants var="KccadrConstants" className="kcc.kccadr.cmm.KccadrConstants" />
|
||||
<%
|
||||
/**
|
||||
@ -1012,7 +1013,18 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row" class=""><p>신청인</p></th>
|
||||
<td><c:out value='${info.appliCantNm}' /></td>
|
||||
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${info.rpplUsrTy eq '02'}">
|
||||
<c:out value="${info.rpplBizNm}"/> (대표: <c:out value="${info.appliCantNm}"/>)
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:out value="${info.appliCantNm}"/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
|
||||
<th scope="row" class=""><p>신청인의 대리인</p></th>
|
||||
<td>
|
||||
<c:if test="${not empty info.depuTyNm}">
|
||||
@ -1138,15 +1150,23 @@
|
||||
<th scope="row" class=""><p>신청취지</p></th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="reqTempCn"><c:out value="${info.reqTempCn1 }"/></td>
|
||||
<td class="reqCn"><c:out value="${info.reqCn1 }"/></td>
|
||||
<td class="reqTempCn">
|
||||
${fn:replace(info.reqTempCn1, replaceChar, "<br/>")}
|
||||
</td>
|
||||
<td class="reqCn">
|
||||
${fn:replace(info.reqCn1, replaceChar, "<br/>")}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row" class=""><p>신청원인</p></th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="reqTempCn"><c:out value="${info.reqTempCn2 }"/></td>
|
||||
<td class="reqCn"><c:out value="${info.reqCn2 }"/></td>
|
||||
<td class="reqTempCn">
|
||||
${fn:replace(info.reqTempCn2, replaceChar, "<br/>")}
|
||||
</td>
|
||||
<td class="reqCn">
|
||||
${fn:replace(info.reqCn2, replaceChar, "<br/>")}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@ -1167,9 +1187,7 @@
|
||||
|
||||
<%-- <c:out value="${info.reqCn1 }"/> --%>
|
||||
<%-- <c:out value="${info.reqCn2 }"/> --%>
|
||||
<div class="cont">
|
||||
<div id="tabFileContent" class="tab_cont on"></div>
|
||||
</div>
|
||||
<div id="tabFileContent" class="tab_cont on"></div>
|
||||
|
||||
<!-- list_상세 -->
|
||||
<p class="tb_tit" style="display: inline-block">결재진행</p>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user