Merge branch 'hylee'
This commit is contained in:
hylee
commit
d7d9f53eb6
@ -113,10 +113,6 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
|
||||
// private String apprYn = ""; // 결재여부
|
||||
// private String apprDe = ""; // 결재일시
|
||||
// private String atchFileId = ""; // 첨부파일ID
|
||||
// private String frstRegistPnttm = ""; // 등록일시
|
||||
// private String frstRegisterId = ""; // 등록자
|
||||
// private String lastUpdtPnttm = ""; // 수정일시
|
||||
// private String lastUpdusrId = ""; // 수정자
|
||||
|
||||
private String reqAddSeq = ""; //피신청인 추가 갯수
|
||||
private String reqPerTotCnt = ""; //피신청인 총 갯수
|
||||
@ -148,6 +144,13 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
|
||||
private String rpplConnNo;
|
||||
private String resPonDentNms = ""; //피신청인 총 갯수
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public AdjReqMgrVO getAdrVO() {
|
||||
return adrVO;
|
||||
}
|
||||
|
||||
@ -12,26 +12,30 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO {
|
||||
|
||||
//오프라인 조정신청 사건정보 불러오기
|
||||
public AdjReqMgrPastVO selectAdjReqMgrMasterInfo(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
|
||||
return (AdjReqMgrPastVO) select("AdjReqMgrPastDAO.selectAdjReqMgrMasterInfo", adjReqMgrPastVO);
|
||||
return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.selectAdjReqMgrMasterInfo", adjReqMgrPastVO);
|
||||
}
|
||||
|
||||
public List<AdjReqMgrPastVO> selectAdjReqMgrListInfo(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
|
||||
return (List<AdjReqMgrPastVO>) list("AdjReqMgrPastDAO.selectAdjReqMgrListInfo", adjReqMgrPastVO);
|
||||
return (List<AdjReqMgrPastVO>) list("adjReqMgrPastDAO.selectAdjReqMgrListInfo", adjReqMgrPastVO);
|
||||
}
|
||||
|
||||
//오프라인 조정사건 신규 등록
|
||||
public int insertAdrMgrMaster(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
|
||||
return update("AdjReqMgrPastDAO.insertAdrMgrMaster", adjReqMgrPastVO);
|
||||
return update("adjReqMgrPastDAO.insertAdrMgrMaster", adjReqMgrPastVO);
|
||||
}
|
||||
|
||||
//오프라인 조정사건 상세 신규 등록
|
||||
public int insertAdrMgrMasterDetail(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
|
||||
return update("AdjReqMgrPastDAO.insertAdrMgrMasterDetail", adjReqMgrPastVO);
|
||||
return update("adjReqMgrPastDAO.insertAdrMgrMasterDetail", adjReqMgrPastVO);
|
||||
}
|
||||
|
||||
//오프라인 조정사건 대리인, 신청인, 피신청인 정보 등록
|
||||
public int insertAdrRppl(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
|
||||
return update("AdjReqMgrPastDAO.insertAdrRppl", adjReqMgrPastVO);
|
||||
return update("adjReqMgrPastDAO.insertAdrRppl", adjReqMgrPastVO);
|
||||
}
|
||||
|
||||
public void insertAdrSnInit(AdjReqMgrPastVO adjReqMgrPastVO) {
|
||||
insert("adjReqMgrPastDAO.insertAdrSnInit",adjReqMgrPastVO );
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -36,6 +36,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
||||
@Resource(name="rpplGnrService")
|
||||
private EgovIdGnrService rpplIdgenService;
|
||||
|
||||
// ADR_PRTCL_MGR 기일조서관리 pk
|
||||
@Resource(name = "egovPrtclManageGnrService")
|
||||
private EgovIdGnrService idgenPrtclSeqService;
|
||||
|
||||
//암복호화 유틸
|
||||
@Resource(name = "egovCryptoUtil")
|
||||
EgovCryptoUtil egovCryptoUtil;
|
||||
@ -61,7 +65,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
||||
private AdrHstryMgrDAO adrHstryMgrDAO;
|
||||
|
||||
|
||||
|
||||
//오프라인 조정신청 정보 상세내역 불러오기
|
||||
public AdjReqMgrPastVO selectAdjReqMgrOffLineInfo(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
|
||||
|
||||
@ -214,7 +217,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
||||
}else { // 대리인,신청인, 피신청인 정보 입력해보기
|
||||
|
||||
//신규 조정사건 상세보기 생성해 주기
|
||||
adjReqMgrPastVO.setAdrSn("1");
|
||||
// adjReqMgrPastVO.setAdrSn("1");
|
||||
adjReqMgrPastDAO.insertAdrMgrMasterDetail(adjReqMgrPastVO);
|
||||
|
||||
//조정신청 대리인 및 신청인 정보 추가해 주기
|
||||
@ -298,6 +301,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
||||
String phone = phone1 + phone2 + phone3;
|
||||
adjReqMgrPastVO.getAdjReqMgrVoList().get(1).setRpplPhone(phone);
|
||||
|
||||
System.out.println("");
|
||||
//신청인 정보 디비 입력해 주기
|
||||
rpplCnt = cryptAdjReqMgrSend(adjReqMgrPastVO.getAdjReqMgrVoList().get(1));
|
||||
//rpplCnt = adjReqMgrPastDAO.insertAdrRppl(adjReqMgrOffLineVO.getAdjReqMgrVoList().get(1));
|
||||
@ -382,6 +386,21 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
||||
|
||||
}
|
||||
|
||||
int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn());
|
||||
int cnt = 1;
|
||||
System.out.println("adrSn :: " + adrSn);
|
||||
while(cnt <= adrSn)
|
||||
{
|
||||
System.out.println("cnt : "+cnt);
|
||||
adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
|
||||
adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
|
||||
adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
|
||||
cnt++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청 정보 저장이 완료되었습니다.", LocalDateTime.now()));
|
||||
}
|
||||
|
||||
@ -409,6 +428,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
||||
adjReqMgrPastVO.setRpplRealAddr(rpplRealAddr);
|
||||
adjReqMgrPastVO.setRpplRealAddrDtl(rpplRealAddrDtl);
|
||||
|
||||
// TO_CHAR(SYSTIMESTAMP,'YYYYMMDD
|
||||
//디비에 추가해 주기
|
||||
int resultCnt = adjReqMgrPastDAO.insertAdrRppl(adjReqMgrPastVO);
|
||||
|
||||
|
||||
@ -152,7 +152,6 @@ public class AdjReqMgrPastController {
|
||||
if(userId.equals("")) {
|
||||
// Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized)
|
||||
return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
|
||||
<!-- 오프라인 조정사건정보 수정 : 조정사건 정보 불러오기 -->
|
||||
<select id="AdjReqMgrPastDAO.selectAdjReqMgrMasterInfo" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
|
||||
<select id="adjReqMgrPastDAO.selectAdjReqMgrMasterInfo" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
|
||||
|
||||
SELECT ADR_SEQ AS adrSeq,
|
||||
ADR_NO AS adrNo,
|
||||
@ -35,7 +35,7 @@
|
||||
</select>
|
||||
|
||||
<!-- 오프라인 조정사건정보 수정 : 조정신청인 정보 불러오기 -->
|
||||
<select id="AdjReqMgrPastDAO.selectAdjReqMgrListInfo" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
|
||||
<select id="adjReqMgrPastDAO.selectAdjReqMgrListInfo" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
|
||||
|
||||
SELECT ADR_SEQ AS adrSeq,
|
||||
RPPL_SEQ AS rpplSeq,
|
||||
@ -80,7 +80,7 @@
|
||||
</select>
|
||||
|
||||
<!-- 조정사건정보 등록 : 대국민 조정신청 상세 저장 -->
|
||||
<insert id="AdjReqMgrPastDAO.insertAdrMgrMasterDetail" parameterClass="AdjReqPastVO">
|
||||
<insert id="adjReqMgrPastDAO.insertAdrMgrMasterDetail" parameterClass="AdjReqPastVO">
|
||||
INSERT INTO ADR_MGR_DETAIL(
|
||||
ADR_SEQ,
|
||||
ADR_SN,
|
||||
@ -102,10 +102,11 @@
|
||||
|
||||
|
||||
<!-- 조정사건정보 등록 : 업무시스템 조정신청 저장 -->
|
||||
<insert id="AdjReqMgrPastDAO.insertAdrMgrMaster" parameterClass="AdjReqPastVO">
|
||||
<insert id="adjReqMgrPastDAO.insertAdrMgrMaster" parameterClass="AdjReqPastVO">
|
||||
INSERT INTO ADR_MGR_MASTER (
|
||||
ADR_SEQ
|
||||
,STAT_CD
|
||||
,ADR_NO
|
||||
,REQ_OL_CD
|
||||
,REQ_CN1
|
||||
,REQ_CN2
|
||||
@ -122,7 +123,8 @@
|
||||
,LAST_UPDUSR_ID
|
||||
) VALUES (
|
||||
#adrSeq#
|
||||
,#statCd#
|
||||
,"400000"
|
||||
,#adrNo#
|
||||
,#reqOlCd#
|
||||
,#reqCn1#
|
||||
,#reqCn2#
|
||||
@ -133,14 +135,14 @@
|
||||
,'N'
|
||||
,NOW()
|
||||
,#atchFileId#
|
||||
,NOW()
|
||||
,TO_DATETIME(TO_CHAR(#frstRegistPnttm#,'YYYY-MM-DD'))
|
||||
,#frstRegisterId#
|
||||
,NOW()
|
||||
,TO_DATETIME(TO_CHAR(#lastUpdtPnttm#,'YYYY-MM-DD'))
|
||||
,#lastUpdusrId#
|
||||
)
|
||||
</insert>
|
||||
<!-- 오프라인 조정사건관리인 등록 : 조정신청 대리인, 신청인, 피신청인 저장 -->
|
||||
<insert id="AdjReqMgrPastDAO.insertAdrRppl" parameterClass="AdjReqPastVO">
|
||||
<insert id="adjReqMgrPastDAO.insertAdrRppl" parameterClass="AdjReqPastVO">
|
||||
INSERT INTO ADR_RPPL (
|
||||
ADR_SEQ
|
||||
,RPPL_SEQ
|
||||
@ -216,6 +218,19 @@
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 과거사건저장에서 선택한 차수로 기본 행만 만듬 -->
|
||||
<insert id="adjReqMgrPastDAO.insertAdrSnInit" parameterClass="AdjReqPastVO">
|
||||
INSERT INTO ADR_PRTCL_MGR (
|
||||
ADR_SEQ
|
||||
, ADR_SN
|
||||
, PRTCL_SEQ
|
||||
) VALUES (
|
||||
#adrSeq#
|
||||
,#adrSn#
|
||||
,#prtclSeq#
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,14 +1,13 @@
|
||||
<%--
|
||||
Class Name : adjReqMgrOffRegist.jsp
|
||||
Description : 오프라인조정신청 등록 화면
|
||||
Class Name : adjReqMgrPastRegist.jsp
|
||||
Description : 과거사건등록 신청 화면
|
||||
Modification Information
|
||||
|
||||
수정일 수정자 수정내용
|
||||
------- -------- ---------------------------
|
||||
2021.09.14 우영두 최초 생성
|
||||
2022.08.22 이호영 최초 생성
|
||||
|
||||
author : 우영두
|
||||
since : 2021.09.14
|
||||
author : 이호영
|
||||
--%>
|
||||
<%@ page contentType="text/html; charset=utf-8"%>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
@ -53,8 +52,12 @@
|
||||
<form:form commandName="adrVO" name="adrVO" method="post" enctype="multipart/form-data">
|
||||
<form:input type="hidden" path="reqPerTotCnt" id="reqPerTotCnt"/>
|
||||
<input type="hidden" name="appResultTy" id="appResultTy"/>
|
||||
<input type="hidden" name="limitcount" value="50" />
|
||||
<input type="hidden" name="statCd" id="statCd" value="" />
|
||||
<input type="hidden" name="adrNo" id="adrNo" value="" />
|
||||
<input type="hidden" name="frstRegistPnttm" id="frstRegistPnttm" value="" />
|
||||
<input type="hidden" name="lastUpdtPnttm" id="lastUpdtPnttm" value="" />
|
||||
<input type="hidden" name="adrSn" id="adrSn" value="" />
|
||||
<input type="hidden" name="limitcount" value="50" />
|
||||
<!-- cont -->
|
||||
<div class="cont_wrap">
|
||||
<div class="box">
|
||||
@ -83,28 +86,36 @@
|
||||
<tr>
|
||||
<th>조정번호</th>
|
||||
<td>
|
||||
<form:input path="adjReqMgrVoList[1].rpplNm" id="rppl0101Nm" size="30"/>
|
||||
<input type="text" name="adrNoTemp" id="adrNoTemp" value="2019조정0001" size="30"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>조정신청일</th>
|
||||
<td>
|
||||
<form:input path="adjReqMgrVoList[1].rpplNm" id="rppl0101Nm" size="30"/>
|
||||
<input type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${cmmVO.searchStartDt}" data-datecontrol="true" ${cmmVO.searchMonth ne '99' ? 'readonly' : ''}>
|
||||
<div id="sel_date" class="sel_date">
|
||||
<%-- <input readonly="readonly" type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${adjReqMgrPastVO.frstRegistPnttm}" data-datecontrol="true"> --%>
|
||||
<input readonly="readonly" type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="2022-08-02" data-datecontrol="true">
|
||||
<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
|
||||
<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('startDate01-lry','',this)" class="btn_cal" ${cmmVO.searchMonth ne '99' ? 'disabled' : ''}></button>
|
||||
<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('startDate01-lry','',this)" class="btn_cal"></button>
|
||||
<div id="startDate01-lry" class="calendarPop" style="display: none;">
|
||||
<iframe id="startDate01-ifrm" name="startDate01-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>조정종결일</th>
|
||||
<td>
|
||||
<form:input path="adjReqMgrVoList[1].rpplNm" id="rppl0101Nm" size="30"/>
|
||||
<div id="sel_date" class="sel_date">
|
||||
<input readonly="readonly" type="text" class="endDate inp" title="검색시작일" id="endDate" name="searchEndDt" value="2022-08-03" data-datecontrol="true">
|
||||
<div class="calendar_in" id="calendarName_endDate" style="z-index: 9;">
|
||||
<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('endDate-lry','',this)" class="btn_cal" ></button>
|
||||
<div id="endDate-lry" class="calendarPop" style="display: none;">
|
||||
<iframe id="endDate-ifrm" name="endDate-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html"title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@ -1339,14 +1350,14 @@
|
||||
<p>진행된 차수</p>
|
||||
</th>
|
||||
<td>
|
||||
<form:select path="adrSn">
|
||||
<form:option value="" label="선택" />
|
||||
<form:option value="1" label="1차" />
|
||||
<form:option value="2" label="2차" />
|
||||
<form:option value="3" label="3차" />
|
||||
<form:option value="4" label="4차" />
|
||||
<form:option value="5" label="5차" />
|
||||
</form:select>
|
||||
<select id="adrSnTemp">
|
||||
<option value="" >선택 </option>
|
||||
<option value="1">1차</option>
|
||||
<option value="2">2차</option>
|
||||
<option value="3">3차</option>
|
||||
<option value="4">4차</option>
|
||||
<option value="5">5차</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -1372,7 +1383,7 @@
|
||||
<div class="area_left">
|
||||
</div>
|
||||
<div class="area_right">
|
||||
<button type="button" class="btnType06" onclick="fn_adjReqMgr_insert(); return false;">등록</button>
|
||||
<button type="button" class="btnType06" onclick="fn_adjReqMgr_insert(); return false;">기본정보 저장 ></button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- //btn_wrap -->
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user