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

조정신청 외국인추가

Browse Source
This commit is contained in:
hylee 2023-08-23 17:28:35 +09:00
parent c7bba78c97
commit 02d818decc
16 changed files with 79 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java
View File

@ -58,6 +58,7 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable {
private String rpplTy = ""; // 관리인구분
private String agntYn = ""; // 조정기일대리여부
private String rpplUsrTy = ""; // 관리인분류
private String rpplUsrDiv = ""; // 관리인분류
private String adrOlYn = ""; // 전자조정진행여부
private String rpplId = ""; // 조정사건관리인ID
private String rpplNm = ""; // 이름_대표자
@ -403,6 +404,12 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable {
public void setRpplUsrTy(String rpplUsrTy) {
this.rpplUsrTy = rpplUsrTy;
}
public String getRpplUsrDiv() {
return rpplUsrDiv;
}
public void setRpplUsrDiv(String rpplUsrDiv) {
this.rpplUsrDiv = rpplUsrDiv;
}
public String getAdrOlYn() {
return adrOlYn;
}

1
src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java
View File

@ -684,7 +684,6 @@ public String insertAdjReqMgrRpplReq(AdjReqMgrOffLineVO adjReqMgrOffLineVO) thro
adjReqMgrOffLineVO.setRpplRealPost(rpplRealPost);
adjReqMgrOffLineVO.setRpplRealAddr(rpplRealAddr);
adjReqMgrOffLineVO.setRpplRealAddrDtl(rpplRealAddrDtl);
//디비에 수정해 주기
int resultCnt = adjReqMgrOffLineDAO.updateAdjReqMgrOffRppl(adjReqMgrOffLineVO);

10
src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java
View File

@ -149,6 +149,8 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
private String rpplUsrTyNm;
private String rpplUsrDivNm;
private String edtSn;
private String edtTy;
@ -806,6 +808,14 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
this.rpplUsrTyNm = rpplUsrTyNm;
}
public String getRpplUsrDivNm() {
return rpplUsrDivNm;
}
public void setRpplUsrDivNm(String rpplUsrDivNm) {
this.rpplUsrDivNm = rpplUsrDivNm;
}
public String getEdtSn() {
return edtSn;
}

4
src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java
View File

@ -1090,7 +1090,7 @@ public class AdjReqMgrController {
//조정 신청 정보 불러오기.
AdjReqMgrOffLineVO resultAdjReqMgrOffLine = adjReqMgrOffLineService.selectAdjReqMgrOffLineInfo(adjReqMgrOffLineVO);
System.out.println("==========================");
FileVO fileVO = new FileVO();
if(resultAdjReqMgrOffLine.getAdjReqMgrVoList().get(0).getAtchFileId() != null){
@ -1117,6 +1117,8 @@ public class AdjReqMgrController {
List<?> codeResult = cmmUseService.selectCmmCodeDetail("CC001");
model.addAttribute("CC001", codeResult);
model.addAttribute("CC007", cmmUseService.selectCmmCodeDetail("CC007"));
System.out.println("resultAdjReqMgrOffLine :: "+ resultAdjReqMgrOffLine.getAdjReqMgrVoList().get(2));
model.addAttribute("adrVO", resultAdjReqMgrOffLine);

6
src/main/java/kcc/kccadr/message/SchedulerUtil.java
View File

@ -67,7 +67,7 @@ public class SchedulerUtil {
@Scheduled(cron = "0 0/1 * * * *")
// @SchedulerLock(name = "kakaoAtSendPrcs", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
public void kakaoAtSendPrcs() throws Exception {
System.out.println("===========at scheduler run============");
// System.out.println("===========at scheduler run============");
String hostAddr = null;
@ -91,7 +91,7 @@ public class SchedulerUtil {
}
try {
System.out.println("server ip ============" + hostAddr);
// System.out.println("server ip ============" + hostAddr);
// if(hostAddr.equals(myLocalIp) || hostAddr.equals(devOutIp) || hostAddr.equals(devInIp) || hostAddr.equals(dmzIp1) || hostAddr.equals(dmzIp2) || hostAddr.equals(containerIp) ) {
// if(hostAddr.equals(containerIp) ) {
@ -121,7 +121,7 @@ public class SchedulerUtil {
System.out.println(e.getMessage());
}
System.out.println("===========at scheduler finish============");
// System.out.println("===========at scheduler finish============");
}
@Bean

2
src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml
View File

@ -499,11 +499,13 @@
LAST_UPDT_PNTTM AS lastUpdtPnttm,
LAST_UPDUSR_ID AS lastUpdusrId,
RPPL_USR_TY_NM AS rpplUsrTyNm,
RPPL_USR_DIV_NM AS rpplUsrDivNm,
ORD_NUM
FROM (
SELECT
*
, ( SELECT CODE_NM FROM LETTCCMMNDETAILCODE WHERE CODE_ID = 'CC001' AND CODE = T1.RPPL_USR_TY) AS RPPL_USR_TY_NM
, ( SELECT CODE_NM FROM LETTCCMMNDETAILCODE WHERE CODE_ID = 'CC007' AND CODE = T1.RPPL_USR_DIV) AS RPPL_USR_DIV_NM
, CASE WHEN RPPL_TY = '01' THEN 2 WHEN RPPL_TY = '03' THEN 1 ELSE 3 END ORD_NUM
FROM ADR_RPPL T1
WHERE ADR_SEQ = #adrSeq#

2
src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrOff/AdjReqMgrOff_SQL_Mysql.xml
View File

@ -179,6 +179,7 @@
RPPL_TY AS rpplTy,
AGNT_YN AS rpplYn,
RPPL_USR_TY AS rpplUsrTy,
RPPL_USR_DIV as rpplUsrDiv,
ADR_OL_YN AS adrOlYn,
RPPL_ID AS rpplId,
RPPL_NM AS rpplNm,
@ -258,6 +259,7 @@
RPPL_TY = #rpplTy#
,AGNT_YN = #agntYn#
,RPPL_USR_TY = #rpplUsrTy#
,RPPL_USR_DIV = #rpplUsrDiv#
,RPPL_NM = #rpplNm#
,RPPL_BIZ_NO = #rpplBizNo#
,RPPL_BIZ_ID = #rpplBizId#

8
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp
View File

@ -2175,6 +2175,14 @@ $(document).ready(function(){
<col style="width: 80%">
</colgroup>
<tbody>
<tr>
<th class="">
<p>신청인 구분</p>
</th>
<td>
<c:out value="${list.rpplUsrDivNm}"/>
</td>
</tr>
<tr>
<th class="">
<p>신청인 분류</p>

8
src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp
View File

@ -276,6 +276,14 @@
<col style="width: 80%">
</colgroup>
<tbody>
<tr>
<th class="">
<p>신청인 구분</p>
</th>
<td>
<c:out value="${list.rpplUsrDivNm}"/>
</td>
</tr>
<tr>
<th class="">
<p>신청인 분류</p>

24
src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegEdit.jsp
View File

@ -375,9 +375,14 @@
$("#agntInfo").show();
$("#agntInfo input").prop("disabled", false);
$("#rpplUsrDivTr").show();
} else {
$("#agntInfo").hide();
$("#agntInfo input").prop("disabled", true);
// 대리인이 아니고 본인일 경우 신청인 구분 (한국인 / 외국인) hide
$("#rpplUsrDivTr").hide();
}
});
@ -620,6 +625,11 @@
}
if(rpplTy == '30'){ //조정신청 대상 대리인
var rpplUsrDiv = $("[name='adjReqMgrVoList[1].rpplUsrDiv']:checked").val(); //신청인 분류
}
var rpplUsrTy = $("[name='adjReqMgrVoList[1].rpplUsrTy']:checked").val(); //신청인 분류
if(rpplUsrTy == "01"){ //개인일 경우
@ -1676,7 +1686,7 @@
<th>대리인 여부</th>
<td>
<div class="radio_wrap">
<span><input type="radio" id="rpplTy1" name="rpplTy" value="10" <c:if test="${adrVO.adjReqMgrVoList[0].rpplTy eq '10' or adrVO.adjReqMgrVoList[1].rpplTy eq '10'}"> checked </c:if> ><label for="reqTy1">본인</label></span>
<span><input type="radio" id="rpplTy1" name="rpplTy" value="10" <c:if test="${adrVO.adjReqMgrVoList[0].rpplTy eq '10' or adrVO.adjReqMgrVoList[1].rpplTy eq '10'}"> checked </c:if> ><label for="rpplTy1">본인</label></span>
<span><input type="radio" id="rpplTy2" name="rpplTy" value="30" <c:if test="${adrVO.adjReqMgrVoList[0].rpplTy eq '30' or adrVO.adjReqMgrVoList[1].rpplTy eq '30'}"> checked </c:if> ><label for="rpplTy2">대리인</label></span>
</div>
</td>
@ -1904,6 +1914,18 @@
<col style="width: auto;">
</colgroup>
<tbody>
<tr id="rpplUsrDivTr">
<th>신청인 구분</th>
<td>
<div class="radio_wrap">
<%-- <form:input path="adjReqMgrVoList[1].rpplUsrDiv" id="rppl0101Nm" size="30"/> --%>
<%-- <form:radiobuttons path="adjReqMgrVoList[1].rpplUsrDiv" id="rppl01UsrDiv" items="${CC007}" itemLabel="codeNm" itemValue="code" onchange="usrTySelect(this);" /> --%>
<form:radiobuttons path="adjReqMgrVoList[1].rpplUsrDiv" id="rppl01UsrDiv" items="${CC007}" itemLabel="codeNm" itemValue="code" />
</div>
</td>
</tr>
<tr>
<th>신청인 분류</th>
<td>

4
src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp
View File

@ -17,7 +17,7 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<title>조정사건 목록</title>
<title>나의 조정사건 목록</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<link rel="stylesheet" href="/kccadrPb/usr/datepicker/classic.css">
@ -118,7 +118,7 @@
<div class="cont_wrap sub02_1" id="sub">
<div class="inner">
<div class="cont_tit">
<h2>조정사건 목록</h2>
<h2>나의 조정사건 목록</h2>
</div>
<!-- list_top -->

2
src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp
View File

@ -178,7 +178,7 @@ function fn_adjstReq_preview() {
</th>
<td id="uploadWarp" class="upload_area">
<label for="fileNm" class="label">첨부파일 선택</label>
<input type="text" id="fileNm" size="30" class="file_input" readonly><button type="button" class="btnType01 btn_add_file">파일 첨부하기</button>(*파일 종류 및 수량에 지한이 없습니다.)
<input type="text" id="fileNm" size="30" class="file_input" readonly><button type="button" class="btnType01 btn_add_file">파일 첨부하기</button>(*파일 종류 및 수량에 제한이 없습니다.)
<input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none;"/>
<div class="file_wrap file_upload_box no_img_box">
<table class="tbType02">

2
src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp
View File

@ -144,7 +144,7 @@ function tutorialPop(){
</li>
<li>
<input type="radio" name="rpplTy" value="${KccadrConstants.ADR_RPPL_TY_REQ_DEPUTY}" id="subject_person02">
<label for="subject_person02"><i></i>아니오, 대리인<br>(변호사, 가족 , 직원)입니다.</label>
<label for="subject_person02"><i></i>아니오, 대리인<br>(변호사, 가족 , 직원)입니다. <br><p style="font-size: 14px; color: red;">※ 외국인인 경우 한국인 대리 신청만 가능</p></label>
</li>
</ul>
</div>

2
src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep1.jsp
View File

@ -35,6 +35,7 @@
margin-right: 15px !important;
}
.btn_wrap.btn_layout01 .btnType01{height: 46px}
.post_adr span{display: block; padding: 5px 10px 0 30px; font-size: 14px; color: #e40000; word-break: keep-all;}
</style>
<script type="text/javascript" src="<c:url value="/validator.do"/>"></script>
<%-- <un:useConstants var="KccadrConstants" className="kcc.kccadr.cmm.KccadrConstants" /> --%>
@ -537,6 +538,7 @@ $( document ).ready(function(){
<th scope="row">
<p class="req_text"><span>필수입력 항목</span>*</p>
<p>우편물 수령지</p>
<span> ※ 기일통지서, 답변서 등 조정진행 관련 문서들이 우편으로 발송됩니다. 실제 우편물 수령이 가능한 주소를 입력하시기 바랍니다.</span>
</th>
<td class="realPost">
<label for="rpplRealPost${status.index}" class="label">우편번호 입력</label>

7
src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp
View File

@ -83,7 +83,8 @@ $( document ).ready(function(){
$('.temporaryBtn').click(function(){
console.log($(this).hasClass('udpate'));
if(confirm("신청인 취지/원인 정보 임시저장을 진행하시겠습니까?"))
// if(confirm("신청인 취지/원인 정보 임시저장을 진행하시겠습니까?"))
if(confirm("입력하신 피신청인 정보를 임시 저장하시겠습니까?"))
{
if(confirm("신청인 취지/원인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?"))
{
@ -180,12 +181,12 @@ function fn_adjstReq_preview() {
<tr>
<th scope="row" class="callingdata_row">
<!-- <p class="req_text"><span>필수입력 항목</span>*</p> -->
<p>소명자료1</p>
<p>소명자료</p>
<span>신청취지 또는 신청이유를 객관적으로 소명할 수 있는 근거자료를 파일로 첨부합니다.</span>
</th>
<td id="uploadWarp" class="upload_area">
<label for="fileNm" class="label">첨부파일 선택</label>
<input type="text" id="fileNm" size="30" class="file_input read-only" readonly=""><button type="button" class="btnType01 btn_no_add_file">파일 첨부하기</button>(*파일 종류 및 수량에 지한이 없습니다.)
<input type="text" id="fileNm" size="30" class="file_input read-only" readonly=""><button type="button" class="btnType01 btn_no_add_file">파일 첨부하기</button>(*파일 종류 및 수량에 제한이 없습니다.)
<input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none;">
<div class="file_wrap file_upload_box no_img_box" style="display: none;">
<table class="tbType02">

4
src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp
View File

@ -454,8 +454,8 @@ var AdjstReq = {
* 20230822 수정
* 230810 조정신청 절자 안내문구 등 수정 9항목 (이용정).hwp 수정요청사항
*/
if (confirm("피신청인 정보 등록을 진행하시겠습니까?")) {
// if (confirm("입력하신 피신청인 정보를 저장하시겠습니까?")) {
// if (confirm("피신청인 정보 등록을 진행하시겠습니까?")) {
if (confirm("입력하신 피신청인 정보를 저장하시겠습니까?")) {
$.ajax({
type: "POST",
url: url,