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-09-29 11:01:15 +09:00
commit c70af795a3
10 changed files with 493 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,6 +158,13 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable {
private String rpplConnNo;
private String resPonDentNms = ""; //피신청인 총 갯수
private String assPstSeq;
private String memPstSeq;
private String memDeptNm;
private String assPstUsrNm;
private String adrHstrySeq;
private String pstCn;
public AdjReqMgrVO getAdrVO() {
return adrVO;
}
@ -781,6 +788,42 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable {
public void setResPonDentNms(String resPonDentNms) {
this.resPonDentNms = resPonDentNms;
}
public String getAssPstSeq() {
return assPstSeq;
}
public void setAssPstSeq(String assPstSeq) {
this.assPstSeq = assPstSeq;
}
public String getMemPstSeq() {
return memPstSeq;
}
public void setMemPstSeq(String memPstSeq) {
this.memPstSeq = memPstSeq;
}
public String getMemDeptNm() {
return memDeptNm;
}
public void setMemDeptNm(String memDeptNm) {
this.memDeptNm = memDeptNm;
}
public String getAssPstUsrNm() {
return assPstUsrNm;
}
public void setAssPstUsrNm(String assPstUsrNm) {
this.assPstUsrNm = assPstUsrNm;
}
public String getAdrHstrySeq() {
return adrHstrySeq;
}
public void setAdrHstrySeq(String adrHstrySeq) {
this.adrHstrySeq = adrHstrySeq;
}
public String getPstCn() {
return pstCn;
}
public void setPstCn(String pstCn) {
this.pstCn = pstCn;
}

4
src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java
View File

@ -38,6 +38,8 @@ public interface AdjReqMgrPastService {
ResponseEntity<RestResponse> deleteAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO);
String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO);
AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO);
void updateAdjReqMgrEtc(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException;
}

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

@ -44,6 +44,8 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
private String pstCn; /* 조정결과 */
private String memPstSeq; /* 조정부 PK */
// 조정사건
@ -207,10 +209,9 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
private String refSeq1; // 참고용 일련번호 1
private String refSeq2; // 참고용 일련번호 2
private String adrHstryList[];
public AdjReqMgrVO getAdrVO() {
return adrVO;
}
@ -371,6 +372,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
this.addDe = addDe;
}
public String getPstCn() {
return pstCn;
}
public void setPstCn(String pstCn) {
this.pstCn = pstCn;
}
public String getAdrSeq() {
return adrSeq;
}
@ -867,6 +876,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
this.addAgntList = addAgntList;
}
public String[] getAddUsrNmList() {
return addUsrNmList;
}
public void setAddUsrNmList(String[] addUsrNmList) {
this.addUsrNmList = addUsrNmList;
}
public String getAdrSn() {
return adrSn;
}
@ -1163,6 +1180,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
this.appResultTy = appResultTy;
}
public String getAppResultTx() {
return appResultTx;
}
public void setAppResultTx(String appResultTx) {
this.appResultTx = appResultTx;
}
public String getMemDeptNm() {
return memDeptNm;
}
@ -1243,22 +1268,6 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
this.appPlaceDetailTx = appPlaceDetailTx;
}
public String[] getAddUsrNmList() {
return addUsrNmList;
}
public void setAddUsrNmList(String[] addUsrNmList) {
this.addUsrNmList = addUsrNmList;
}
public String getAppResultTx() {
return appResultTx;
}
public void setAppResultTx(String appResultTx) {
this.appResultTx = appResultTx;
}
public String getAdrHstrySeq() {
return adrHstrySeq;
}
@ -1339,17 +1348,15 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
this.adrHstryList = adrHstryList;
}
public String getPstCn() {
return pstCn;
public String getMemPstSeq() {
return memPstSeq;
}
public void setPstCn(String pstCn) {
this.pstCn = pstCn;
public void setMemPstSeq(String memPstSeq) {
this.memPstSeq = memPstSeq;
}
// =============================================

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

@ -7,6 +7,7 @@ import org.springframework.stereotype.Repository;
import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
import kcc.kccadr.adjPgrMgr.drt.service.AssVO;
import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO;
import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
import kcc.kccadr.adjReqMgrPast.service.AdrMemDeptMgrPstVO;
@ -107,8 +108,44 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO {
}
public String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) {
return (String) select("adjReqMgrPastDAO.findByAdrHstryWhereStatCd", adjReqMgrPastVO);
public AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) {
return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByAdrHstryWhereStatCd", adjReqMgrPastVO);
}
public int updateAdjReqMgrOffMaster(AdjReqMgrPastVO adjReqMgrPastVO) {
return update("adjReqMgrPastDAO.updateAdjReqMgrPastMaster", adjReqMgrPastVO );
}
public int updateAdjReqMgrPastRppl(AdjReqMgrPastVO adjReqMgrPastVO) {
return update("adjReqMgrPastDAO.updateAdjReqMgrPastRppl", adjReqMgrPastVO);
}
public void updateMemDeptNm(AdjReqMgrPastVO adjReqMgrPastVO) {
update("adjReqMgrPastDAO.updateMemDeptNm", adjReqMgrPastVO);
}
public void updateAssPstUsrNm(AdjReqMgrPastVO adjReqMgrPastVO) {
update("adjReqMgrPastDAO.updateAssPstUsrNm", adjReqMgrPastVO);
}
public void updateAdrHstry(AdjReqMgrPastVO adjReqMgrPastVO) {
update("adjReqMgrPastDAO.updateAdrHstry", adjReqMgrPastVO);
}
public List<AdjReqMgrPastVO> selectAdrPrtclMgrRow(AdjReqMgrPastVO adjReqMgrPastVO) {
return (List<AdjReqMgrPastVO>) list("adjReqMgrPastDAO.selectAdrPrtclMgrRow", adjReqMgrPastVO);
}
public void updateAdrMgrDetailPstCn(AdjReqMgrPastVO adjReqMgrPastVO) {
update("adjReqMgrPastDAO.updateAdrMgrDetailPstCn", adjReqMgrPastVO);
}
public void deleteAdrPrtclMgrRow(AdjReqMgrPastVO adjReqMgrPastVO) {
delete("adjReqMgrPastDAO.deleteAdrPrtclMgrRow", adjReqMgrPastVO );
}
}

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

@ -2,9 +2,7 @@ package kcc.kccadr.adjReqMgrPast.service.impl;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@ -15,8 +13,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import com.mchange.v2.sql.filter.SynchronizedFilterCallableStatement;
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.cmmn.exception.FdlException;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
@ -103,7 +99,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
String rpplTy = resultAdjReqMgrList.get(0).getRpplTy();
int listCnt = resultAdjReqMgrList.size();
logger.info(" + listCnt :: [{}]", listCnt);
//신청 대리인 여부 확인
int rpplTy_30_exist = 0;
@ -143,7 +138,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
//신청인 정보 추가해주기
temp = resultAdjReqMgrList.get(i);
logger.info("");
resultAdjReqMgrOffLine.getAdjReqMgrVoList().add(decryptAdjReqMgrReturn(temp));
}
@ -170,6 +164,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
// 피신청인 총 갯수 저장해주기
resultAdjReqMgrOffLine.setReqPerTotCnt(Integer.toString(totCnt));
resultAdjReqMgrOffLine.setRpplTy(resultAdjReqMgrOffLine.getAdjReqMgrVoList().get(1).getRpplTy());
}
return resultAdjReqMgrOffLine;
@ -189,7 +185,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
String rpplRealAddr = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealAddr()); //우편물 수령지 주소
String rpplRealAddrDtl = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealAddrDtl()); //우편물 수령지 상세주소
logger.info("resultAdjReqMgrOffLine.getRp11plTy() :: [{}]", adjReqMgrPastVO.getRpplTy());
adjReqMgrPastVO.setRpplNm(rpplNm);
adjReqMgrPastVO.setRpplEmail(rpplEmail);
adjReqMgrPastVO.setRpplPhone(rpplPhone);
@ -433,11 +428,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
//rpplCnt = adjReqMgrPastDAO.insertAdrRppl(adjReqMgrOffLineVO.getAdjReqMgrVoList().get(num));
}
}
}
int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn());
@ -772,8 +763,102 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
@Override
public String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) {
public AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) {
return adjReqMgrPastDAO.findByAdrHstryWhereStatCd(adjReqMgrPastVO);
}
// 오프라인 조정신청 이름, 이메일, 연락처, 주소정보 암호화 후 데이터베이스에 수정해주기
public int cryptAdjReqMgrSendUpdate(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
String rpplNm = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplNm()); //신청인이름
String rpplEmail = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplEmail()); //이메일주소
String rpplPhone = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplPhone()); //연락처
String rpplPost = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplPost()); //우편번호
String rpplAddr = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplAddr()); //주소
String rpplAddrDtl = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplAddrDtl()); //상세주소
String rpplRealPost = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplRealPost()); //우편물 수령지 우편번호
String rpplRealAddr = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplRealAddr()); //우편물 수령지 주소
String rpplRealAddrDtl = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplRealAddrDtl()); //우편물 수령지 상세주소
adjReqMgrPastVO.setRpplNm(rpplNm);
adjReqMgrPastVO.setRpplEmail(rpplEmail);
adjReqMgrPastVO.setRpplPhone(rpplPhone);
adjReqMgrPastVO.setRpplPost(rpplPost);
adjReqMgrPastVO.setRpplAddr(rpplAddr);
adjReqMgrPastVO.setRpplAddrDtl(rpplAddrDtl);
adjReqMgrPastVO.setRpplRealPost(rpplRealPost);
adjReqMgrPastVO.setRpplRealAddr(rpplRealAddr);
adjReqMgrPastVO.setRpplRealAddrDtl(rpplRealAddrDtl);
//디비에 수정해 주기
int resultCnt = adjReqMgrPastDAO.updateAdjReqMgrPastRppl(adjReqMgrPastVO);
return resultCnt;
}
@Override
public void updateAdjReqMgrEtc(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException {
logger.info(" ++ updateAdjReqMgrEtc ++ ");
// 조정부 수정
adjReqMgrPastDAO.updateMemDeptNm(adjReqMgrPastVO);
// 조사관 수정
adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO);
// 최종결과 CODE 수정
adjReqMgrPastDAO.updateAdrHstry(adjReqMgrPastVO);
// 조정결과 수정
adjReqMgrPastDAO.updateAdrMgrDetailPstCn(adjReqMgrPastVO);
/*
* TODO 차수 수정
* TB adr_prtcl_mgr
* 기존 차수와 현재 차수 갯수가 다르면 삭제 및 추가 해야함
* */
List<AdjReqMgrPastVO> prtclRowList = adjReqMgrPastDAO.selectAdrPrtclMgrRow(adjReqMgrPastVO);
// System.out.println("prtclRowList.get(0).getPrtclSeq() : "+ prtclRowList.get(0).getPrtclSeq());
prtclRowList.forEach(t->{
logger.info(" + t.getAdrSeq() [{}], [{}], [{}]", t.getAdrSeq(), t.getAdrSn(), t.getPrtclSeq());
});
logger.info(" exist row size :: [{}]", prtclRowList.size());
logger.info(" modify row size :: [{}]", adjReqMgrPastVO.getAdrSn());
int existAdrSnSize = prtclRowList.size();
int changeAdrSnSize = Integer.parseInt(adjReqMgrPastVO.getAdrSn());
// 기존에 있는 row보다 수정된 차수가 더 낮은 경우
// 기존row > 수정row
int gap = 0;
if(existAdrSnSize > changeAdrSnSize)
{
gap = existAdrSnSize - changeAdrSnSize;
for(int i=existAdrSnSize; i > gap; i--)
{
adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(i-1));
}
}
// 기존에 있는 row보다 수정된 차수가 더 높은 경우
// 기존row < 수정row
else if(existAdrSnSize < changeAdrSnSize)
{
gap = changeAdrSnSize - existAdrSnSize;
// int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn());
int cnt = existAdrSnSize; // 기존 row size
while(cnt <= changeAdrSnSize) // 수정할 row size
{
System.out.println("cnt : "+cnt);
// adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
// adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
// adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
cnt++;
}
}
}
}

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

@ -24,7 +24,6 @@ import kcc.com.cmm.LoginVO;
import kcc.com.cmm.service.EgovCmmUseService;
import kcc.com.cmm.service.EgovFileMngService;
import kcc.com.cmm.service.EgovFileMngUtil;
import kcc.com.cmm.service.impl.SequenceUtilServiceImpl;
import kcc.com.cmm.util.StringUtil;
import kcc.com.utl.fcc.service.EgovStringUtil;
import kcc.kccadr.adjPgrMgr.apm.service.ApmService;
@ -33,6 +32,8 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
import kcc.kccadr.adjPgrMgr.drt.service.AssVO;
import kcc.kccadr.adjPgrMgr.drt.service.DrtService;
import kcc.kccadr.adjPgrMgr.drt.service.DrtVO;
import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService;
import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastService;
import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
import kcc.kccadr.cmm.RestResponse;
@ -77,6 +78,10 @@ public class AdjReqMgrPastController {
@Resource(name = "apmService")
private ApmService apmService;
// 조정신청 서비스단
@Resource(name = "AdjReqMgrOffLineService")
private AdjReqMgrOffLineService adjReqMgrOffLineService;
// global 프로퍼티
@Resource(name="globalSettings")
protected Properties propertiesService;
@ -125,9 +130,8 @@ public class AdjReqMgrPastController {
//오프라인 조정 신청 정보 불러오기.
AdjReqMgrPastVO resultAdjReqMgrPast = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO);
String statCd = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO);
resultAdjReqMgrPast.setStatCd(statCd);
AdjReqMgrPastVO statCdInfo = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO);
model.addAttribute("statCdInfo", statCdInfo);
model.addAttribute("adrVO", resultAdjReqMgrPast);
}else {
//기본 값 셋팅 - 대리인 여부, 신청자 분류
@ -383,39 +387,6 @@ public class AdjReqMgrPastController {
return adjReqMgrPastService.deleteAdjReqRecordAjax(adjReqMgrPastVO);
}
/**
* @methodName : insertAdjReqMgrOffAjax
* @author : 이호영
* @date : 2022.08.24
* @description : 과거사건 기본정보등록 메서드
* @param multiRequest
* @param adjReqMgrPastVO
* @param redirectAttributes
* @param request
* @return
* @throws Exception
*/
@RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"})
public ResponseEntity<RestResponse> insertAdjReqMgrOffAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO
, RedirectAttributes redirectAttributes
, HttpServletRequest request) throws Exception {
//로그인 권한정보 불러오기
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
if(userId.equals("")) {
// Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized)
return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
}
//사용자 유니크 아이디 받아오기
adjReqMgrPastVO.setFrstRegisterId(userId);
adjReqMgrPastVO.setLastUpdusrId(userId);
//조정신청, 대리인, 신청인 등록 처리
return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO);
}
/**
* @methodName : checkNInsertAprvlPastAjax
@ -519,8 +490,94 @@ public class AdjReqMgrPastController {
/**
* @methodName : insertAdjReqMgrOffAjax
* @author : 이호영
* @date : 2022.08.24
* @description : 과거사건 기본정보등록 메서드
* @param multiRequest
* @param adjReqMgrPastVO
* @param redirectAttributes
* @param request
* @return
* @throws Exception
*/
@RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"})
public ResponseEntity<RestResponse> insertAdjReqMgrOffAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO) throws Exception {
//로그인 권한정보 불러오기
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
if(userId.equals("")) {
// Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized)
return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
}
//사용자 유니크 아이디 받아오기
adjReqMgrPastVO.setFrstRegisterId(userId);
adjReqMgrPastVO.setLastUpdusrId(userId);
//조정신청, 대리인, 신청인 등록 처리
return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO);
}
/**
* @methodName : updateAdrMgrMasterAjax
* @author : 이호영
* @date : 2022.09.28
* @description : 과거사건 수정
* @param multiRequest
* @param adjReqMgrPastVO
* @param redirectAttributes
* @param request
* @return
* @throws Exception
*/
@RequestMapping(value = {"/kccadr/adjReqMgOff/updateAdjReqMgrPastAjax.do"})
public ResponseEntity<RestResponse> updateAdrMgrMasterAjax(@ModelAttribute("adrVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws Exception {
//로그인 권한정보 불러오기
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
if(userId.equals("")) {
return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
}
//사용자 유니크 아이디 받아오기
adjReqMgrOffLineVO.setLastUpdusrId(userId);
/*
* 오프라인 수정 로직
* 수정 X
* */
String resultSts = adjReqMgrOffLineService.updateAdjReqMgrRpplReq(adjReqMgrOffLineVO);
AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO();
adjReqMgrPastVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq());
adjReqMgrPastVO.setMemDeptNm(adjReqMgrOffLineVO.getMemDeptNm()); // 조정부 PK
adjReqMgrPastVO.setMemPstSeq(adjReqMgrOffLineVO.getMemPstSeq()); // 조정부 명
adjReqMgrPastVO.setAssPstSeq(adjReqMgrOffLineVO.getAssPstSeq()); // 조사관 PK
adjReqMgrPastVO.setAssPstUsrNm(adjReqMgrOffLineVO.getAssPstUsrNm()); // 조사관 명
adjReqMgrPastVO.setStatCd(adjReqMgrOffLineVO.getStatCd()); // 최종 결과 코드
adjReqMgrPastVO.setAdrHstrySeq(adjReqMgrOffLineVO.getAdrHstrySeq()); // 히스토리 PK
adjReqMgrPastVO.setAdrSn(adjReqMgrOffLineVO.getAdrSn()); // 차수
adjReqMgrPastVO.setPstCn(adjReqMgrOffLineVO.getPstCn()); // 조정결과
/*
* 기존 수정로직 후 기타사항 수정
* 조정부, 조정조사관, 진행된 차수, 최종결과, 조정결과
* */
adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrPastVO);
if(resultSts.equals("updateSucc")) {
return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "정상적으로 수정하였습니다.", adjReqMgrOffLineVO.getAdrSeq(), LocalDateTime.now()));
}
return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "수정 중 오류가 발생하였습니다.", LocalDateTime.now()));
}

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

@ -386,8 +386,10 @@
<select id="adjReqMgrPastDAO.selectMemAss" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
select
AMDMP.MEM_DEPT_NM as memDeptNm ,
AAMP.ASS_PST_USR_NM as assPstUsrNm
AMDMP.MEM_DEPT_NM as memDeptNm
, AMDMP.mem_pst_seq as memPstSeq
, AAMP.ASS_PST_USR_NM as assPstUsrNm
, AAMP.ASS_PST_SEQ as assPstSeq
from
ADR_MGR_DETAIL AMD
left join ADR_MEM_DEPT_MGR_PST AMDMP on
@ -643,17 +645,125 @@
</update>
<!-- 과거사건등록 - 사건진행정보 이력 삭제-->
<update id="adjReqMgrPastDAO.deleteAdjReqRecordAjax" parameterClass="AdjReqPastVO">
<delete id="adjReqMgrPastDAO.deleteAdjReqRecordAjax" parameterClass="AdjReqPastVO">
DELETE FROM ADR_HSTRY
WHERE ADR_HSTRY_SEQ = #adrHstrySeq#
</update>
</delete>
<select id="adjReqMgrPastDAO.findByAdrHstryWhereStatCd" parameterClass="AdjReqPastVO" resultClass="String">
<select id="adjReqMgrPastDAO.findByAdrHstryWhereStatCd" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
SELECT
STAT_CD
ADR_HSTRY_SEQ AS adrHstrySeq
, STAT_CD AS statCd
FROM ADR_HSTRY
WHERE ADR_SEQ = #adrSeq#
AND STAT_CD IS NOT NULL
</select>
<update id="adjReqMgrPastDAO.updateAdjReqMgrPastMaster" parameterClass="AdjReqPastVO">
UPDATE ADR_MGR_MASTER SET
REQ_CN1 = #reqCn1#
,REQ_CN2 = #reqCn2#
,REQ_TY = #reqTy#
,CC_TY = #ccTy#
,ATCH_FILE_ID = #atchFileId#
,LAST_UPDT_PNTTM = NOW()
,LAST_UPDUSR_ID = #lastUpdusrId#
WHERE 1=1
AND ADR_SEQ = #adrSeq#
</update>
<select id="adjReqMgrPastDAO.selectAdjReqMgrCountByRpplSeq" parameterClass="AdjReqPastVO" resultClass="Integer">
SELECT
COUNT(RPPL_SEQ)
FROM
ADR_RPPL
WHERE
ADR_SEQ = #adrSeq#
AND RPPL_SEQ = #rpplSeq#
</select>
<!-- 오프라인 조정사건관리인 수정 : 조정신청 수정 -->
<update id="adjReqMgrPastDAO.updateAdjReqMgrPastRppl" parameterClass="AdjReqPastVO">
UPDATE ADR_RPPL SET
RPPL_TY = #rpplTy#
,AGNT_YN = #agntYn#
,RPPL_USR_TY = #rpplUsrTy#
,RPPL_NM = #rpplNm#
,RPPL_BIZ_NO = #rpplBizNo#
,RPPL_BIZ_ID = #rpplBizId#
,RPPL_BIZ_NM = #rpplBizNm#
,RPPL_POST = #rpplPost#
,RPPL_ADDR = #rpplAddr#
,RPPL_ADDR_DTL = #rpplAddrDtl#
,RPPL_REAL_POST = #rpplRealPost#
,RPPL_REAL_ADDR = #rpplRealAddr#
,RPPL_REAL_ADDR_DTL = #rpplRealAddrDtl#
,RPPL_PHONE = #rpplPhone#
,RPPL_EMAIL = #rpplEmail#
,RPPL_EMAIL_YN = #rpplEmailYn#
,RPPL_SMS_YN = #rpplSmsYn#
,RPPL_CLASS = #rpplClass#
,RPPL_GRADE = #rpplGrade#
,ATCH_FILE_ID = #atchFileId#
,RPPL_RELATION = #rpplRelation#
,RPPL_RELATION_ETC = #rpplRelationEtc#
,LAST_UPDT_PNTTM = NOW()
,LAST_UPDUSR_ID = #lastUpdusrId#
WHERE 1=1
AND ADR_SEQ = #adrSeq#
AND RPPL_SEQ = #rpplSeq#
</update>
<update id="adjReqMgrPastDAO.updateMemDeptNm" parameterClass="AdjReqPastVO">
UPDATE ADR_MEM_DEPT_MGR_PST SET
MEM_DEPT_NM = #memDeptNm#
WHERE
MEM_PST_SEQ = #memPstSeq#
</update>
<update id="adjReqMgrPastDAO.updateAssPstUsrNm" parameterClass="AdjReqPastVO">
UPDATE ADR_ASS_MGR_PST SET
ASS_PST_USR_NM = #assPstUsrNm#
WHERE
ASS_PST_SEQ = #assPstSeq#
</update>
<update id="adjReqMgrPastDAO.updateAdrHstry" parameterClass="AdjReqPastVO">
UPDATE ADR_HSTRY SET
STAT_CD = #statCd#
WHERE
ADR_HSTRY_SEQ = #adrHstrySeq#
</update>
<update id="adjReqMgrPastDAO.updateAdrMgrDetailPstCn" parameterClass="AdjReqPastVO">
UPDATE ADR_MGR_DETAIL SET
PST_CN = #pstCn#
WHERE
ADR_SEQ = #adrSeq#
</update>
<select id="adjReqMgrPastDAO.selectAdrPrtclMgrRow" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
SELECT
ADR_SEQ as adrSeq
, ADR_SN as adrSn
, PRTCL_SEQ as prtclSeq
FROM
ADR_PRTCL_MGR
WHERE
ADR_SEQ = #adrSeq#
</select>
<delete id="adjReqMgrPastDAO.deleteAdrPrtclMgrRow" parameterClass="AdjReqPastVO">
DELETE FROM ADR_PRTCL_MGR
WHERE ADR_SEQ = #adrSeq#
AND PRTCL_SEQ = #prtclSeq#
</delete>
</sqlMap>

1
src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp
View File

@ -1553,6 +1553,7 @@
if (obj) data.append("fileFr"+idx, obj.fileObj);
});
console.log('data :', data);
$.ajax({
type: "POST",

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

@ -36,41 +36,39 @@
<validator:javascript formName="model" staticJavascript="false" xhtml="true" cdata="false"/>
<script type="text/javaScript" language="javascript">
$(document).ready(function(){
if($('#statCd').val())
{
console.log('$(#statCd).val() : ', $('#statCd').val());
var statCd = $('#statCd').val();
if(statCd == '305050')
{
$('#resultSelect').val(statCd).prop("selected", true);
}
else
{
$('#resultSelect').val("00").prop("selected", true);
$('#detailResult').show();
$('#detailResult').val(statCd).prop("selected", true);
}
}
});
$(document).on('change', '#adrSnTemp', function(){
console.log($('#prtclSize').val());
if($('#prtclSize').val() != 0)
{
if(confirm("기존에 등록된 데이터가 있다면 초기화 됩니다.\n초기화 하시겠습니까?"))
if(!confirm("기존에 등록된 데이터가 있다면 초기화 됩니다.\n수정 하시겠습니까?"))
{
var form = document.adrVO;
var data = new FormData(form);
$.ajax({
type: "POST",
url: "<c:url value='/kccadr/adjReqMgOff/deletePrtclProc.do' />",
data: data,
dataType:'json',
async: false,
processData: false,
contentType: false,
cache: false,
success: function (data) {
console.log('data : ', data);
if(data.status == 'OK'){
alert(data.data);
$('#adrSeq').val(data.dataSub);
$('#nextGoPageForm').submit();
}
else if(data.status == 'Unauthorized')
{
alert(data.message);
return false;
}
},
error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
});
$('#adrSnTemp').val($('#prtclSize').val()).prop("selected", true);
}
@ -90,17 +88,21 @@ $(document).on('change', '#adrSnTemp', function(){
<form:form commandName="adrVO" name="adrVO" method="post" enctype="multipart/form-data">
<form:input type="hidden" path="reqPerTotCnt" id="reqPerTotCnt"/>
<input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value="${adrVO.adrSeq }" />" />
<form:input type="hidden" path="adrSeq" id="adrSeq"/>
<input type="hidden" name="assPstSeq" id="assPstSeq" value="<c:out value="${memAss.assPstSeq }" />" />
<input type="hidden" name="memPstSeq" id="memPstSeq" value="<c:out value="${memAss.memPstSeq }" />" />
<input type="hidden" name="memDeptNm" id="memDeptNm"/>
<input type="hidden" name="assPstUsrNm" id="assPstUsrNm"/>
<input type="hidden" name="appResultTy" id="appResultTy"/>
<input type="hidden" name="prtclSize" id="prtclSize" value="<c:out value="${prtclSize }" />" />
<input type="hidden" name="statCd" id="statCd" value="" />
<input type="hidden" name="statCd" id="statCd" value="<c:out value="${statCdInfo.statCd }" />" />
<input type="hidden" name="adrHstrySeq" id="adrHstrySeq" value="<c:out value="${statCdInfo.adrHstrySeq }" />" />
<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" />
<input type="hidden" name="limitcount" value="50" />>
<!-- cont -->
<div class="cont_wrap">
<div class="box">
@ -180,14 +182,8 @@ $(document).on('change', '#adrSnTemp', function(){
<th>대리인 여부</th>
<td>
<div class="radio_wrap">
<span>
<input type="radio" id="reqlTy1" name="rpplTy" value="10" <c:if test="${adrVO.rpplTy eq '10'}">checked</c:if> >
<label for="reqlTy1">본인<c:out value="${adrVO.rpplTy }" /></label>
</span>
<span>
<input type="radio" id="rpplTy2" name="rpplTy" value="30" <c:if test="${adrVO.rpplTy eq '30'}">checked</c:if> >
<label for="rpplTy2">대리인</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="reqTy1">본인</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>
</tr>
@ -215,6 +211,7 @@ $(document).on('change', '#adrSnTemp', function(){
</div>
<!-- 대리인 선택시 -->
<div class="tbType02 " id="agntInfo" style="margin-top: 20px;">
<form:input type="hidden" path="adjReqMgrVoList[0].rpplSeq" id="rppl00Seq"/>
<table>
<colgroup>
<col style="width: 210px;">
@ -336,7 +333,7 @@ $(document).on('change', '#adrSnTemp', function(){
</div>
</td>
</tr>
<tr>
<%-- <tr>
<th>대리신청서</th>
<td class="upload_area_fr">
<!-- <input type="text" id="fileNm" size="30" class="file_input" readonly> --><!-- <button type="button" class="btnType01 btn_add_file">파일 첨부하기</button> -->
@ -393,9 +390,9 @@ $(document).on('change', '#adrSnTemp', function(){
<td class="td_filesort">
<span class="file_filesort_text" value="<c:out value="${fileList.fileExtsn}"/>"><c:out value="${fileList.fileExtsn}"/></span>
</td>
<%-- <td class="td_filesize">
<td class="td_filesize">
<span class="file_size_text" value="<c:out value="${fileList.fileMg}"/>"><c:out value="${fileList.fileMg}"/></span>
</td> --%>
</td>
<td>
<button type="button" class="btn_del" onclick="delAtchFile('${fileList.atchFileId}', '${fileList.fileSn}'); return false;"><i></i></button>
</td>
@ -405,7 +402,7 @@ $(document).on('change', '#adrSnTemp', function(){
</table>
</div>
</td>
</tr>
</tr> --%>
</tbody>
</table>
</div>
@ -413,6 +410,7 @@ $(document).on('change', '#adrSnTemp', function(){
<!-- 신청인 -->
<div class="tbType02" style="margin-top: 20px;">
<form:input type="hidden" path="adjReqMgrVoList[1].rpplSeq" id="rppl01Seq"/>
<table>
<colgroup>
<col style="width: 210px;">
@ -566,6 +564,7 @@ $(document).on('change', '#adrSnTemp', function(){
<!-- 피신청인 정보 -->
<div class="tb_tit">
<form:input type="hidden" path="adjReqMgrVoList[2].rpplSeq" id="rppl02Seq"/>
<p>피신청인 정보</p>
<div class="btn_wrap">
<button type="button" class="btnType06 btn_adj_add btn_add">피신청인 추가</button>
@ -727,6 +726,7 @@ $(document).on('change', '#adrSnTemp', function(){
<!-- 피신청인 정보 02-->
<div class="tb_tit tb_wrap_tit reqPer02Tit">
<form:input type="hidden" path="adjReqMgrVoList[3].rpplSeq" id="rppl03Seq"/>
<p>피신청인 정보 02</p>
</div>
<div class="tbType02 tb_wrap_tb reqPer02Tb">
@ -885,6 +885,7 @@ $(document).on('change', '#adrSnTemp', function(){
<!-- 피신청인 정보 03-->
<div class="tb_tit tb_wrap_tit reqPer03Tit">
<form:input type="hidden" path="adjReqMgrVoList[4].rpplSeq" id="rppl04Seq"/>
<p>피신청인 정보 03</p>
</div>
<div class="tbType02 tb_wrap_tb reqPer03Tb">
@ -1043,6 +1044,7 @@ $(document).on('change', '#adrSnTemp', function(){
<!-- 피신청인 정보 04-->
<div class="tb_tit tb_wrap_tit reqPer04Tit">
<form:input type="hidden" path="adjReqMgrVoList[5].rpplSeq" id="rppl05Seq"/>
<p>피신청인 정보 04</p>
</div>
<div class="tbType02 tb_wrap_tb reqPer04Tb">
@ -1201,6 +1203,7 @@ $(document).on('change', '#adrSnTemp', function(){
<!-- 피신청인 정보 05-->
<div class="tb_tit tb_wrap_tit reqPer05Tit">
<form:input type="hidden" path="adjReqMgrVoList[6].rpplSeq" id="rppl06Seq"/>
<p>피신청인 정보 05</p>
</div>
<div class="tbType02 tb_wrap_tb reqPer05Tb">
@ -1459,7 +1462,7 @@ $(document).on('change', '#adrSnTemp', function(){
</div>
</form:form>
<form id="nextGoPageForm" action="<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do' />">
<input id="adrSeq" name="adrSeq" value="">
<input type="hidden" id="adrSeqHidden" name="adrSeq" value="<c:out value="${adrVO.adrSeq }" />" />
</form>
<!-- //cont -->
</body>

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

@ -1085,17 +1085,17 @@
var msg = "";
var url = "";
// if($('#adrSeq').val() != null)
// {
// msg= "조정신청 정보 수정을 진행하시겠습니까?";
// url= "/kccadr/adjReqMgOff/updateAdjReqMgrOffAjax.do";
// }
// else{
console.log('$(#adrSeq).val() :', $('#adrSeq').val());
if($('#adrSeq').val() != '')
{
msg= "조정신청 정보 수정을 진행하시겠습니까?";
url= "/kccadr/adjReqMgOff/updateAdjReqMgrPastAjax.do";
}
else{
msg= "조정신청 정보 등록을 진행하시겠습니까?";
url= "/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do";
// }
}
if(confirm(msg)){
@ -1113,15 +1113,14 @@
contentType: false,
cache: false,
success: function (data) {
console.log('data : ', data);
if(data.status == 'OK'){
alert(data.data);
$('#adrSeq').val(data.dataSub);
alert(data.data);
if(data.status == 'OK')
{
$('#adrSeqHidden').val(data.dataSub);
// $('#nextGoPageForm').submit();
}
else if(data.status == 'Unauthorized')
else if(data.status == 'Unauthorized' || data.status == 'BAD_REQUEST')
{
alert(data.message);
return false;
}
},