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

Merge branch 'hylee'

Browse Source
This commit is contained in:
hylee 2022-08-29 14:02:59 +09:00
commit d7d9f53eb6
8 changed files with 1195 additions and 1143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java
View File

@ -113,10 +113,6 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
// private String apprYn = ""; // 결재여부 // private String apprYn = ""; // 결재여부
// private String apprDe = ""; // 결재일시 // private String apprDe = ""; // 결재일시
// private String atchFileId = ""; // 첨부파일ID // private String atchFileId = ""; // 첨부파일ID
// private String frstRegistPnttm = ""; // 등록일시
// private String frstRegisterId = ""; // 등록자
// private String lastUpdtPnttm = ""; // 수정일시
// private String lastUpdusrId = ""; // 수정자
private String reqAddSeq = ""; //피신청인 추가 갯수 private String reqAddSeq = ""; //피신청인 추가 갯수
private String reqPerTotCnt = ""; //피신청인 총 갯수 private String reqPerTotCnt = ""; //피신청인 총 갯수
@ -148,6 +144,13 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
private String rpplConnNo; private String rpplConnNo;
private String resPonDentNms = ""; //피신청인 총 갯수 private String resPonDentNms = ""; //피신청인 총 갯수
public AdjReqMgrVO getAdrVO() { public AdjReqMgrVO getAdrVO() {
return adrVO; return adrVO;
} }

14
src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java
View File

@ -12,26 +12,30 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO {
//오프라인 조정신청 사건정보 불러오기 //오프라인 조정신청 사건정보 불러오기
public AdjReqMgrPastVO selectAdjReqMgrMasterInfo(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{ 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{ 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{ public int insertAdrMgrMaster(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
return update("AdjReqMgrPastDAO.insertAdrMgrMaster", adjReqMgrPastVO); return update("adjReqMgrPastDAO.insertAdrMgrMaster", adjReqMgrPastVO);
} }
//오프라인 조정사건 상세 신규 등록 //오프라인 조정사건 상세 신규 등록
public int insertAdrMgrMasterDetail(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{ public int insertAdrMgrMasterDetail(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
return update("AdjReqMgrPastDAO.insertAdrMgrMasterDetail", adjReqMgrPastVO); return update("adjReqMgrPastDAO.insertAdrMgrMasterDetail", adjReqMgrPastVO);
} }
//오프라인 조정사건 대리인, 신청인, 피신청인 정보 등록 //오프라인 조정사건 대리인, 신청인, 피신청인 정보 등록
public int insertAdrRppl(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{ 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 );
} }

24
src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java
View File

@ -36,6 +36,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
@Resource(name="rpplGnrService") @Resource(name="rpplGnrService")
private EgovIdGnrService rpplIdgenService; private EgovIdGnrService rpplIdgenService;
// ADR_PRTCL_MGR 기일조서관리 pk
@Resource(name = "egovPrtclManageGnrService")
private EgovIdGnrService idgenPrtclSeqService;
//암복호화 유틸 //암복호화 유틸
@Resource(name = "egovCryptoUtil") @Resource(name = "egovCryptoUtil")
EgovCryptoUtil egovCryptoUtil; EgovCryptoUtil egovCryptoUtil;
@ -61,7 +65,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
private AdrHstryMgrDAO adrHstryMgrDAO; private AdrHstryMgrDAO adrHstryMgrDAO;
//오프라인 조정신청 정보 상세내역 불러오기 //오프라인 조정신청 정보 상세내역 불러오기
public AdjReqMgrPastVO selectAdjReqMgrOffLineInfo(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{ public AdjReqMgrPastVO selectAdjReqMgrOffLineInfo(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
@ -214,7 +217,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
}else { // 대리인,신청인, 피신청인 정보 입력해보기 }else { // 대리인,신청인, 피신청인 정보 입력해보기
//신규 조정사건 상세보기 생성해 주기 //신규 조정사건 상세보기 생성해 주기
adjReqMgrPastVO.setAdrSn("1"); // adjReqMgrPastVO.setAdrSn("1");
adjReqMgrPastDAO.insertAdrMgrMasterDetail(adjReqMgrPastVO); adjReqMgrPastDAO.insertAdrMgrMasterDetail(adjReqMgrPastVO);
//조정신청 대리인 및 신청인 정보 추가해 주기 //조정신청 대리인 및 신청인 정보 추가해 주기
@ -298,6 +301,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
String phone = phone1 + phone2 + phone3; String phone = phone1 + phone2 + phone3;
adjReqMgrPastVO.getAdjReqMgrVoList().get(1).setRpplPhone(phone); adjReqMgrPastVO.getAdjReqMgrVoList().get(1).setRpplPhone(phone);
System.out.println("");
//신청인 정보 디비 입력해 주기 //신청인 정보 디비 입력해 주기
rpplCnt = cryptAdjReqMgrSend(adjReqMgrPastVO.getAdjReqMgrVoList().get(1)); rpplCnt = cryptAdjReqMgrSend(adjReqMgrPastVO.getAdjReqMgrVoList().get(1));
//rpplCnt = adjReqMgrPastDAO.insertAdrRppl(adjReqMgrOffLineVO.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())); return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청 정보 저장이 완료되었습니다.", LocalDateTime.now()));
} }
@ -409,6 +428,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
adjReqMgrPastVO.setRpplRealAddr(rpplRealAddr); adjReqMgrPastVO.setRpplRealAddr(rpplRealAddr);
adjReqMgrPastVO.setRpplRealAddrDtl(rpplRealAddrDtl); adjReqMgrPastVO.setRpplRealAddrDtl(rpplRealAddrDtl);
// TO_CHAR(SYSTIMESTAMP,'YYYYMMDD
//디비에 추가해 주기 //디비에 추가해 주기
int resultCnt = adjReqMgrPastDAO.insertAdrRppl(adjReqMgrPastVO); int resultCnt = adjReqMgrPastDAO.insertAdrRppl(adjReqMgrPastVO);

1
src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java
View File

@ -152,7 +152,6 @@ public class AdjReqMgrPastController {
if(userId.equals("")) { if(userId.equals("")) {
// Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized) // Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized)
return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
} }

31
src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml
View File

@ -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, SELECT ADR_SEQ AS adrSeq,
ADR_NO AS adrNo, ADR_NO AS adrNo,
@ -35,7 +35,7 @@
</select> </select>
<!-- 오프라인 조정사건정보 수정 : 조정신청인 정보 불러오기 --> <!-- 오프라인 조정사건정보 수정 : 조정신청인 정보 불러오기 -->
<select id="AdjReqMgrPastDAO.selectAdjReqMgrListInfo" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO"> <select id="adjReqMgrPastDAO.selectAdjReqMgrListInfo" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
SELECT ADR_SEQ AS adrSeq, SELECT ADR_SEQ AS adrSeq,
RPPL_SEQ AS rpplSeq, RPPL_SEQ AS rpplSeq,
@ -80,7 +80,7 @@
</select> </select>
<!-- 조정사건정보 등록 : 대국민 조정신청 상세 저장 --> <!-- 조정사건정보 등록 : 대국민 조정신청 상세 저장 -->
<insert id="AdjReqMgrPastDAO.insertAdrMgrMasterDetail" parameterClass="AdjReqPastVO"> <insert id="adjReqMgrPastDAO.insertAdrMgrMasterDetail" parameterClass="AdjReqPastVO">
INSERT INTO ADR_MGR_DETAIL( INSERT INTO ADR_MGR_DETAIL(
ADR_SEQ, ADR_SEQ,
ADR_SN, ADR_SN,
@ -102,10 +102,11 @@
<!-- 조정사건정보 등록 : 업무시스템 조정신청 저장 --> <!-- 조정사건정보 등록 : 업무시스템 조정신청 저장 -->
<insert id="AdjReqMgrPastDAO.insertAdrMgrMaster" parameterClass="AdjReqPastVO"> <insert id="adjReqMgrPastDAO.insertAdrMgrMaster" parameterClass="AdjReqPastVO">
INSERT INTO ADR_MGR_MASTER ( INSERT INTO ADR_MGR_MASTER (
ADR_SEQ ADR_SEQ
,STAT_CD ,STAT_CD
,ADR_NO
,REQ_OL_CD ,REQ_OL_CD
,REQ_CN1 ,REQ_CN1
,REQ_CN2 ,REQ_CN2
@ -122,7 +123,8 @@
,LAST_UPDUSR_ID ,LAST_UPDUSR_ID
) VALUES ( ) VALUES (
#adrSeq# #adrSeq#
,#statCd# ,"400000"
,#adrNo#
,#reqOlCd# ,#reqOlCd#
,#reqCn1# ,#reqCn1#
,#reqCn2# ,#reqCn2#
@ -133,14 +135,14 @@
,'N' ,'N'
,NOW() ,NOW()
,#atchFileId# ,#atchFileId#
,NOW() ,TO_DATETIME(TO_CHAR(#frstRegistPnttm#,'YYYY-MM-DD'))
,#frstRegisterId# ,#frstRegisterId#
,NOW() ,TO_DATETIME(TO_CHAR(#lastUpdtPnttm#,'YYYY-MM-DD'))
,#lastUpdusrId# ,#lastUpdusrId#
) )
</insert> </insert>
<!-- 오프라인 조정사건관리인 등록 : 조정신청 대리인, 신청인, 피신청인 저장 --> <!-- 오프라인 조정사건관리인 등록 : 조정신청 대리인, 신청인, 피신청인 저장 -->
<insert id="AdjReqMgrPastDAO.insertAdrRppl" parameterClass="AdjReqPastVO"> <insert id="adjReqMgrPastDAO.insertAdrRppl" parameterClass="AdjReqPastVO">
INSERT INTO ADR_RPPL ( INSERT INTO ADR_RPPL (
ADR_SEQ ADR_SEQ
,RPPL_SEQ ,RPPL_SEQ
@ -216,6 +218,19 @@
) )
</insert> </insert>
<!-- 과거사건저장에서 선택한 차수로 기본 행만 만듬 -->
<insert id="adjReqMgrPastDAO.insertAdrSnInit" parameterClass="AdjReqPastVO">
INSERT INTO ADR_PRTCL_MGR (
ADR_SEQ
, ADR_SN
, PRTCL_SEQ
) VALUES (
#adrSeq#
,#adrSn#
,#prtclSeq#
)
</insert>

55
src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp
View File

@ -1,14 +1,13 @@
<%-- <%--
Class Name : adjReqMgrOffRegist.jsp Class Name : adjReqMgrPastRegist.jsp
Description : 오프라인조정신청 등록 화면 Description : 과거사건등록 신청 화면
Modification Information Modification Information
수정일 수정자 수정내용 수정일 수정자 수정내용
------- -------- --------------------------- ------- -------- ---------------------------
2021.09.14 우영두 최초 생성 2022.08.22 이호영 최초 생성
author : 우영두 author : 이호영
since : 2021.09.14
--%> --%>
<%@ page contentType="text/html; charset=utf-8"%> <%@ page contentType="text/html; charset=utf-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ 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:form commandName="adrVO" name="adrVO" method="post" enctype="multipart/form-data">
<form:input type="hidden" path="reqPerTotCnt" id="reqPerTotCnt"/> <form:input type="hidden" path="reqPerTotCnt" id="reqPerTotCnt"/>
<input type="hidden" name="appResultTy" id="appResultTy"/> <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="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 --> <!-- cont -->
<div class="cont_wrap"> <div class="cont_wrap">
<div class="box"> <div class="box">
@ -83,28 +86,36 @@
<tr> <tr>
<th>조정번호</th> <th>조정번호</th>
<td> <td>
<form:input path="adjReqMgrVoList[1].rpplNm" id="rppl0101Nm" size="30"/> <input type="text" name="adrNoTemp" id="adrNoTemp" value="2019조정0001" size="30"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>조정신청일</th> <th>조정신청일</th>
<td> <td>
<form:input path="adjReqMgrVoList[1].rpplNm" id="rppl0101Nm" size="30"/> <div id="sel_date" class="sel_date">
<input type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${cmmVO.searchStartDt}" data-datecontrol="true" ${cmmVO.searchMonth ne '99' ? 'readonly' : ''}> <%-- <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;"> <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;"> <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> <iframe id="startDate01-ifrm" name="startDate01-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
</div> </div>
</div> </div>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>조정종결일</th> <th>조정종결일</th>
<td> <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> </td>
</tr> </tr>
</tbody> </tbody>
@ -1339,14 +1350,14 @@
<p>진행된 차수</p> <p>진행된 차수</p>
</th> </th>
<td> <td>
<form:select path="adrSn"> <select id="adrSnTemp">
<form:option value="" label="선택" /> <option value="" >선택 </option>
<form:option value="1" label="1차" /> <option value="1">1차</option>
<form:option value="2" label="2차" /> <option value="2">2차</option>
<form:option value="3" label="3차" /> <option value="3">3차</option>
<form:option value="4" label="4차" /> <option value="4">4차</option>
<form:option value="5" label="5차" /> <option value="5">5차</option>
</form:select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -1372,7 +1383,7 @@
<div class="area_left"> <div class="area_left">
</div> </div>
<div class="area_right"> <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>
</div> </div>
<!-- //btn_wrap --> <!-- //btn_wrap -->

1096
src/main/webapp/js/kccadr/adjReqMgrPast/init.js
View File

File diff suppressed because it is too large Load Diff

1096
src/main/webapp/js/kccadr/adjReqMgrPast/value.js
View File

File diff suppressed because it is too large Load Diff