Merge branch 'hylee'
This commit is contained in:
commit
70995698c5
@ -111,7 +111,9 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
|
||||
private String addUsrIdList[]; /* ass.addUsrId | ass.assUsrTy | add_yn " */
|
||||
private String addUsrId; /* ass.addUsrId | ass.assUsrTy | add_yn " */
|
||||
private String addAgntList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */
|
||||
|
||||
// 조정기일대리인
|
||||
private String addUsrNmList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */
|
||||
private String adrSn = ""; // 조정회차
|
||||
private String agntSeq = ""; // 대리인일련번호
|
||||
private String agntSbmtYn = ""; // 조정대리신청제출여부
|
||||
@ -1220,6 +1222,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
|
||||
this.appPlaceDetailTx = appPlaceDetailTx;
|
||||
}
|
||||
|
||||
public String[] getAddUsrNmList() {
|
||||
return addUsrNmList;
|
||||
}
|
||||
|
||||
public void setAddUsrNmList(String[] addUsrNmList) {
|
||||
this.addUsrNmList = addUsrNmList;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -680,65 +680,41 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
||||
|
||||
/* 신청인 */
|
||||
AdjAssMgrPastVO adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
|
||||
String addUsrIdS = adjPastVO.getAddUsrIdList()[0];
|
||||
adjAssMgrPastVO.setAssPstSeq(addUsrIdS.split("\\|")[0]);
|
||||
adjAssMgrPastVO.setAddYn(addUsrIdS.split("\\|")[1]);
|
||||
// adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
|
||||
|
||||
/* 피신청인 */
|
||||
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
|
||||
String addUsrIdP = adjPastVO.getAddUsrIdList()[1];
|
||||
adjAssMgrPastVO.setAssPstSeq(addUsrIdP.split("\\|")[0]);
|
||||
adjAssMgrPastVO.setAddYn(addUsrIdP.split("\\|")[1]);
|
||||
// adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
|
||||
|
||||
String assPstUsrNmS = adjPastVO.getAddAgntList()[0];
|
||||
String assPstUsrNmP = adjPastVO.getAddAgntList()[1];
|
||||
|
||||
/* 신청 참관 대리인 */
|
||||
if(StringUtils.isNotEmpty(assPstUsrNmS))
|
||||
{
|
||||
System.out.println("assPstUsrNmS : "+ assPstUsrNmS);
|
||||
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
|
||||
adjAssMgrPastVO.setAssPstSeq(assPstUsrNmS.split("\\|")[0]);
|
||||
adjAssMgrPastVO.setAssPstUsrNm(assPstUsrNmS.split("\\|")[1]);
|
||||
adjAssMgrPastVO.setAddYn("Y");
|
||||
// adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
|
||||
|
||||
}
|
||||
/* 피신청 참관 대리인 */
|
||||
if(StringUtils.isNotEmpty(assPstUsrNmP))
|
||||
for(String addusrList : adjPastVO.getAddUsrIdList())
|
||||
{
|
||||
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
|
||||
adjAssMgrPastVO.setAssPstSeq(assPstUsrNmP.split("\\|")[0]);
|
||||
adjAssMgrPastVO.setAssPstUsrNm(assPstUsrNmP.split("\\|")[1]);
|
||||
adjAssMgrPastVO.setAddYn("Y");
|
||||
}
|
||||
/* 조정부장 필수 값*/
|
||||
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
|
||||
adjAssMgrPastVO.setAssPstUsrTy("01");
|
||||
adjAssMgrPastVO.setAssPstUsrNm(adjPastVO.getAddUsrNm0());
|
||||
adjAssMgrPastVO.setAddYn("Y");
|
||||
|
||||
/* 조정위원 1*/
|
||||
if(StringUtils.isNotEmpty(adjPastVO.getAddUsrNm1()))
|
||||
{
|
||||
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
|
||||
adjAssMgrPastVO.setAssPstUsrTy("02");
|
||||
adjAssMgrPastVO.setAssPstUsrNm(adjPastVO.getAddUsrNm1());
|
||||
adjAssMgrPastVO.setAddYn("Y");
|
||||
adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]);
|
||||
adjAssMgrPastVO.setAddYn(addusrList.split("\\|")[1]);
|
||||
adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
|
||||
}
|
||||
|
||||
|
||||
/* 조정위원 2*/
|
||||
if(StringUtils.isNotEmpty(adjPastVO.getAddUsrNm2()))
|
||||
for(String addusrList : adjPastVO.getAddAgntList())
|
||||
{
|
||||
if(StringUtils.isNotEmpty(addusrList))
|
||||
{
|
||||
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
|
||||
adjAssMgrPastVO.setAssPstUsrTy("02");
|
||||
adjAssMgrPastVO.setAssPstUsrNm(adjPastVO.getAddUsrNm2());
|
||||
adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]);
|
||||
adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[1]);
|
||||
adjAssMgrPastVO.setAddYn("Y");
|
||||
adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
|
||||
}
|
||||
}
|
||||
|
||||
// 조정위원
|
||||
for(String addusrList : adjPastVO.getAddUsrNmList())
|
||||
{
|
||||
if(StringUtils.isNotEmpty(addusrList))
|
||||
{
|
||||
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
|
||||
adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]);
|
||||
adjAssMgrPastVO.setAssPstUsrTy(addusrList.split("\\|")[1]);
|
||||
adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[2]);
|
||||
adjAssMgrPastVO.setAddYn("Y");
|
||||
adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -82,28 +82,31 @@
|
||||
function fncUpdt(p_param) {
|
||||
|
||||
|
||||
// 참관대리인
|
||||
if (!isEmptyObj('addAgntListSTemp')) {
|
||||
var val = $('#addAgntListSSeqTemp').val()+'|'+$('#addAgntListSTemp').val();
|
||||
|
||||
$('#addAgntListS').val(val);
|
||||
}
|
||||
|
||||
|
||||
if (!isEmptyObj('addAgntListPTemp')) {
|
||||
|
||||
$('#addAgntListP').val($('#addAgntListPSeqTemp').val()+'|'+$('#addAgntListPTemp').val());
|
||||
}
|
||||
|
||||
/* 조정위원 */
|
||||
if (!isEmptyObj('addUsrNm0')) {
|
||||
$('#addUsrNmList0').val($('#addUsrSeq0').val()+'|01|'+$('#addUsrNm0').val());
|
||||
}
|
||||
if (!isEmptyObj('addUsrNm1')) {
|
||||
$('#addUsrNmList1').val($('#addUsrSeq1').val()+'|02|'+$('#addUsrNm1').val());
|
||||
}
|
||||
if (!isEmptyObj('addUsrNm2')) {
|
||||
$('#addUsrNmList2').val($('#addUsrSeq2').val()+'|02|'+$('#addUsrNm2').val());
|
||||
}
|
||||
|
||||
if(isValid()){
|
||||
|
||||
|
||||
var f = document.getElementById("listForm");
|
||||
var data = new FormData(f);
|
||||
|
||||
|
||||
|
||||
|
||||
if (confirm('작성된 내용을 수정하시겠습니까?')) {
|
||||
|
||||
$.ajax({
|
||||
@ -216,6 +219,10 @@
|
||||
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${adjPastVO.adrSn}"/>" />
|
||||
<input type="hidden" id="addAgntListS" name="addAgntList" value=""/>
|
||||
<input type="hidden" id="addAgntListP" name="addAgntList" value=""/>
|
||||
<input type="hidden" id="addUsrNmList0" name="addUsrNmList" value=""/>
|
||||
<input type="hidden" id="addUsrNmList1" name="addUsrNmList" value=""/>
|
||||
<input type="hidden" id="addUsrNmList2" name="addUsrNmList" value=""/>
|
||||
|
||||
<div class="cont_wrap">
|
||||
<div class="box">
|
||||
<!-- cont_tit -->
|
||||
@ -434,11 +441,12 @@
|
||||
<td colspan="3">
|
||||
<c:forEach var="assInfo" items="${assInfoList }">
|
||||
<c:if test="${assInfo.assPstUsrTy eq 01}">
|
||||
<c:set var="assPstUsrNm" value="${assInfo.assPstUsrNm }" />
|
||||
<c:set var="assPstUsrNm" value="${assInfo.assPstUsrNm }" />
|
||||
<c:set var="assPstSeq0" value="${assInfo.assPstSeq }" />
|
||||
<c:set var="assPstUsrNm0" value="${assInfo.assPstUsrNm }" />
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
<input type="text" size="30" id="addUsrNm0" name="addUsrNm0" name="addUsrNm0" value="${assPstUsrNm }" />
|
||||
<input type="hidden" id="addUsrSeq0" value="${assPstSeq0 }" />
|
||||
<input type="text" size="30" id="addUsrNm0" value="${assPstUsrNm0 }" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -446,12 +454,12 @@
|
||||
<td colspan="3">
|
||||
<c:forEach var="assInfo" items="${assInfoList }">
|
||||
<c:if test="${assInfo.assPstUsrTy eq 02}">
|
||||
<c:set var="assPstSeq" value="${assInfo.assPstSeq }" />
|
||||
<c:set var="assPstUsrNm" value="${assInfo.assPstUsrNm }" />
|
||||
<c:set var="assPstSeq1" value="${assInfo.assPstSeq }" />
|
||||
<c:set var="assPstUsrNm1" value="${assInfo.assPstUsrNm }" />
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
<input type="hidden" id="addUsrNm1" value="${assPstUsrNm }" />
|
||||
<input type="text" size="30" id="addUsrNm1" name="addUsrNm1" value="${assPstUsrNm }" />
|
||||
<input type="hidden" id="addUsrSeq1" value="${assPstSeq1 }" />
|
||||
<input type="text" size="30" id="addUsrNm1" value="${assPstUsrNm1 }" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -459,12 +467,14 @@
|
||||
<td colspan="3">
|
||||
<c:forEach var="assInfo" items="${assInfoList }">
|
||||
<c:if test="${assInfo.assPstUsrTy eq 02}">
|
||||
<c:if test="${assInfo.assPstUsrNm != assPstUsrNm}" >
|
||||
<c:set var="assPstUsrNm2" value="${assInfo.assPstUsrNm }" />
|
||||
<c:if test="${assInfo.assPstUsrNm != assPstUsrNm1}" >
|
||||
<c:set var="assPstSeq2" value="${assInfo.assPstSeq2 }" />
|
||||
<c:set var="assPstUsrNm2" value="${assInfo.assPstUsrNm2 }" />
|
||||
</c:if>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
<input type="text" size="30" id="addUsrNm2" name="addUsrNm2" value="${assPstUsrNm2 }" />
|
||||
<input type="hidden" id="addUsrSeq2" value="${assPstSeq1 }" />
|
||||
<input type="text" size="30" id="addUsrNm2" value="${assPstUsrNm1 }" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user