tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2024-01-30 15:37 기소 유예 개선 사항 적용

Browse Source
This commit is contained in:
myname 2024-01-30 15:57:34 +09:00
parent cc1821c462
commit 762d39ff8b
7 changed files with 274 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
View File

@ -1176,11 +1176,8 @@ public class CndtnTrgtMngController {
} }
*/ */
List<CndtnTrgtMngVO> cndtnTrgtInfoMngVOList = this._getMergeSearchList(model, cndtnTrgtInfoMngVO); List<CndtnTrgtMngVO> cndtnTrgtInfoMngVOList = this._getMergeSearchList(model, cndtnTrgtInfoMngVO);
System.out.println("=========================================="); //복호화
System.out.println("==========================================");
//복호화
cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList);
model.addAttribute("list", cndtnTrgtInfoMngVOList); model.addAttribute("list", cndtnTrgtInfoMngVOList);
@ -1201,10 +1198,17 @@ public class CndtnTrgtMngController {
//복호화 //복호화
cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList); cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList);
model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList);
//상위 병합 대상자
List<CndtnTrgtMngVO> cndtnTrgtInfoTopMngVOList = this._getTopMergeList(cndtnTrgtInfoMngVO);
System.out.println("=========================================="); //복호화
cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoTopMngVOList);
model.addAttribute("listTopMerge", cndtnTrgtInfoTopMngVOList);
return "oprtn/cndtnSspnIdtmt/trgtDetail"; return "oprtn/cndtnSspnIdtmt/trgtDetail";
} }
@ -1256,13 +1260,17 @@ public class CndtnTrgtMngController {
//병합 대상자 리스트 //병합 대상자 리스트
List<CndtnTrgtMngVO> cndtnTrgtInfoMergeVOList = this._getMergeList(cndtnTrgtInfoMngVO); List<CndtnTrgtMngVO> cndtnTrgtInfoMergeVOList = this._getMergeList(cndtnTrgtInfoMngVO);
//복호화 //복호화
cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList); cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList);
model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList);
//상위 병합 대상자
List<CndtnTrgtMngVO> cndtnTrgtInfoTopMngVOList = this._getTopMergeList(cndtnTrgtInfoMngVO);
System.out.println("=========================================="); //복호화
cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoTopMngVOList);
model.addAttribute("listTopMerge", cndtnTrgtInfoTopMngVOList);
return "oprtn/cndtnSspnIdtmt/trgtMngDetail"; return "oprtn/cndtnSspnIdtmt/trgtMngDetail";
} }
@ -2199,4 +2207,24 @@ public class CndtnTrgtMngController {
return cndtnTrgtInfoMergeVOList; return cndtnTrgtInfoMergeVOList;
//model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); //model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList);
} }
//상위 병합 대상자
private List<CndtnTrgtMngVO> _getTopMergeList(
CndtnTrgtMngVO p_cndtnTrgtInfoMngVO
)throws Exception{
//병합 대상자 리스트
List<CndtnTrgtMngVO> cndtnTrgtInfoMergeVOList = new ArrayList<CndtnTrgtMngVO>();
{
p_cndtnTrgtInfoMngVO.setTrgtNm("");
p_cndtnTrgtInfoMngVO.setFirstIndex(0);
p_cndtnTrgtInfoMngVO.setRecordCountPerPage(100000);
p_cndtnTrgtInfoMngVO.setSearchQuery(" AND a.sspn_idtmt_trgt_ord =(SELECT prcs_aplct_prd_ord_cmplt FROM vea_sspn_idmt_trgt WHERE sspn_idtmt_trgt_ord='"+p_cndtnTrgtInfoMngVO.getSspnIdtmtTrgtOrd()+"') ");
cndtnTrgtInfoMergeVOList = cndtnTrgtInfoMngService.selectPagingList(p_cndtnTrgtInfoMngVO);
}
return cndtnTrgtInfoMergeVOList;
//model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList);
}
} }

105
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp
View File

@ -352,8 +352,9 @@
</div> </div>
</div> </div>
<c:if test="${not empty listMerge }">
<div class="tb_tit01"> <div class="tb_tit01">
<p>병합 대상자</p> <p>하위 병합 대상자</p>
</div> </div>
<!-- list --> <!-- list -->
@ -448,13 +449,113 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</c:if>
<c:if test="${not empty listTopMerge }">
<div class="tb_tit01">
<p>상위 중복자</p>
</div>
<!-- list -->
<div class="tb_type01">
<table>
<colgroup>
<col style="width: 100px">
<col style="width: 100px">
<col style="width: 80px">
<col style="width: 100px">
<col style="width: 80px">
<col style="width: 60px">
<col style="width: 140px">
<col style="width: 80px">
<col style="width: 80px">
<col style="width: auto">
<col style="width: 80px">
<col style="width: 100px">
</colgroup>
<thead>
<tr>
<th>의뢰일</th>
<th>사건번호</th>
<th>관할청</th>
<th>생년월일</th>
<th>성명</th>
<th>성별</th>
<th>의뢰번호</th>
<th>의뢰상태</th>
<th>교육상태</th>
<th>주소</th>
<th>검사명</th>
<th>삭제</th>
</tr>
</thead>
<tbody>
<c:forEach var="list" items="${listTopMerge}" varStatus="status">
<%-- <tr class="listCount" onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;"> --%>
<tr>
<%-- <td onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;"> --%>
<%-- <c:out value='${list.prcsNm}'/> --%>
<!-- </td> -->
<td>
<c:set var="reqPnttm" value="${fn:substring(list.reqPnttm, 0, 10)}" />
<%-- <fmt:formatDate value="${list.reqPnttm }" pattern="yyyy-MM-dd" /> --%>
<c:out value="${reqPnttm }" />
</td>
<td>
<c:out value="${list.vntNmbr }" />
</td>
<td>
<c:out value="${list.cmptntAthrt }" />
</td>
<td>
<c:out value="${list.dBirth }" />
</td>
<td>
<c:out value="${list.trgtNm }" />
</td>
<td>
<ve:code codeId="COM014" code="${list.sex }"/>
</td>
<td>
<c:out value="${list.reqNmbr }" />
</td>
<td>
<ve:code codeId="VEA005" code="${list.reqStateCd }"/>
</td>
<td>
<ve:code codeId="VEA002" code="${list.eduStateCd }"/>
</td>
<c:set var="fullAddr" value="${list.addr} ${list.addrDetail}" />
<%-- <c:set var="fullAddr" value="${list.addr}" /> --%>
<td title="${fullAddr}">
<c:out value="${list.addr }" />
<c:out value="${list.addrDetail }" />
<%-- ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} --%>
</td>
<td>
<c:out value="${list.prsctrNm }" />
</td>
<td>
<button type="button" class="btn_type05" onclick="fncDel('${info.sspnIdtmtTrgtOrd}'); return false;">병합취소</button>
</td>
</tr>
</c:forEach>
<c:if test="${empty listTopMerge}">
<tr><td colspan="12"><spring:message code="common.nodata.msg" /></td></tr>
</c:if>
</tbody>
</table>
</div>
</c:if>
<c:if test="${empty info.prcsAplctPrdOrdCmplt }"> <c:if test="${empty info.prcsAplctPrdOrdCmplt }">
<div class="tb_tit01"> <div class="tb_tit01">
<p>병합 대상자 검색</p> <p>하위 병합 대상자 검색</p>
</div> </div>
<!-- list_top --> <!-- list_top -->

22
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
View File

@ -606,7 +606,14 @@
</thead> </thead>
<tbody> <tbody>
<c:forEach var="list" items="${list}" varStatus="status"> <c:forEach var="list" items="${list}" varStatus="status">
<tr class="listCount"> <tr class="listCount"
<c:if test="${empty list.prcsAplctPrdOrdCmplt}">
style="cursor:pointer;"
</c:if>
<c:if test="${not empty list.prcsAplctPrdOrdCmplt}">
style="cursor:pointer;background-color:lightgray;"
</c:if>
>
<td> <td>
<input name="chk" <input name="chk"
@ -636,9 +643,22 @@
<td onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;"> <td onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;">
<c:out value="${list.reqNmbr }" /> <c:out value="${list.reqNmbr }" />
</td> </td>
<!--
<td onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;"> <td onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;">
<ve:code codeId="VEA005" code="${list.reqStateCd }"/> <ve:code codeId="VEA005" code="${list.reqStateCd }"/>
</td> </td>
-->
<!-- 의뢰상태 -->
<td onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;">
<c:if test="${empty list.prcsAplctPrdOrdCmplt}">
<ve:code codeId="VEA005" code="${list.reqStateCd }"/>
</c:if>
<c:if test="${not empty list.prcsAplctPrdOrdCmplt}">
병합처리
</c:if>
</td>
<td> <td>
<ve:code codeId="VEA002" code="${list.eduStateCd }"/> <ve:code codeId="VEA002" code="${list.eduStateCd }"/>
</td> </td>

106
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp
View File

@ -351,8 +351,10 @@
</div> </div>
</div> </div>
<c:if test="${not empty listMerge }">
<div class="tb_tit01"> <div class="tb_tit01">
<p>병합 대상자</p> <p>하위 병합 대상자</p>
</div> </div>
<!-- list --> <!-- list -->
@ -448,12 +450,112 @@
</table> </table>
</div> </div>
</c:if>
<c:if test="${not empty listTopMerge }">
<div class="tb_tit01">
<p>상위 중복자</p>
</div>
<!-- list -->
<div class="tb_type01">
<table>
<colgroup>
<col style="width: 100px">
<col style="width: 100px">
<col style="width: 80px">
<col style="width: 100px">
<col style="width: 80px">
<col style="width: 60px">
<col style="width: 140px">
<col style="width: 80px">
<col style="width: 80px">
<col style="width: auto">
<col style="width: 80px">
<col style="width: 100px">
</colgroup>
<thead>
<tr>
<th>의뢰일</th>
<th>사건번호</th>
<th>관할청</th>
<th>생년월일</th>
<th>성명</th>
<th>성별</th>
<th>의뢰번호</th>
<th>의뢰상태</th>
<th>교육상태</th>
<th>주소</th>
<th>검사명</th>
<th>삭제</th>
</tr>
</thead>
<tbody>
<c:forEach var="list" items="${listTopMerge}" varStatus="status">
<%-- <tr class="listCount" onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;"> --%>
<tr>
<%-- <td onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;"> --%>
<%-- <c:out value='${list.prcsNm}'/> --%>
<!-- </td> -->
<td>
<c:set var="reqPnttm" value="${fn:substring(list.reqPnttm, 0, 10)}" />
<%-- <fmt:formatDate value="${list.reqPnttm }" pattern="yyyy-MM-dd" /> --%>
<c:out value="${reqPnttm }" />
</td>
<td>
<c:out value="${list.vntNmbr }" />
</td>
<td>
<c:out value="${list.cmptntAthrt }" />
</td>
<td>
<c:out value="${list.dBirth }" />
</td>
<td>
<c:out value="${list.trgtNm }" />
</td>
<td>
<ve:code codeId="COM014" code="${list.sex }"/>
</td>
<td>
<c:out value="${list.reqNmbr }" />
</td>
<td>
<ve:code codeId="VEA005" code="${list.reqStateCd }"/>
</td>
<td>
<ve:code codeId="VEA002" code="${list.eduStateCd }"/>
</td>
<c:set var="fullAddr" value="${list.addr} ${list.addrDetail}" />
<%-- <c:set var="fullAddr" value="${list.addr}" /> --%>
<td title="${fullAddr}">
<c:out value="${list.addr }" />
<c:out value="${list.addrDetail }" />
<%-- ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} --%>
</td>
<td>
<c:out value="${list.prsctrNm }" />
</td>
<td>
<button type="button" class="btn_type05" onclick="fncDel('${info.sspnIdtmtTrgtOrd}'); return false;">병합취소</button>
</td>
</tr>
</c:forEach>
<c:if test="${empty listTopMerge}">
<tr><td colspan="12"><spring:message code="common.nodata.msg" /></td></tr>
</c:if>
</tbody>
</table>
</div>
</c:if>
<c:if test="${empty info.prcsAplctPrdOrdCmplt }"> <c:if test="${empty info.prcsAplctPrdOrdCmplt }">
<div class="tb_tit01"> <div class="tb_tit01">
<p>병합 대상자 검색</p> <p>하위 병합 대상자 검색</p>
</div> </div>
<!-- list_top --> <!-- list_top -->

1
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
View File

@ -583,7 +583,6 @@
<c:if test="${not empty list.prcsAplctPrdOrdCmplt}"> <c:if test="${not empty list.prcsAplctPrdOrdCmplt}">
병합처리 병합처리
</c:if> </c:if>
</td> </td>
<td><!-- 교육상태 --> <td><!-- 교육상태 -->
<ve:code codeId="VEA002" code="${list.eduStateCd }"/> <ve:code codeId="VEA002" code="${list.eduStateCd }"/>

2
src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp
View File

@ -150,7 +150,7 @@
<p><i></i>운영확정 <span>${exprnMap['exprnIng']}</span>건</p> <p><i></i>운영확정 <span>${exprnMap['exprnIng']}</span>건</p>
</a> </a>
<a href="#" onclick="fn_goExprnListForm(80)"> <a href="#" onclick="fn_goExprnListForm(80)">
<p><i></i>교육종료 <span>${exprnMap['exprnEnd']}</span>건</p> <p><i></i>운영종료 <span>${exprnMap['exprnEnd']}</span>건</p>
</a> </a>
</div> </div>
</div> </div>

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp
View File

@ -954,7 +954,7 @@
</th> </th>
<td> <td>
<label for="needTxtbNum" class="label">필요 교재 수량 입력</label> <label for="needTxtbNum" class="label">필요 교재 수량 입력</label>
<input type="text" name="needTxtbNum" id="needTxtbNum" onkeyup="onlyNumber(this);" onblur="onlyNumber(this);" value="${info.needTxtbNum}" title="필요 교재 수량" size="20" maxlength="4"> <input type="text" name="needTxtbNum" id="needTxtbNum" onkeyup="onlyNumber(this);" onblur="onlyNumber(this);" value="${info.needTxtbNum}" title="필요 교재 수량" size="20" maxlength="4"> 권
</td> </td>
</tr> </tr>
</tbody> </tbody>