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

Merge branch 'master' of http://hylee@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

Browse Source
This commit is contained in:
hylee 2022-11-25 14:32:34 +09:00
commit 8b75f1a015
14 changed files with 534 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

338
src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java
View File

@ -3,7 +3,6 @@ package kcc.kccadr.adjPgrMgr.apm.web;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@ -27,7 +26,6 @@ import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@ -353,169 +351,183 @@ public class ApmController {
@RequestMapping(value = "apmTab0.do")
public String apmTab0(@ModelAttribute("info") PgrCmmVO cmmVO, ModelMap model) throws Exception {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
// 조정사건일반
PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
model.addAttribute("info", info);
String adrAdmMemoYn = "N";
//조정조사관 의견 버튼 노출 여부
if(userId.equals(info.getAdrAdmId())) {
adrAdmMemoYn = "Y";
}
model.addAttribute("adrAdmMemoYn", adrAdmMemoYn);
//피신청인 이름 리스트로 구분처리
String[] resPonDentNm = info.getResPonDentNm().split(", ");
//피신청인 ID 리스트로 구분처리
String[] resPonDentId = info.getResPonDentId().split(", ");
//피신청인 대리인정보 처리
String[] resPonDentDNm = {""}; //피신청 대리인 이름
String[] resPonDentDId = {""}; //피신청 대리인 ID
String[] rpplResPonddSeq = {""}; //대리인의 피신청인 ID
if(StringUtil.isNotEmpty(info.getResPonDentDNm())) {
try {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
resPonDentDNm = info.getResPonDentDNm().split(", ");
resPonDentDId = info.getResPonDentDId().split(", ");
rpplResPonddSeq = info.getRpplRespddSeq().split(", ");
}
//피신청인 이름, ID, 피신청인 대리인 이름, ID 값 리스트로 합치기 2022.01.17
List<PgrCmmVO> rpplRepondList = new ArrayList<PgrCmmVO>();
for(int i=0; i<resPonDentNm.length; i++ ) {
String respNm = resPonDentNm[i]; //피신청인 이름
String respId = resPonDentId[i]; //피신청인 ID
PgrCmmVO temp = new PgrCmmVO();
temp.setResPonDentNm(respNm);
temp.setResPonDentId(respId);
//등록된 대리인 정보가 있으면 처리
if(StringUtil.isNotEmpty(info.getResPonDentDNm())) {
for(int j=0; j < rpplResPonddSeq.length; j++) {
String rpplResSeq = rpplResPonddSeq[j]; //대리인의 피신청인 ID
String respdNm = resPonDentDNm[j]; //피신청 대리인 이름
String respdId = resPonDentDId[j]; //피신청 대리인 ID
if(respId.equals(rpplResSeq)) {
temp.setResPonDentDNm(respdNm);
temp.setResPonDentDId(respdId);
temp.setRpplRespddSeq(rpplResSeq); //대리인의 피신청인 ID (어떤 피신청인의 대리인인지 구분하기 위해)
}
}
}
rpplRepondList.add(temp);
}
model.addAttribute("rpplRepondList", rpplRepondList);
// 조정기일 - 등록된 조정기일 중 조정위원 승인이 완료된 정보를 모두 불러옴(기일 승인이 완료된 건만 불러옴)
//List<PgrCmmVO> apmChgDateList = apmService.selectApmChgDateConfirmInfo(cmmVO);
List<PgrCmmVO> apmChgDateList = apmService.selectApmChgDateConfirmInfoList202211(cmmVO);
model.addAttribute("apmChgDateList", apmChgDateList);
// 사용자 조정기일 변경신청 건이 있는지 확인
List<PgrCmmVO> apmChgDateCnt = apmService.selectApmChgDateInfoCnt(cmmVO);
model.addAttribute("apmChgDateCnt", apmChgDateCnt);
// 조정사건일반
PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
model.addAttribute("info", info);
String adrAdmMemoYn = "N";
//조정조사관 의견 버튼 노출 여부
if(userId.equals(info.getAdrAdmId())) {
adrAdmMemoYn = "Y";
}
model.addAttribute("adrAdmMemoYn", adrAdmMemoYn);
//피신청인 이름 리스트로 구분처리
String[] resPonDentNm = info.getResPonDentNm().split(", ");
//피신청인 ID 리스트로 구분처리
String[] resPonDentId = info.getResPonDentId().split(", ");
//피신청인 대리인정보 처리
String[] resPonDentDNm = {""}; //피신청 대리인 이름
String[] resPonDentDId = {""}; //피신청 대리인 ID
String[] rpplResPonddSeq = {""}; //대리인의 피신청인 ID
if(StringUtil.isNotEmpty(info.getResPonDentDNm())) {
resPonDentDNm = info.getResPonDentDNm().split(", ");
resPonDentDId = info.getResPonDentDId().split(", ");
rpplResPonddSeq = info.getRpplRespddSeq().split(", ");
}
//피신청인 이름, ID, 피신청인 대리인 이름, ID 값 리스트로 합치기 2022.01.17
List<PgrCmmVO> rpplRepondList = new ArrayList<PgrCmmVO>();
for(int i=0; i<resPonDentNm.length; i++ ) {
String respNm = ""; //피신청인 이름
String respId = ""; //피신청인 ID
// 사용자 조정기일 변경신청 건이 있는지 확인 with 차수(해당 차수의 변경신청 건이 있는지 확인)
List<PgrCmmVO> apmChgDateCntWithSn = apmService.selectApmChgDateInfoCntWithSn(cmmVO);
model.addAttribute("apmChgDateCntWithSn", apmChgDateCntWithSn);
//최종 차수 정보
//String adrMaxSn = apmChgDateList.get(0).getAdrSn();
//model.addAttribute("adrMaxSn", adrMaxSn);
//기일조서값
DrtVO drtVO = new DrtVO();
drtVO.setAdrSeq(cmmVO.getAdrSeq());
drtVO.setAdrSn(cmmVO.getAdrSn());
drtVO = drtService.selectAdrPrtclMgr(drtVO);
model.addAttribute("drtInfo", drtVO);
//이의신청
OjctVO ojctVO = new OjctVO();
ojctVO.setAdrSeq(cmmVO.getAdrSeq());
int ojctCnt = ojctService.selectOjctListCount(ojctVO);
model.addAttribute("ojctCnt", ojctCnt);
//경정조서
ApmCorrectVO apmCorrectVO = new ApmCorrectVO();
apmCorrectVO.setAdrSeq(cmmVO.getAdrSeq());
model.addAttribute("rpplChgList", apmService.selectRpplChgList(apmCorrectVO));
//취하신청 정보
EntVO entVO = new EntVO();
entVO.setAdrSeq(cmmVO.getAdrSeq());
entVO.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ);
EntVO resultEntInfo = entService.selectEntInfo(entVO);
model.addAttribute("resultEntInfo", resultEntInfo);
//취하신청 등록 여부
EntVO entVO_2 = new EntVO();
entVO_2.setAdrSeq(cmmVO.getAdrSeq());
entVO_2.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ);
EntVO resultEntInfo_2 = entService.selectEntInfo_2(entVO_2);
model.addAttribute("resultEntInfo_2", resultEntInfo_2);
//확정증명원 유무
CloseVO closeVO = new CloseVO();
closeVO.setAdrSeq(cmmVO.getAdrSeq());
closeVO.setAdrSn(cmmVO.getAdrSn());
closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80);
model.addAttribute("resultCloseDoc", cmmService.selectCloseDoc(closeVO));
//진행상태가 결재요청상태 일때 결재결재선 중 결재 진행중인 사람 불러오기
model.addAttribute("sbmtStatus",apmService.selectSbmtIngStatus(cmmVO.getAdrSeq()));
/*//adr_mgr_detail 첨부파일 불러오기
FileVO fileVO = new FileVO();
//조정신청 첨부파일 리스트 불러오기.
String rpplMgrAtchFileId = resultAdjReqMgrOffLine.getAtchFileId();
fileVO.setAtchFileId(rpplMgrAtchFileId);
resultAdjReqMgrOffLine.setRpplMgrAtchFileId(rpplMgrAtchFileId);
List<FileVO> rpplMgrAtchFileList = fileService.selectFileInfs(fileVO);
model.addAttribute("rpplMgrAtchFileList", rpplMgrAtchFileList);*/
//이력값 - 시작
AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO();
adrHstryMgrVO.setAdrSeq(cmmVO.getAdrSeq());
model.addAttribute("list_mgr" , adrHstryMgrService.selectList(adrHstryMgrVO));
//이력값 - 끝
AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO();
adjReqMgrVO.setAdrSeq(cmmVO.getAdrSeq());
List<AdjReqMgrVO> person = adjReqMgrService.selectAdjstReqMgrPersonList(adjReqMgrVO);
decryptInfomation(person ,null);
model.addAttribute("person", person);
//이름에 ,를 넣는경우 발생하는 오류를 막기위한 예외처리 추가
try {
respNm = resPonDentNm[i]; //피신청인 이름
respId = resPonDentId[i]; //피신청인 ID
}catch(Exception ex) {
ex.printStackTrace();
}
PgrCmmVO temp = new PgrCmmVO();
temp.setResPonDentNm(respNm);
temp.setResPonDentId(respId);
//등록된 대리인 정보가 있으면 처리
if(StringUtil.isNotEmpty(info.getResPonDentDNm())) {
for(int j=0; j < rpplResPonddSeq.length; j++) {
String rpplResSeq = rpplResPonddSeq[j]; //대리인의 피신청인 ID
String respdNm = resPonDentDNm[j]; //피신청 대리인 이름
String respdId = resPonDentDId[j]; //피신청 대리인 ID
if(respId.equals(rpplResSeq)) {
temp.setResPonDentDNm(respdNm);
temp.setResPonDentDId(respdId);
temp.setRpplRespddSeq(rpplResSeq); //대리인의 피신청인 ID (어떤 피신청인의 대리인인지 구분하기 위해)
}
}
}
rpplRepondList.add(temp);
}
model.addAttribute("rpplRepondList", rpplRepondList);
// 조정기일 - 등록된 조정기일 중 조정위원 승인이 완료된 정보를 모두 불러옴(기일 승인이 완료된 건만 불러옴)
//List<PgrCmmVO> apmChgDateList = apmService.selectApmChgDateConfirmInfo(cmmVO);
List<PgrCmmVO> apmChgDateList = apmService.selectApmChgDateConfirmInfoList202211(cmmVO);
model.addAttribute("apmChgDateList", apmChgDateList);
// 사용자 조정기일 변경신청 건이 있는지 확인
List<PgrCmmVO> apmChgDateCnt = apmService.selectApmChgDateInfoCnt(cmmVO);
model.addAttribute("apmChgDateCnt", apmChgDateCnt);
// 사용자 조정기일 변경신청 건이 있는지 확인 with 차수(해당 차수의 변경신청 건이 있는지 확인)
List<PgrCmmVO> apmChgDateCntWithSn = apmService.selectApmChgDateInfoCntWithSn(cmmVO);
model.addAttribute("apmChgDateCntWithSn", apmChgDateCntWithSn);
//최종 차수 정보
//String adrMaxSn = apmChgDateList.get(0).getAdrSn();
//model.addAttribute("adrMaxSn", adrMaxSn);
//기일조서값
DrtVO drtVO = new DrtVO();
drtVO.setAdrSeq(cmmVO.getAdrSeq());
drtVO.setAdrSn(cmmVO.getAdrSn());
drtVO = drtService.selectAdrPrtclMgr(drtVO);
model.addAttribute("drtInfo", drtVO);
//이의신청
OjctVO ojctVO = new OjctVO();
ojctVO.setAdrSeq(cmmVO.getAdrSeq());
int ojctCnt = ojctService.selectOjctListCount(ojctVO);
model.addAttribute("ojctCnt", ojctCnt);
//경정조서
ApmCorrectVO apmCorrectVO = new ApmCorrectVO();
apmCorrectVO.setAdrSeq(cmmVO.getAdrSeq());
model.addAttribute("rpplChgList", apmService.selectRpplChgList(apmCorrectVO));
//취하신청 정보
EntVO entVO = new EntVO();
entVO.setAdrSeq(cmmVO.getAdrSeq());
entVO.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ);
EntVO resultEntInfo = entService.selectEntInfo(entVO);
model.addAttribute("resultEntInfo", resultEntInfo);
//취하신청 등록 여부
EntVO entVO_2 = new EntVO();
entVO_2.setAdrSeq(cmmVO.getAdrSeq());
entVO_2.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ);
EntVO resultEntInfo_2 = entService.selectEntInfo_2(entVO_2);
model.addAttribute("resultEntInfo_2", resultEntInfo_2);
//확정증명원 유무
CloseVO closeVO = new CloseVO();
closeVO.setAdrSeq(cmmVO.getAdrSeq());
closeVO.setAdrSn(cmmVO.getAdrSn());
closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80);
model.addAttribute("resultCloseDoc", cmmService.selectCloseDoc(closeVO));
//진행상태가 결재요청상태 일때 결재결재선 중 결재 진행중인 사람 불러오기
model.addAttribute("sbmtStatus",apmService.selectSbmtIngStatus(cmmVO.getAdrSeq()));
/*//adr_mgr_detail 첨부파일 불러오기
FileVO fileVO = new FileVO();
//조정신청 첨부파일 리스트 불러오기.
String rpplMgrAtchFileId = resultAdjReqMgrOffLine.getAtchFileId();
fileVO.setAtchFileId(rpplMgrAtchFileId);
resultAdjReqMgrOffLine.setRpplMgrAtchFileId(rpplMgrAtchFileId);
List<FileVO> rpplMgrAtchFileList = fileService.selectFileInfs(fileVO);
model.addAttribute("rpplMgrAtchFileList", rpplMgrAtchFileList);*/
//이력값 - 시작
AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO();
adrHstryMgrVO.setAdrSeq(cmmVO.getAdrSeq());
model.addAttribute("list_mgr" , adrHstryMgrService.selectList(adrHstryMgrVO));
//이력값 - 끝
AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO();
adjReqMgrVO.setAdrSeq(cmmVO.getAdrSeq());
List<AdjReqMgrVO> person = adjReqMgrService.selectAdjstReqMgrPersonList(adjReqMgrVO);
decryptInfomation(person ,null);
model.addAttribute("person", person);
}catch(Exception ex) {
ex.printStackTrace();
}
return "/kccadr/adjPgrMgr/apm/apmTab0";
}

8
src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml
View File

@ -36,7 +36,7 @@
ORDER BY S1.FRST_REGIST_PNTTM
) AS RES_PON_DENT_NM
, ( SELECT GROUP_CONCAT(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30' GROUP BY S1.adr_seq) AS DEPU_TY_NMS
, ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM
, ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM
,FRST_REGIST_PNTTM
,FRST_REGISTER_ID
,LAST_UPDT_PNTTM
@ -81,7 +81,7 @@
ORDER BY S1.FRST_REGIST_PNTTM
) AS RES_PON_DENT_NM
, ( SELECT GROUP_CONCAT(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30' GROUP BY S1.adr_seq) AS DEPU_TY_NMS
, ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM
, ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM
,REJECT_CN
,FRST_REGIST_PNTTM
,FRST_REGISTER_ID
@ -240,7 +240,7 @@
ORDER BY S1.FRST_REGIST_PNTTM
) AS RES_PON_DENT_NM
, ( SELECT GROUP_CONCAT(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30' GROUP BY S1.adr_seq) AS DEPU_TY_NMS
, ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM
, ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM
,REJECT_CN
,FRST_REGIST_PNTTM
,FRST_REGISTER_ID
@ -783,7 +783,7 @@
ORDER BY S1.FRST_REGIST_PNTTM
) AS RES_PON_DENT_NM
, ( SELECT GROUP_CONCAT(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30' GROUP BY S1.adr_seq) AS DEPU_TY_NMS
, ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM
, ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM
,FRST_REGIST_PNTTM
,FRST_REGISTER_ID
,LAST_UPDT_PNTTM

4
src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml
View File

@ -170,8 +170,8 @@
GROUP BY S1.adr_seq
ORDER BY S1.FRST_REGIST_PNTTM
) AS RES_PON_DENT_NM
, ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30') AS DEPU_TY_NM
, ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM
, ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30') AS DEPU_TY_NM
, ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM
,FRST_REGIST_PNTTM
,FRST_REGISTER_ID
,LAST_UPDT_PNTTM

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

@ -502,9 +502,25 @@ $(document).ready(function(){
$("#${list.menuId}").addClass("status01");
</script>
<c:set var="lastMenuId">${list.menuId}</c:set>
</c:if>
</c:forEach>
<!-- 최종값 찾기 -->
<c:forEach var="list" items="${list_mgr}" varStatus="status">
<c:if test="${fn:length(list.menuId) eq '6'}">
<!-- 사건접수진행시 체크-->
<c:if test="${list.menuId ne '400000'
and fn:indexOf(list.menuId,'3090')<0}">
<c:set var="passMenuId">${list.menuId}</c:set>
</c:if>
<c:if test="${list.menuId eq '400000'}">
<c:set var="lastMenuId">400000</c:set>
</c:if>
</c:if>
</c:forEach>
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
@ -549,32 +565,98 @@ $(document).ready(function(){
</script>
</c:if>
<!-- 취하종결 체크-->
<c:if test="${info.statCd eq '305010'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#305050").addClass("status02");
</script>
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${info.statCd eq '302010'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
//$("#302050").addClass("status02");
</script>
</c:if>
<!-- 취하신청 체크-->
<c:if test="${info.statCd eq 'C290' or info.statCd eq 'A320'}">
<script>
<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#C290").addClass("status02");
</script>
</c:if>
</c:if>
<!-- 취하종결 체크-->
<c:if test="${fn:indexOf(info.statCd,'3050')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3050").addClass("status01");
</script>
</c:if>
<!-- 조정성립 체크-->
<c:if test="${fn:indexOf(info.statCd,'3040')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3040").addClass("status01");
</script>
</c:if>
<!-- 직권조정 체크-->
<c:if test="${fn:indexOf(info.statCd,'3060')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3060").addClass("status01");
$("#3061").removeClass("status01");
</script>
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${fn:indexOf(info.statCd,'3030')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3030").addClass("status01");
</script>
</c:if>
<!-- 불성립 체크-->
<c:if test="${fn:indexOf(info.statCd,'3070')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3070").addClass("status01");
</script>
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${info.statCd eq '400000'
or fn:indexOf(info.statCd,'3090')>-1
}">
<!-- 조정성립 체크-->
<c:if test="${fn:indexOf(passMenuId,'3040')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3040").addClass("status01");
</script>
</c:if>
<!-- 직권조정 체크-->
<c:if test="${fn:indexOf(passMenuId,'3060')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3060").addClass("status01");
$("#3061").removeClass("status01");
</script>
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${fn:indexOf(passMenuId,'3030')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3030").addClass("status01");
</script>
</c:if>
<!-- 불성립 체크-->
<c:if test="${fn:indexOf(passMenuId,'3070')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3070").addClass("status01");
</script>
</c:if>
</c:if>
<!-- 워크플로우용 스크립트 끝 -->
</head>
@ -612,7 +694,7 @@ $(document).ready(function(){
<div class="tab_cont on">
<div class="btn_wrap btn_layout05">
new button-코드 삭제 예정임/${info.statCd}/
(new button-코드 삭제 예정임/${info.statCd}/)
<div class="btn_left_box">
<c:choose>
@ -1012,8 +1094,9 @@ $(document).ready(function(){
</div>
old button-개발용 코드 노출 삭제 예정임/${info.statCd}/
<div class="btn_left_box" style="display:none;">
(old button-개발용 코드 노출 삭제 예정임/${info.statCd}/)
<c:choose>
<c:when test="${info.adrNo == null || info.adrNo == ''}">
<button type="button" class="btnType02" onclick="fncReg()">조정접수</button>
@ -1646,7 +1729,7 @@ $(document).ready(function(){
<button type="button" class="btnType03" onclick="fncBtnShowAll()">개발용테스트버튼보기</button>
--%>
</div>
<div class="btn_right_box" style="display:none;">
<div class="btn_right_box" style="display:none;">
<button type="button" class="btnType03" onclick="fncSmsSend();">문자발송</button>
<button type="button" class="btnType03" onclick="fncGo('apm/apmList.do')">목록</button>
</div>

50
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp
View File

@ -181,6 +181,43 @@
});
}
function fnc_aprvl_pop(param){
var pop = document.pop;
pop.sbmtTyCd.value=param;
//commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
if (param=='201010'){ //20, 30, 40
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
//commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}else if (param=='202010'){ //30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop'));
}else if (param=='204010'
|| param=='205010'
|| param=='302010'
|| param=='303010'
|| param=='304010'
|| param=='305010'
|| param=='306010'
|| param=='307010'
){ //50
//204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop'));
}else if (param=='309010'){ //50, 20, 30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}
}
//결재 팝업 이후 처리내용
function fnc_aprvl_pop_ret(param){
//location.reload();
fncGoList('list'); //조정진행목록으로
}
function sendDlvInfoPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop'));
}
@ -263,6 +300,16 @@
</script>
</head>
<body>
<!-- 고도화로 추가됨 -->
<form id="pop" name="pop" method="post">
<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${info.adrSeq}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn}" />" />
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<!-- 고도화로 추가됨 -->
<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
</form>
<form id="dlvpop" name="dlvpop" method="post">
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn }" />" />
@ -574,7 +621,8 @@
info.statCd eq '302050'
|| info.statCd eq '303090'
}">
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('303010');">조정권고안 승인 요청</button>
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_step_1('303010');">조정권고안 승인 요청</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('303010');">조정권고안 승인 요청</button>
<button type="button" class="btnType06" onclick="fncDel()">삭제</button>
<button type="button" class="btnType06" onclick="fncUpd()">수정</button>
</c:if>

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp
View File

@ -286,7 +286,7 @@
<div class="btn_wrap btn_layout01">
<div class="area_left"></div>
<div class="area_right">
<button type="button" class="btnType02" onclick="fncReg('303010');">조정권고안 승인 요청</button>
<!-- <button type="button" class="btnType02" onclick="fncReg('303010');">조정권고안 승인 요청</button> -->
<button type="button" class="btnType06" onclick="fncReg()">등록</button>
<button type="button" class="btnType04" onclick="fncGoList()">취소</button>
</div>

8
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp
View File

@ -470,8 +470,12 @@ $(document).ready(function() {
<button type="button" class="btnType02" onclick="sendDlvInfo();">송달정보입력</button>
</c:otherwise>
</c:choose>
<button type="button" class="btnType06" onclick="fncDel()">삭제</button>
<button type="button" class="btnType06" onclick="fncUpd()">수정</button>
<c:if test="${info.statCd ne '400000'}">
<button type="button" class="btnType06" onclick="fncDel()">삭제</button>
<button type="button" class="btnType06" onclick="fncUpd()">수정</button>
</c:if>
<button type="button" class="btnType04" onclick="fncGoList()">취소</button>
</div>
</div>

50
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp
View File

@ -175,6 +175,43 @@
});
}
function fnc_aprvl_pop(param){
var pop = document.pop;
pop.sbmtTyCd.value=param;
//commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
if (param=='201010'){ //20, 30, 40
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
//commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}else if (param=='202010'){ //30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop'));
}else if (param=='204010'
|| param=='205010'
|| param=='302010'
|| param=='303010'
|| param=='304010'
|| param=='305010'
|| param=='306010'
|| param=='307010'
){ //50
//204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop'));
}else if (param=='309010'){ //50, 20, 30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}
}
//결재 팝업 이후 처리내용
function fnc_aprvl_pop_ret(param){
//location.reload();
fncGoList('list'); //조정진행목록으로
}
function sendDlvInfoPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop'));
}
@ -251,6 +288,16 @@
</script>
</head>
<body>
<!-- 고도화로 추가됨 -->
<form id="pop" name="pop" method="post">
<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${info.adrSeq}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn}" />" />
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<!-- 고도화로 추가됨 -->
<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
</form>
<form id="dlvpop" name="dlvpop" method="post">
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn }" />" />
@ -491,7 +538,8 @@
|| info.statCd eq '306050'
|| info.statCd eq '307090'
}">
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('307010');">불성립종결통보서 승인 요청</button>
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_step_1('307010');">불성립종결통보서 승인 요청</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('307010');">불성립종결통보서 승인 요청</button>
<button type="button" class="btnType06" onclick="fncDel()">삭제</button>
<button type="button" class="btnType06" onclick="fncUpd()">수정</button>
</c:if>

5
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp
View File

@ -154,8 +154,9 @@
cache : false,
success : function(returnData, status) {
if (returnData.result == 'success') {
alert("기일조서가 수정 되었습니다.");
fncGoList(); //상세
alert("기일조서가 수정 되었습니다.");
//fncGoList(); //상세
location.reload();
} else {
alert(returnData.message);
}

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp
View File

@ -58,7 +58,7 @@ function tabPageLoad(idx) {
$('.tab_cont .btn_wrap .area_left').find('button').remove('button');
$('.tab_cont .btn_layout05').find('button').remove('button');
$('.tab_cont .tb_tit').find('button').remove('button');
//btn_wrap btn_layout05
//btn_wrap btn_layout05
});
}

51
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp
View File

@ -186,6 +186,44 @@
});
}
function fnc_aprvl_pop(param){
var pop = document.pop;
pop.sbmtTyCd.value=param;
//commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
if (param=='201010'){ //20, 30, 40
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
//commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}else if (param=='202010'){ //30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop'));
}else if (param=='204010'
|| param=='205010'
|| param=='302010'
|| param=='303010'
|| param=='304010'
|| param=='305010'
|| param=='306010'
|| param=='307010'
){ //50
//204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop'));
}else if (param=='309010'){ //50, 20, 30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}
}
//결재 팝업 이후 처리내용
function fnc_aprvl_pop_ret(param){
//location.reload();
fncGoList('list'); //조정진행목록으로
}
function sendDlvInfoPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop'));
}
@ -270,6 +308,16 @@
</script>
</head>
<body>
<!-- 고도화로 추가됨 -->
<form id="pop" name="pop" method="post">
<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${info.adrSeq}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn}" />" />
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<!-- 고도화로 추가됨 -->
<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
</form>
<form id="dlvpop" name="dlvpop" method="post">
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn }" />" />
@ -568,7 +616,8 @@
info.statCd eq '302050'
|| info.statCd eq '306090'
}">
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('306010');">직권조정결정서 승인 요청</button>
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_step_1('306010');">직권조정결정서 승인 요청</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('306010');">직권조정결정서 승인 요청</button>
<button type="button" class="btnType06" onclick="fncDel()">삭제</button>
<button type="button" class="btnType06" onclick="fncUpd()">수정</button>
</c:if>

99
src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp
View File

@ -111,15 +111,31 @@
or list.menuId eq 'A260'
or list.menuId eq 'A320'
or list.menuId eq 'C150'
or list.menuId eq 'C290'
}">
<script>
//<!-- 조정진행워크플로우 체크 -->
$("#${list.menuId}").addClass("status01");
</script>
<c:set var="lastMenuId">${list.menuId}</c:set>
</c:if>
</c:forEach>
</c:forEach>
<!-- 최종값 찾기 -->
<c:forEach var="list" items="${list_mgr}" varStatus="status">
<c:if test="${fn:length(list.menuId) eq '6'}">
<!-- 사건접수진행시 체크-->
<c:if test="${list.menuId ne '400000'}">
<c:set var="passMenuId">${list.menuId}</c:set>
</c:if>
<c:if test="${list.menuId eq '400000'}">
<c:set var="lastMenuId">400000</c:set>
</c:if>
</c:if>
</c:forEach>
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
@ -138,53 +154,96 @@
<!-- 사건접수진행시 체크-->
<c:if test="${info.statCd eq '201010'
or info.statCd eq '201050'}">
<c:if test="${master.statCd eq '201010'
or master.statCd eq '201050'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#101050").addClass("status02");
</script>
</c:if>
</c:if>
<!-- 조정부배당진행시 체크-->
<c:if test="${info.statCd eq '202010'}">
<c:if test="${master.statCd eq '202010'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#202050").addClass("status02");
</script>
</c:if>
</c:if>
<!-- 기일진행시 체크-->
<c:if test="${info.statCd eq '205010'}">
<c:if test="${master.statCd eq '205010'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#205050").addClass("status02");
</script>
</c:if>
</c:if>
<!-- 취하신청 체크-->
<c:if test="${master.statCd eq 'C290' or master.statCd eq 'A320'}">
<script>
<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#C290").addClass("status02");
</script>
</c:if>
<!-- 취하종결 체크-->
<c:if test="${info.statCd eq '305010'}">
<c:if test="${master.statCd eq '305010'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#305050").addClass("status02");
</script>
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${info.statCd eq '302010'}">
</c:if>
<!-- 조정성립 체크-->
<c:if test="${fn:indexOf(master.statCd,'3040')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
//$("#302050").addClass("status02");
$("#3040").addClass("status01");
</script>
</c:if>
<!-- 워크플로우용 스크립트 끝 -->
</c:if>
<!-- 직권조정 체크-->
<c:if test="${fn:indexOf(master.statCd,'3060')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3060").addClass("status01");
$("#3061").removeClass("status01");
</script>
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${fn:indexOf(master.statCd,'3030')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3030").addClass("status01");
</script>
</c:if>
<!-- 불성립 체크-->
<c:if test="${fn:indexOf(master.statCd,'3070')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3070").addClass("status01");
</script>
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${lastMenuId eq '400000'}">
<script>
<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#${passMenuId}").addClass("status02");
alert("#${passMenuId}");
</script>
</c:if>
<!-- 워크플로우용 스크립트 끝 -->
</head>
<body>
<form id="pop" name="pop" method="post">
<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${adjstReqStatusVO.adrSeq}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${adjstReqStatusVO.adrSn}" />" />

12
src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp
View File

@ -27,15 +27,15 @@
<li>
<p id="302010">1차 기일 개최<img src="/kccadrPb/usr/image/workflow/nexticon4.png" alt="다음" class="nexticon_4"></p><img src="/kccadrPb/usr/image/workflow/nexticon3.png" alt="다음" class="nexticon_3">
<ul class="work_4">
<li id="309050"><p>조정성립</p></li>
<li><p>직권조정<img src="/kccadrPb/usr/image/workflow/nexticon5.png" alt="다음" class="nexticon_5"></p>
<li id="3040"><p>조정성립</p></li>
<li id="3060"><p>직권조정<img src="/kccadrPb/usr/image/workflow/nexticon5.png" alt="다음" class="nexticon_5"></p>
<ul class="work_5">
<li><p>이의신청</p></li>
<li id="3061"><p>이의신청</p></li>
</ul>
</li>
<li id="303050"><p>조정권고</p></li>
<li id="3030"><p>조정권고</p></li>
<li><p>쌍방수락여부 확인</p></li>
<li id="307050"><p>불성립종결</p></li>
<li id="3070"><p>불성립종결</p></li>
</ul>
</li>
<li>
@ -47,7 +47,7 @@
</li>
<li style="position: absolute; top: 146px" id="204050"><p>기일변경</p></li>
<li><p id="C150">변론서 및 답변서</p></li>
<li style="width: 450px;"><p id="C290">취하신청</p><img src="/kccadrPb/usr/image/workflow/nexticon1.png" alt="다음" style="position:absolute; left: 203px;"><p style="margin-left: 7px;" id="305050">취하종결</p></li>
<li style="width: 450px;"><p id="C290">취하신청</p><img src="/kccadrPb/usr/image/workflow/nexticon1.png" alt="다음" style="position:absolute; left: 203px;"><p style="margin-left: 7px;" id="3050">취하종결</p></li>
</ul>
</div>
</div>

4
src/main/webapp/kccadrPb/adm/css/content.css
View File

@ -451,9 +451,9 @@ table select+button{vertical-align: middle;}
.nexticon_5{position: absolute; top: 22px; left: 215px;}
.work_flow_wrap.off .work_cont{height: 0; padding: 0 25px; margin: 0; transition: all 0.5s ease;}
.work_cont .status01 p{border: 1px solid #ea5404; color: #ea5404;}
.work_cont .status01 > p{border: 1px solid #ea5404; color: #ea5404;}
.work_cont p.status01{border: 1px solid #ea5404; color: #ea5404;}
.work_cont .status02 p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;}
.work_cont .status02 > p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;}
.work_cont p.status02{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;}
/* //워크플로우 */