Merge branch 'JIWOO'
This commit is contained in:
commit
95e80b91c3
@ -224,10 +224,18 @@
|
||||
AA.REG_ID,
|
||||
AA.MEDIATION_SMALL_RB,
|
||||
AA.PROCESS_STOP_DT,
|
||||
AA.PROCESS_START_DT
|
||||
AA.PROCESS_START_DT,
|
||||
CASE
|
||||
WHEN UVS.VIEW_TARGET IS NOT NULL THEN 'Y'
|
||||
ELSE 'N'
|
||||
END AS VIEW_STATUS
|
||||
FROM C_MASTER AA
|
||||
LEFT OUTER JOIN C_CASERCEPT C
|
||||
ON AA.CASE_NO = C.CASE_NO
|
||||
LEFT JOIN UNP_VIEW_STATUS UVS
|
||||
ON AA.RCEPT_NO = UVS.VIEW_TARGET
|
||||
AND UVS.MEMBER_ID = #{memberId}
|
||||
AND UVS.VIEW_TYPE = 'case'
|
||||
<where>
|
||||
AA.TRANSFER_CHECK = 'N'
|
||||
AND AA.DEL_YN = 'N'
|
||||
@ -463,10 +471,18 @@
|
||||
A.REG_ID,
|
||||
A.MEDIATION_SMALL_RB,
|
||||
A.PROCESS_STOP_DT,
|
||||
A.PROCESS_START_DT
|
||||
A.PROCESS_START_DT,
|
||||
CASE
|
||||
WHEN UVS.VIEW_TARGET IS NOT NULL THEN 'Y'
|
||||
ELSE 'N'
|
||||
END AS VIEW_STATUS
|
||||
FROM C_MASTER A
|
||||
LEFT OUTER JOIN C_CASERCEPT C
|
||||
ON A.CASE_NO = C.CASE_NO
|
||||
LEFT JOIN UNP_VIEW_STATUS UVS
|
||||
ON A.RCEPT_NO = UVS.VIEW_TARGET
|
||||
AND UVS.MEMBER_ID = #{memberId}
|
||||
AND UVS.VIEW_TYPE = 'case'
|
||||
<where>
|
||||
A.TRANSFER_CHECK = 'N'
|
||||
AND A.DEL_YN = 'N'
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
||||
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
|
||||
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
|
||||
|
||||
<%@page import="seed.utils.SeedConstants"%>
|
||||
<spring:eval expression="@property['gw.url']" var="gwUrl"/> <!--그룹웨어 개발,운영 서버 구분 -->
|
||||
<spring:eval expression="@property['ngw.url']" var="ngwUrl"/> <!--그룹웨어 개발,운영 서버 구분 -->
|
||||
|
||||
@ -238,7 +238,9 @@ function clipCall(crfNm){
|
||||
<c:choose>
|
||||
<c:when test="${not empty data}">
|
||||
<c:forEach items="${data}" var="list" varStatus="status">
|
||||
<tr>
|
||||
<tr
|
||||
<c:if test="${list.viewStatus != 'Y' && memberPosition == SeedConstants.JOSAGWAN}">style="font-weight: bold;"</c:if>
|
||||
>
|
||||
<c:if test="${groupType != '' and not empty groupType}">
|
||||
<td>
|
||||
<input name="chk" class="${list.caseGubun}" data-state="${list.statePro}" data-caseno="${list.caseNo}" data-rceptno="${list.rceptNo}"
|
||||
|
||||
@ -318,7 +318,10 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach items="${data}" var="list" varStatus="status">
|
||||
<tr>
|
||||
<tr
|
||||
<c:if test="${list.viewStatus != 'Y' && memberPosition == SeedConstants.TIMJANG}">style="font-weight: bold;"</c:if>
|
||||
|
||||
>
|
||||
<td><c:choose>
|
||||
<c:when test="${memberDept == SeedConstants.YUTONG && searchMa == 'N'}">
|
||||
<c:if test="${list.delGubun != 'R'}">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user