diff --git a/src/main/java/kcc/kccadr/accdnt/ars/service/AdjstReqStatusVO.java b/src/main/java/kcc/kccadr/accdnt/ars/service/AdjstReqStatusVO.java index c68ff234..80f46b68 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/service/AdjstReqStatusVO.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/service/AdjstReqStatusVO.java @@ -44,6 +44,10 @@ public class AdjstReqStatusVO extends AdjstIncidentVO { private String docTy; private String rpplUsrTyNm; + + private String pageExpIndex; + + private String expCode; public String getAdrSn() { return adrSn; @@ -242,8 +246,22 @@ public class AdjstReqStatusVO extends AdjstIncidentVO { public void setRpplUsrTyNm(String rpplUsrTyNm) { this.rpplUsrTyNm = rpplUsrTyNm; } - - - + + public String getPageExpIndex() { + return pageExpIndex; + } + + public void setPageExpIndex(String pageExpIndex) { + this.pageExpIndex = pageExpIndex; + } + + public String getExpCode() { + return expCode; + } + + public void setExpCode(String expCode) { + this.expCode = expCode; + } + } diff --git a/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java b/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java index e8a19d46..5fe81d6b 100644 --- a/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java +++ b/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java @@ -4,6 +4,8 @@ import java.util.List; import org.springframework.web.multipart.MultipartHttpServletRequest; +import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; +import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.cmm.RestResponse; @@ -26,6 +28,8 @@ import kcc.kccadr.cmm.RestResponse; public interface AdjstExpService { + /*===== 신청하기 =====*/ + String checkAdjsReqEditStatus(AdjstReqVO adjstReq) throws Exception; // 조정사건 대리인/신청인/피신청인 정보 불러오기 @@ -45,4 +49,17 @@ public interface AdjstExpService { //3단계 저장 public int updateMasterInfo(AdjstReqVO adjstReqVO, MultipartHttpServletRequest multipartHttpServletRequest) throws Exception; + + + + + + /*===== Detail =====*/ + + List selectAdjstReqRpplInfo(AdjstReqStatusVO adjstReqStatusVO) throws Exception; + + AdjstIncidentVO selectAdjstIncidentMaster(AdjstIncidentVO adjstIncidentVO) throws Exception; + + + } diff --git a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java index 4f11f33c..933cfec6 100644 --- a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java +++ b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java @@ -5,6 +5,8 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; +import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.adjst.service.AdjstReqVO; /** @@ -25,72 +27,87 @@ import kcc.kccadr.adjst.service.AdjstReqVO; */ @Repository("AdjstExpDAO") public class AdjstExpDAO extends EgovAbstractDAO { + + /*===== 신청하기 =====*/ // 조정사건 정보 불러오기 public AdjstReqVO selectAdjsMgrMasterByUniqId(AdjstReqVO adjstReqVO) throws Exception{ - return (AdjstReqVO) select("AdjstExpDAO.selectAdjsMgrMasterByUniqId", adjstReqVO); + return (AdjstReqVO) select("adjstExpDAO.selectAdjsMgrMasterByUniqId", adjstReqVO); } public AdjstReqVO selectAdjsReqEditInfo(AdjstReqVO adjstReqVO) throws Exception{ - return (AdjstReqVO) select("AdjstExpDAO.selectAdjsReqEditInfo", adjstReqVO); + return (AdjstReqVO) select("adjstExpDAO.selectAdjsReqEditInfo", adjstReqVO); } // 조정사건 대리인/신청인/피신청인 정보 불러오기 @SuppressWarnings("unchecked") public List selectAdjsReqUserListByadjSeq(AdjstReqVO adjstReqVO) throws Exception{ - return (List) list("AdjstExpDAO.selectAdjsReqUserListByadjSeq", adjstReqVO); + return (List) list("adjstExpDAO.selectAdjsReqUserListByadjSeq", adjstReqVO); } //조정사건 신규 등록 public int insertAdrMgrMaster(AdjstReqVO adjstReqVO) throws Exception{ - return update("AdjstExpDAO.insertAdrMgrMaster", adjstReqVO); + return update("adjstExpDAO.insertAdrMgrMaster", adjstReqVO); } //조정사건 상세 신규 등록 public int insertAdrMgrMasterDetail(AdjstReqVO adjstReqVO) throws Exception{ - return update("AdjstExpDAO.insertAdrMgrMasterDetail", adjstReqVO); + return update("adjstExpDAO.insertAdrMgrMasterDetail", adjstReqVO); } public int updateCopyMasterInfo(AdjstReqVO adjstReqVO) throws Exception { - return (Integer) update("AdjstExpDAO.updateCopyMasterInfo", adjstReqVO); + return (Integer) update("adjstExpDAO.updateCopyMasterInfo", adjstReqVO); } public void mergeIntoAdrRppl(AdjstReqVO adjstReqVO) throws Exception { - insert("AdjstExpDAO.mergeIntoAdrRppl", adjstReqVO); + insert("adjstExpDAO.mergeIntoAdrRppl", adjstReqVO); } //조정사건 대리인, 신청인, 피신청인 정보 등록 public int insertAdrRppl(AdjstReqVO adjstReqVO) throws Exception{ - return update("AdjstExpDAO.insertAdrRppl", adjstReqVO); + return update("adjstExpDAO.insertAdrRppl", adjstReqVO); } // 조정사건 대리인/신청인 정보 수정 public int updateAdrRppl(AdjstReqVO adjstReqVO) throws Exception{ - return update("AdjstExpDAO.updateAdrRppl", adjstReqVO); + return update("adjstExpDAO.updateAdrRppl", adjstReqVO); } public int deleteAdjstReqPersonNotIn(AdjstReqVO adjstReqVO) throws Exception { - return delete("AdjstExpDAO.deleteAdjstReqPersonNotIn", adjstReqVO); + return delete("adjstExpDAO.deleteAdjstReqPersonNotIn", adjstReqVO); } //조정신청 신청인 취지/원인 정보 등록 public int updateAdrMgrMaster(AdjstReqVO adjstReqVO) throws Exception{ - return update("AdjstExpDAO.updateAdrMgrMaster", adjstReqVO); + return update("adjstExpDAO.updateAdrMgrMaster", adjstReqVO); } public int updateAdrMgrEditInfo(AdjstReqVO adjstReqVO) throws Exception { - return (Integer) update("AdjstExpDAO.updateAdrMgrEditInfo", adjstReqVO); + return (Integer) update("adjstExpDAO.updateAdrMgrEditInfo", adjstReqVO); } //조정신청 최종제출 처리 public int updateAdrMgrMasterComplete(AdjstReqVO adjstReqVO) throws Exception{ - return update("AdjstExpDAO.updateAdrMgrMasterComplete", adjstReqVO); + return update("adjstExpDAO.updateAdrMgrMasterComplete", adjstReqVO); } + + /*===== Detail =====*/ + + + public List selectAdjstReqRpplInfo(AdjstReqStatusVO adjstReqStatusVO) throws Exception { + return (List) list("adjstExpDAO.selectAdjstReqRpplInfo", adjstReqStatusVO); + } + + public AdjstIncidentVO selectAdjstIncidentMaster(AdjstIncidentVO adjstIncidentVO) throws Exception { + return (AdjstIncidentVO) select("adjstExpDAO.selectAdjstIncidentMaster", adjstIncidentVO); + } - - +// public AdjstIncidentVO selectApmChgDateInfo(AdjstIncidentVO adjstIncidentVO) throws Exception{ +// return (AdjstIncidentVO) select("adjstExpDAO.selectApmChgDateInfo", adjstIncidentVO); +// } +// diff --git a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java index cc4cda16..17e28060 100644 --- a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java @@ -24,6 +24,8 @@ import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; import kcc.com.cmm.service.FileVO; import kcc.com.utl.user.service.CheckAdrProcessUtil; +import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; +import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO; import kcc.kccadr.adjst.service.AdjstReqService; @@ -104,6 +106,8 @@ public class AdjstExpServiceImpl extends EgovAbstractServiceImpl implements Adj private static final Logger LOGGER = LoggerFactory.getLogger(AdjstExpServiceImpl.class); + /*===== 신청하기 =====*/ + @Override public String checkAdjsReqEditStatus(AdjstReqVO adjstReq) throws Exception { AdjstReqVO editInfo = null; @@ -369,14 +373,24 @@ public class AdjstExpServiceImpl extends EgovAbstractServiceImpl implements Adj } + + /*===== Detail =====*/ + + @Override + public List selectAdjstReqRpplInfo(AdjstReqStatusVO adjstReqStatusVO) throws Exception { + return adjstExpDAO.selectAdjstReqRpplInfo(adjstReqStatusVO); + } + + @Override + public AdjstIncidentVO selectAdjstIncidentMaster(AdjstIncidentVO adjstIncidentVO) throws Exception { + return adjstExpDAO.selectAdjstIncidentMaster(adjstIncidentVO); + } - - - - + + /*===== 공통 =====*/ // 조정신청 이름, 이메일, 연락처, 주소정보 암호화 후 데이터베이스에 수정해주기 public int cryptAdjReqRpplSendUpdate(AdjstReqVO adjstReqVO) throws Exception{ diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java index b2733aef..3360b722 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java @@ -27,6 +27,7 @@ import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; +import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.kccadr.adjst.service.AdjstReqVO; @@ -37,19 +38,19 @@ import kcc.let.uss.umt.service.MberManageVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; /** - * 대국민(사용자) - * 조정신청에 관한 controller 클래스를 정의한다. - * @author 여현준 - * @since 2021.08.17 + * 대국민 체험 기능(사용자) + * 체험기능 신청 컨트롤러 + * @author 이호영 + * @since 2022.09.01 * @version 1.0 * @see * * 
  * << 개정이력(Modification Information) >>
  *
- *   수정일      수정자           수정내용
- *  -------    --------    ---------------------------
- *   2021.08.17  여현준          최초 생성
+ *   수정일		수정자		수정내용
+ *  -------		--------    ---------------------------
+ *  22.09.01	이호영		최초 생성
  *
  *
*/ @@ -320,7 +321,8 @@ public class AdjstExpController { modelAndView.addObject("rsVO", adjstReqVO); // 성공메세지 return modelAndView; } - + + @@ -398,5 +400,4 @@ public class AdjstExpController { adjstReqVO.setRpplRealAddr(rpplRealAddr); adjstReqVO.setRpplRealAddrDtl(rpplRealAddrDtl); } - } diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java new file mode 100644 index 00000000..e01999cd --- /dev/null +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -0,0 +1,257 @@ +package kcc.kccadr.adjstExp.web; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +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.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.fcc.service.EgovStringUtil; +import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; +import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; +import kcc.kccadr.accdnt.crtfc.service.CrtfcService; +import kcc.kccadr.adjst.service.AdjstReqService; +import kcc.kccadr.adjst.service.AdjstReqVO; +import kcc.kccadr.adjstExp.service.AdjstExpService; +import kcc.kccadr.cmm.KccadrConstants; +import kcc.let.uat.uia.service.SsoLoginVO; +import kcc.let.uss.umt.service.MberManageVO; +import kcc.let.utl.fcc.service.EgovCryptoUtil; + +/** + * 대국민 체험 기능(사용자) + * 체험기능 컨트롤러 상세 + * @author 이호영 + * @since 2022.09.01 + * @version 1.0 + * @see + * + * 
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일		수정자		수정내용
+ *  -------		--------    ---------------------------
+ *  22.09.01	이호영		최초 생성
+ *
+ *
+ */ +@Controller +public class AdjstExpDetailController { + + // 조정신청 서비스단 +// @Resource(name = "AdjstReqExpService") +// private AdjstReqExpService adjstReqExpService; + + //공동인증서 서비스단 + @Resource(name="CrtfcService") + private CrtfcService crtfcService; + + // 조정신청 서비스단 + @Resource(name = "AdjstExpService") + private AdjstExpService adjstExpService; + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileService; + + + private static final Logger LOGGER = LoggerFactory.getLogger(AdjstExpDetailController.class); + + + /** + * 조정진행 상세 화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do") + public String adjstReqStatusDetail(@ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO, ModelMap model) throws Exception { + return "/web/kccadr/adjstExpDetail/adjstReqStatusDetail"; + } + + /** + * 조정진행 상세 Tab 조정상세 화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/tab/adjstReqStatusTabDetail.do") + public String adjstReqStatusTabDetail( + @ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO + , @ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO + , ModelMap model) throws Exception { + + + + // 조정신청 관련인 조회 + List list = adjstExpService.selectAdjstReqRpplInfo(adjstReqStatusVO); + +// System.out.println("=============================== ============"); +// list.stream().forEach(t -> System.out.println(" :::: "+t.getRpplUsrTyNm())); + + // 신청인 추출 + Optional reqInfo = list.stream().filter(t -> t.getRpplTy().equals(KccadrConstants.ADR_RPPL_TY_REQ)).findFirst(); + + // 대리인 추출 + Optional agenInfo = list.stream().filter(t -> t.getRpplTy().equals(KccadrConstants.ADR_RPPL_TY_REQ_DEPUTY)).findFirst(); + + AdjstReqStatusVO reqPeson = reqInfo.isPresent() ? reqInfo.get() : null; + + AdjstReqStatusVO agenPerson = agenInfo.isPresent() ? agenInfo.get() : null; + + this.decryptInfomation(null, reqPeson); + + this.decryptInfomation(null, agenPerson); + + // 피신청인 추출 + List resInfo = list.stream().filter(t -> t.getRpplTy().equals(KccadrConstants.ADR_RPPL_TY_RES)).collect(Collectors.toList()); + + // 기일 예정일 정보 불러오기 - 업무 담당자가 등록하 최근의 데이터 불러오기 + + +// model.addAttribute("apmChgInfo", adjstExpService.selectApmChgDateInfo(adjstIncidentVO)); + + decryptInfomation(resInfo, null); + + model.addAttribute("master" , adjstExpService.selectAdjstIncidentMaster(adjstIncidentVO)); + model.addAttribute("pageExpIndex" , StringUtils.isEmpty(adjstReqStatusVO.getPageExpIndex()) ? "2" : adjstReqStatusVO.getPageExpIndex()); + model.addAttribute("reqInfo" , reqPeson); + model.addAttribute("agenInfo" , agenPerson); + model.addAttribute("resInfo" , resInfo); + return "/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail"; + } + + /** + * 조정신청 구분선택 - 안내화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/popup/openExpExamplePop.do") + public String adjstReqOpenAnswerExamplePop(@ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO, ModelMap model) throws Exception { + + String returnUrl = "/web/kccadr/adjstExpDetail/"; + + /* + 공통 + - 답변서 제출 - 01 + 기일지정 + - 조정 대리인 신청 - 02 + - 기일변경 요청 + - 조정 취하 신청 + - 경정신청 + 기일개최 + - 조정 취하 신청 + - 경정신청 + 조정중(직권조정) + - 이의신청 + - 직권조정 결정서 상세 + */ + + System.out.println("adjstReqStatusVO.getExpCode() : "+ adjstReqStatusVO.getExpCode()); + + switch (adjstReqStatusVO.getExpCode()) { + case "01": returnUrl += "expAnsSubmit"; + break; + case "02": returnUrl += "expAdjstDeputyReqList"; + break; + default: returnUrl += "expAnsSubmit"; + break; + } + System.out.println("returnUrl : "+ returnUrl); + + + + return returnUrl; + } + + + + + + + + + + + + + + + + + + + + + + + + public void decryptInfomation(List list, AdjstReqStatusVO info){ + if(CollectionUtils.isNotEmpty(list)){ + for(AdjstReqStatusVO model : list){ + model.setRpplNm(egovCryptoUtil.decrypt(model.getRpplNm())); + model.setRpplAddr(egovCryptoUtil.decrypt(model.getRpplAddr())); + model.setRpplAddrDtl(egovCryptoUtil.decrypt(model.getRpplAddrDtl())); + model.setRpplPost(egovCryptoUtil.decrypt(model.getRpplPost())); + model.setRpplEmail(egovCryptoUtil.decrypt(model.getRpplEmail())); + model.setRpplPhone(egovCryptoUtil.decrypt(model.getRpplPhone())); + model.setRpplRealPost(egovCryptoUtil.decrypt(model.getRpplRealPost())); + model.setRpplRealAddr(egovCryptoUtil.decrypt(model.getRpplRealAddr())); + model.setRpplRealAddrDtl(egovCryptoUtil.decrypt(model.getRpplRealAddrDtl())); + + + model.setDepuTyNm(egovCryptoUtil.decrypt(model.getDepuTyNm())); +// model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); + //피신청인 명수 표시 '외 N명' 처리_이준호_220801 + if (!StringUtil.isEmpty(model.getResPonDentNm())) { + String tmpStr = ""; + if(model.getResPonDentNm().contains("외")) { + tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); + } + model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + } + model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); + + } + } + + if(info != null){ + info.setRpplNm(egovCryptoUtil.decrypt(info.getRpplNm())); + info.setRpplAddr(egovCryptoUtil.decrypt(info.getRpplAddr())); + info.setRpplAddrDtl(egovCryptoUtil.decrypt(info.getRpplAddrDtl())); + info.setRpplPost(egovCryptoUtil.decrypt(info.getRpplPost())); + info.setRpplEmail(egovCryptoUtil.decrypt(info.getRpplEmail())); + info.setRpplPhone(egovCryptoUtil.decrypt(info.getRpplPhone())); + info.setDepuTyNm(egovCryptoUtil.decrypt(info.getDepuTyNm())); + info.setResPonDentNm(egovCryptoUtil.decrypt(info.getResPonDentNm())); + info.setAppliCantNm(egovCryptoUtil.decrypt(info.getAppliCantNm())); + info.setRpplRealPost(egovCryptoUtil.decrypt(info.getRpplRealPost())); + info.setRpplRealAddr(egovCryptoUtil.decrypt(info.getRpplRealAddr())); + info.setRpplRealAddrDtl(egovCryptoUtil.decrypt(info.getRpplRealAddrDtl())); + } + } + + + + + + + +} diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 7b11bf11..3023cd59 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -1278,6 +1278,7 @@ public class MainController { if(menuUrl.equals("/web/cop/org/selectOrgDetail.do")){ menuUrl = "/web/cop/org/selectOrgList.do" ; }else if(menuUrl.equals("/web/kccadr/accdnt/ars/adjstReqStatusDetail.do") + || menuUrl.equals("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do") || menuUrl.equals("/web/kccadr/accdnt/acd/adjstChangeDateList.do") || menuUrl.equals("/web/kccadr/accdnt/acd/adjstChangeDateCreate.do") || menuUrl.equals("/web/kccadr/accdnt/arc/corReqList.do") diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 6fadc99f..56826d8f 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2704,7 +2704,7 @@ - + @@ -2722,7 +2722,7 @@ - + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml index 55c1c8a2..e560ba5f 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml @@ -4,10 +4,12 @@ + + - SELECT ADR_SEQ AS adrSeq, ADR_NO AS adrNo, STAT_CD AS statCd, @@ -35,7 +37,7 @@ - SELECT ADR_SEQ AS adrSeq, EDT_SN AS edtSn, @@ -58,7 +60,7 @@ - SELECT ADR_SEQ AS adrSeq, RPPL_SEQ AS rpplSeq, @@ -109,7 +111,7 @@ - + INSERT INTO ADR_MGR_EXP_MASTER ( ADR_SEQ ,STAT_CD @@ -150,7 +152,7 @@ - + INSERT INTO ADR_MGR_EXP_DETAIL( ADR_SEQ, ADR_SN, @@ -170,7 +172,7 @@ ) - + UPDATE ADR_MGR_EXP_MASTER SET ( REQ_CN1 @@ -190,7 +192,7 @@ - + MERGE INTO ADR_EXP_RPPL T1 USING DB_ROOT ON (T1.ADR_SEQ = #adrSeq# AND T1.RPPL_SEQ = #rpplSeq# AND T1.RPPL_TY = #rpplTy#) WHEN MATCHED THEN @@ -296,7 +298,7 @@ - + INSERT INTO ADR_EXP_RPPL ( ADR_SEQ ,RPPL_SEQ @@ -374,7 +376,7 @@ - + UPDATE ADR_EXP_RPPL SET RPPL_TY = #rpplTy# ,RPPL_ID = #rpplId# @@ -407,8 +409,8 @@ - - DELETE FROM ADR_RPPL + + DELETE FROM ADR_EXP_RPPL WHERE 1=1 AND ADR_SEQ = #adrSeq# AND RPPL_TY = #rpplTy# @@ -420,7 +422,7 @@ - + UPDATE ADR_MGR_EXP_MASTER SET REQ_CN1 = #reqCn1#, @@ -440,7 +442,7 @@ AND ADR_SEQ = #adrSeq# - + UPDATE ADR_EXP_EDT_REQ SET EDT_STATUS = #edtStatus#, CPMTE_DT = NOW(), @@ -452,7 +454,7 @@ - + UPDATE ADR_MGR_EXP_MASTER SET STAT_CD = #statCd# ,SBMT_DE = NOW() @@ -462,13 +464,127 @@ WHERE 1=1 AND ADR_SEQ = #adrSeq# + + + + - - - - + + diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 6a1f178b..8a0c17aa 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -53,6 +53,7 @@ */web/kccadr/kccadrCom/* */web/kccadr/**/none/**/* */web/kccadr/**/tab/* + */web/kccadr/**/comment/* */kccadr/**/comment/* */web/kccadr/accdnt/apm/popup/* diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep1.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep1.jsp index b7f00ae4..2debd013 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep1.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep1.jsp @@ -259,11 +259,11 @@ $( document ).ready(function(){

신청인 정보

- -
- -
- +<%-- --%> + + + +<%-- --%> <%--* 필수입력 항목--%>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp index 55edbfe1..c03e0eaf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp @@ -52,70 +52,14 @@ AdjstReq.step2Onload(); - /* 피 신청인 조회 버튼 Function */ - $('.respondentSch').on('click', function(e){ - - // 피신청인 구분 tbody - var $tbody = $(this).parents('tbody') - - // 피신청인 븐류 값 - // 개인 01, 법인02, 개인사업자03 - var rpplUsrTy = $tbody.find("input[name^=rpplUsrTy]:checked").val(); - - // 피신청인 분루값으로 selector 값 바뀜 - var rpplNmVal = ''; - if(rpplUsrTy === '01') // 개인 - rpplNmVal = 'rpplNm'; - if(rpplUsrTy === '02') // 법인 - rpplNmVal = 'rpplCportNm'; - if(rpplUsrTy === '03') // 개인사업자 - rpplNmVal = 'rpplPersonBizNm'; - - // 이름 가져오기 - var rpplNm = $tbody.find("input[name^='"+rpplNmVal+"']").val(); - - // 메일가져오기 - var rpplEmail1 = $tbody.find("input[name^='rpplEmail1']").val(); - var rpplEmail2 = $tbody.find("input[name^='rpplEmail2']").val(); - - // value Chk - if(vali(rpplNm)) {alert("이름을 입력해 주세요"); return false}; - if(vali(rpplEmail1)) {alert("이메일을 입력해 주세요"); return false}; - if(vali(rpplEmail2)) {alert("이메일을 입력해 주세요"); return false}; - - var rpplEmail = rpplEmail1+"@"+rpplEmail2; - - // ajax 호출 - ajaxValueChk(rpplNm, rpplEmail); - }); - function ajaxValueChk(rpplNm, rpplEmail){ - - $.ajax({ - type: "POST", - url: "/web/kccadr/adjst/selectRespondentSchChk.do", - data: JSON.stringify({rpplNm : rpplNm - ,rpplEmail : rpplEmail}) - , dataType:'json' - , async: false - , processData: false - , contentType: "application/json" - , cache: false - , success: function (data) { - alert('\''+rpplNm + '\' 피신청인은 '+data.message); - return false; - } - , error: function (e) { alert("조회에 실패하였습니다."); console.log("ERROR : ", e); } - }); + function vali(val){ + if (val === null) return true; + if (typeof val === 'string' && val === '') return true; + if (typeof val === 'undefined') return true; + return false; } - function vali(val){ - if (val === null) return true; - if (typeof val === 'string' && val === '') return true; - if (typeof val === 'undefined') return true; - return false; - } - }); @@ -171,7 +115,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp index b0aea508..5c709000 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp @@ -236,17 +236,6 @@ function fn_adjstReq_preview() {
- - -<%-- --%> - - - - - - - -
@@ -255,5 +244,10 @@ function fn_adjstReq_preview() { + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqOpenAnswerExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqOpenAnswerExamplePop.jsp new file mode 100644 index 00000000..f447b529 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqOpenAnswerExamplePop.jsp @@ -0,0 +1,75 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%pageContext.setAttribute("crlf", "\r\n"); %> + + + +조정신청 예문보기 + + + + + +
+
+

조정신청 예문

+
+
+ +
+ * +
+ +
- +
+ + + + + + + + + +
+ + + + + + 등록된 내용이 없습니다. + + +
+
+ +
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp new file mode 100644 index 00000000..f2de83a4 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp @@ -0,0 +1,101 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + +조정진행 상세 + + + + + + + + + " /> + " /> + " /> + + + + + + + +
+ +   +   +   +
+
+

[체험]조정진행 상세

+
+
+

조정번호 : + + 조정 + +

+

접수일 :

+

진행현황 :

+
+
+
+ + + + <%----%> +
+
+ +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp new file mode 100644 index 00000000..da2d08f8 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp @@ -0,0 +1,386 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + +조정진행 + + + + + +
+ " /> + " /> + " /> + +
+ +
+ + + +
+ <%--reqInfo +agenInfo +resInfo--%> + + +
+
+ + + + + + +
+
"> + +

+ STEP. 01 + 접수 +

+ 다음 +
+
"> + +

+ STEP. 02 + 기일지정 +

+ 다음 +
+
"> + +

+ STEP. 03 + 기일개최 +

+ 다음 +
+
"> + +

+ STEP. 04 + 조정중 +

+ 다음 +
+
"> + +

+ STEP. 05 + 종료 +

+
+
+ + +
+ +

+ 기일예정일 : + +

+
+ +
+ + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
신청인, 주소등의 정보제공
+

신청인

+ 		+

+ 		+

주소

+ 		+

()

+ 		+

신청인 분류

+ 		+<%--

--%> +

+
+

피신청인 1

+ 		+

+ 		+

피신청인 2

+ 		+

+
+

피신청인 3

+ 		+

+ 		+

피신청인 4

+ 		+

+
+

피신청인 5

+ 		+

+
+ + + + + + + + + + + + + + + + + +
신청취지, 신청원인등의 정보제공
+

신청취지

+ 		+

+
+

신청원인

+ 		+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + <%-- 조정 대리인 신청(기일참관인)은 입금완료 후 부터 기일조서 결재완료 전까지 노출 --%> +<%-- --%> + +<%-- --%> +<%-- <%-- 기일 변경 요청 버튼 stat_cd가 기일통지서승인 보다 크거나 같고 종결결재요청 보다작을 때 버튼 노출 --%> +<%-- 기일이 저징 되어있어야 기일변경 요청을 할수 있도록 변경--%> +<%-- --%> + +<%-- --%> +<%-- <%-- 조정 취하 신청의 경우 조정부장의 결재가 필수이므로 배당결제완료 이후 버튼 노출_이준호_220310 --%> +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- <%-- 현재 일시가 이의신청 기한보다 작을 경우만 버튼 오픈 --%> + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- <%-- 경정신청의 경우 접수결재완료 이후부터 종결결재요청 전까지 노출 --%> +<%-- --%> + +<%-- --%> +<%-- <%-- 조정위원 기피 버튼은 관리자가 조정위원 기피 허용해 줬을경우 노출(업무시스템 조정진행 상세 > 조정위원 항목옆에 체크박스) --%> +<%-- --%> + +<%-- --%> +
+
+ + + + + + + + + + +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp new file mode 100644 index 00000000..6af5aa80 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp @@ -0,0 +1,106 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + +조정대리신청 목록 + + + + + + + + + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + + +
+
+
+

조정대리신청 목록

+
+
+
+
+
    +
  • +

    조정대리신청 목록 입니다.

    +
    • + + + + + + + +
+

주의사항 : 분쟁조정신청 작성이 오래 걸릴 경우 신청 중 오류가 발생할 수 있습니다. 신청 취지/원인을 미리 작성한 후 신청하시기 바랍니다.(STEP3 + 신청취지/원인 예문보기)

+
+
+<%-- --%> + +
+ + + + + + + + + + + + + + + + + + + + + + +
조정대리신청 목록 : 번호, 대리인, 조정회차, 신청일자, 상태등의 정보제공
번호대리인조정회차신청일자상태
자료가 없습니다. 다른 검색조건을 선택해주세요
+
+ + +
+ + +
+ +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAnsSubmit.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAnsSubmit.jsp new file mode 100644 index 00000000..480f43a0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAnsSubmit.jsp @@ -0,0 +1,374 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + +기일변경상세 + + + + +<%-- --%> + + + + + + + + + + +
+ + + + + + +
+
+
+

답변서 제출

+
+
+
+
+
    +
  • +

    답변서 양식 입니다.

    +
    • + + + + + + + +
+

주의사항 : 분쟁조정신청 작성이 오래 걸릴 경우 신청 중 오류가 발생할 수 있습니다. 신청 취지/원인을 미리 작성한 후 신청하시기 바랍니다.(STEP3 + 신청취지/원인 예문보기)

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
답변서 제출 상세 : 사건, 담당조정부, 신청인, 피신청인등의 정보제공
+

사건

+ 		+

+ +

+
+

담당조정부

+ 		+

+ +

+
+

신청인

+ 		+

+ +

+
+

피신청인

+ 		+

+ +

+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
답변내용, 문건명, 첨부서류, 상대방 공개여부등의 정보제공
+

필수입력 항목*

+

답변내용

+ + 		+ + +
+

문건명

+ 		+

+ + +

+
+

필수입력 항목*

+

첨부서류

+ 		+ + + + + +

* 첨부파일을 등록해 주세요. (최대3개)

+
+ + + + + + + + + + + + + + + + + + + + +
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+

+ 첨부하실 파일을 + 마우스로 끌어서 + 넣어주세요. +

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+ + + + "> + + + + "> + + + + +
+
+
+

상대방공개여부

+ 		+
+ + + + + + + + +
+
+
+ +
+
+
+ + +
+
+ +
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOadDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOadDetail.jsp new file mode 100644 index 00000000..758fbd9b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOadDetail.jsp @@ -0,0 +1,212 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + +직권조정결정서 상세 + + + + + + + + + + + " /> + " /> + " /> + " /> + + +
+
+

직권조정결정서 상세

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + --%> + + + + + + + + + + + + + + + + + <%-- + + + + 조정위원 이름 split 처리 + + + 조정위원 일련번호 split 처리 + + + + + + + --%> + +
+

조정부

+ 		+

+ +

+
+

사건

+ 		+

+ +

+
+

신청인

+ 		+

+ +

+
+

피신청인

+ 		+

+ +

+
+

결정일

+ 		+ <%--
+ " data-datecontrol="true" readonly> +
+ + +
+
--%> +

+

+

송달완료일

+ 		+

+ +

+
+

이의신청기한

+ 		+ <%--
+ " data-datecontrol="true" readonly> +
+ + +
+
--%> +

+
+

주문

+ 		+ <%-- " size="70"> --%> +

+
+

신청취지

+ 		+ <%-- " size="70"> --%> +

+
+

이유

+ 		+

+
+

조정부장

+ 		+

+ + + + + + +

+
+

조정위원

+ 		+

+ + 현재 선택된 조정위원에 해당하는 일련번호 변수 저장 + + + + + + +

+
+
+ + + +
+
+
+ +
+
+ +
+ +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index b14b2251..cc708993 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -1017,7 +1017,23 @@ var AdjstReq = { location.href="/web/main/mainPage.do"; }, fncGoMyAdjstListPage : function(){ - location.href="/web/kccadr/accdnt/ai/adjstIncidentList.do"; + + /** + * expDivision fn = 체험기능인지 인지 아닌지 구분 값 + */ + if(this.expDivision(this.STEP) === 'adjstExp') + { + /** + * 체험이면 현재 페이지에 expGoDetail form으로 상세페이지 일동 + */ + expGoDetail.submit(); + } + else + { + location.href="/web/kccadr/accdnt/ai/adjstIncidentList.do"; + } + + }, historyAdjstPopList : function(paramObj){ if(paramObj == undefined || paramObj == ''){ @@ -1049,7 +1065,6 @@ var AdjstReq = { ); }, openAnswerExamplePop : function(codeId){ - console.log('codeId :: ', codeId); commonPopLayeropen( "/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.do" , 1100