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

Merge branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
subsub 2024-01-24 10:37:34 +09:00
commit 4261c51c1e
5 changed files with 2772 additions and 2692 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java
View File

@ -588,6 +588,9 @@ public class EgovUserManageController {
model.addAttribute("userSearchVO", userSearchVO); model.addAttribute("userSearchVO", userSearchVO);
model.addAttribute("userManageVO", userManageVO); model.addAttribute("userManageVO", userManageVO);
System.out.println("userManageVO");
System.out.println(userManageVO);
if(userManageVO == null){ if(userManageVO == null){
/*redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("fail.common.select")); /*redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("fail.common.select"));
RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/umt/user/EgovUserManage.do"); RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/umt/user/EgovUserManage.do");
@ -773,6 +776,34 @@ public class EgovUserManageController {
RedirectAttributes redirectAttributes, RedirectAttributes redirectAttributes,
Model model) throws Exception { Model model) throws Exception {
String s_authorCode = request.getParameter("authorCode");
String[] s_arr = request.getParameterValues("userWork");
if ("ROLE_ADR_JRSDC".equals(s_authorCode)) { //기소유예관할인 경우
userManageVO.setUserWork(s_arr[1]);
}else {
userManageVO.setUserWork(s_arr[0].replaceAll(","+s_arr[1], ""));
}
/*
System.out.println(request.getParameter("authorCode"));
System.out.println(request.getParameter("authorCode"));
System.out.println(request.getParameter("userWork"));
System.out.println("start");
for (int i=0;i<s_arr.length;i++) {
System.out.println(s_arr[i]);
}
System.out.println("start-end");
//System.out.println(request.getParameterValues("userWork"));
System.out.println(request.getParameter("userWork"));
*/
/*if (!EgovDoubleSubmitHelper.checkAndSaveToken("someKey")){ /*if (!EgovDoubleSubmitHelper.checkAndSaveToken("someKey")){
return "redirect:/uss/umt/user/EgovUserManage.do"; return "redirect:/uss/umt/user/EgovUserManage.do";
}*/ }*/

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

@ -749,6 +749,12 @@ public class CndtnTrgtMngController {
comDefaultSexCodeVO.setCodeDc(cndtnTrgtMngVO.getSex()); comDefaultSexCodeVO.setCodeDc(cndtnTrgtMngVO.getSex());
cndtnTrgtMngVO.setSex( egovCmmUseService.selectCmmCodeDetailCode(comDefaultSexCodeVO) ); cndtnTrgtMngVO.setSex( egovCmmUseService.selectCmmCodeDetailCode(comDefaultSexCodeVO) );
// 관할청
ComDefaultCodeVO comDefaultCmptntCodeVO = new ComDefaultCodeVO();
comDefaultCmptntCodeVO.setCodeId("VEA008");
comDefaultCmptntCodeVO.setCodeDc(cndtnTrgtMngVO.getCmptntAthrt());
cndtnTrgtMngVO.setCmptntAthrt( egovCmmUseService.selectCmmCodeDetailCode(comDefaultCmptntCodeVO) );
//암호화 //암호화
cndtnTrgtMngVO = egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtMngVO); cndtnTrgtMngVO = egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtMngVO);

21
src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert.jsp
View File

@ -17,6 +17,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> <%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %>
<!DOCTYPE html> <!DOCTYPE html>
@ -69,6 +70,9 @@ $( document ).ready(function(){
$("#orgDepth_02").niceSelect(); //display show 기능 $("#orgDepth_02").niceSelect(); //display show 기능
} */ } */
$('#userWork_case1').show();
$('#userWork_case2').hide();
}); });
function authorChange(obj) { function authorChange(obj) {
@ -83,6 +87,14 @@ function authorChange(obj) {
$("#rank1").attr('disabled', true); $("#rank1").attr('disabled', true);
$("#rank2").attr('disabled', false); $("#rank2").attr('disabled', false);
} }
if (obj.options[obj.selectedIndex].value=='ROLE_ADR_JRSDC'){
$('#userWork_case1').hide();
$('#userWork_case2').show();
}else{
$('#userWork_case1').show();
$('#userWork_case2').hide();
}
} }
@ -421,8 +433,13 @@ function wrapWindowByMask(){
<tr> <tr>
<th>담당업무</th> <th>담당업무</th>
<td colspan="3"> <td colspan="3">
<form:input path="userWork" id="userWork" cssClass="txaIpt" size="20" maxlength="15" placeholder="" /> <div style="display:;" id="userWork_case1">
<form:errors path="userWork" cssClass="error" /> <form:input path="userWork" id="userWork" cssClass="txaIpt" size="20" maxlength="15" placeholder="" />
<form:errors path="userWork" cssClass="error" />
</div>
<div style="display:;" id="userWork_case2">
<ve:select codeId="VEA008" name="userWork" id="userWork" styleClass="sel_type1" selectedValue="${userManageVO.userWork}" defaultValue=""/>
</div>
</td> </td>
</tr> </tr>

30
src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp
View File

@ -18,6 +18,7 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> <%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@ -73,6 +74,14 @@ $( document ).ready(function(){
$("#rank1").attr('disabled', true); $("#rank1").attr('disabled', true);
$("#rank2").attr('disabled', false); $("#rank2").attr('disabled', false);
} }
if("${userManageVO.authorCode}" == "ROLE_ADR_JRSDC"){
$('#userWork_case1').hide();
$('#userWork_case2').show();
}else{
$('#userWork_case1').show();
$('#userWork_case2').hide();
}
}); });
function setOrgDepth_01(){ function setOrgDepth_01(){
@ -324,6 +333,17 @@ function authorChange(obj) {
$("#rank1").attr('disabled', true); $("#rank1").attr('disabled', true);
$("#rank2").attr('disabled', false); $("#rank2").attr('disabled', false);
} }
//alert(obj.options[obj.selectedIndex].value);
if (obj.options[obj.selectedIndex].value=='ROLE_ADR_JRSDC'){
$('#userWork_case1').hide();
$('#userWork_case2').show();
}else{
$('#userWork_case1').show();
$('#userWork_case2').hide();
}
} }
</script> </script>
</head> </head>
@ -440,8 +460,14 @@ function authorChange(obj) {
<tr> <tr>
<th>담당업무</th> <th>담당업무</th>
<td colspan="3"> <td colspan="3">
<form:input path="userWork" id="userWork" cssClass="txaIpt" size="50" maxlength="15" placeholder="" /> <div style="display:;" id="userWork_case1">
<form:errors path="userWork" cssClass="error" /> <form:input path="userWork" id="userWork" cssClass="txaIpt" size="50" maxlength="15" placeholder="" />
<form:errors path="userWork" cssClass="error" />
</div>
<div style="display:;" id="userWork_case2">
<ve:select codeId="VEA008" name="userWork" id="userWork" styleClass="sel_type1" selectedValue="${userManageVO.userWork}" defaultValue=""/>
</div>
</td> </td>
</tr> </tr>

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

@ -887,7 +887,7 @@
</th> </th>
<td> <td>
<label for="trgtPrsnl" class="label">학생 수 입력</label> <label for="trgtPrsnl" class="label">학생 수 입력</label>
<input type="text" name="trgtPrsnl" id="trgtPrsnl" onkeyup="onlyNumber(this);" maxlength="4" value="${info.trgtPrsnl}" size="20"> 명 <input type="text" name="trgtPrsnl" id="trgtPrsnl" onkeyup="onlyNumber(this);" onblur="onlyNumber(this);" maxlength="4" value="${info.trgtPrsnl}" size="20"> 명
</td> </td>
<th scope="row"> <th scope="row">
<p class="req_text"><span>필수입력 항목</span>*</p> <p class="req_text"><span>필수입력 항목</span>*</p>
@ -922,7 +922,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);" 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>