From da3341d564fa064717bad8275a000a799a3bc9e6 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 12 Jan 2024 11:03:10 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmm/service/AdrCourtFileMngService.java | 12 + .../kcc/com/cmm/service/AdrCourtFileVO.java | 72 ++++ .../impl/AdrCourtFileMngServiceImpl.java | 48 +++ .../service/AdjCourtCnctnService.java | 6 +- .../service/AdjCourtCnctnVO.java | 323 ++++++++--------- .../service/impl/AdjCourtCnctnDAO.java | 5 + .../impl/AdjCourtCnctnServiceImpl.java | 55 ++- .../web/AdjCourtCnctnController.java | 11 +- .../textsense/web/TextSenseController.java | 2 +- .../kcc/let/main/web/EgovMainController.java | 2 + .../let/uat/uia/web/EgovLoginController.java | 322 ++++++++++++++--- .../spring/com/context-idgen.xml | 4 +- .../adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml | 153 ++++---- src/main/webapp/WEB-INF/decorators.xml | 4 + .../jsp/cmm/uss/umt/EgovUserInsert.jsp | 27 +- .../jsp/cmm/uss/umt/EgovUserManage.jsp | 11 +- .../jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp | 58 ++- .../adjCourtCnctn/adjCourtCnctnRegist.jsp | 333 +++++++++--------- .../WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp | 11 +- .../WEB-INF/jsp/main/inc/EgovIncTopnav.jsp | 26 +- .../WEB-INF/jsp/uat/uia/EgovLoginUsrCourt.jsp | 157 +++++++++ 21 files changed, 1139 insertions(+), 503 deletions(-) create mode 100644 src/main/java/kcc/com/cmm/service/AdrCourtFileMngService.java create mode 100644 src/main/java/kcc/com/cmm/service/AdrCourtFileVO.java create mode 100644 src/main/java/kcc/com/cmm/service/impl/AdrCourtFileMngServiceImpl.java create mode 100644 src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsrCourt.jsp diff --git a/src/main/java/kcc/com/cmm/service/AdrCourtFileMngService.java b/src/main/java/kcc/com/cmm/service/AdrCourtFileMngService.java new file mode 100644 index 00000000..fe93667f --- /dev/null +++ b/src/main/java/kcc/com/cmm/service/AdrCourtFileMngService.java @@ -0,0 +1,12 @@ +package kcc.com.cmm.service; + +import java.util.List; +import java.util.Map; + +public interface AdrCourtFileMngService { + +// public AdrCourtFileVO selectCourtFileInfs(AdrCourtFileVO adrCourtFileVO) throws Exception; + + public void insertCourtFileInf(AdrCourtFileVO adrCourtFileVO) throws Exception; + +} diff --git a/src/main/java/kcc/com/cmm/service/AdrCourtFileVO.java b/src/main/java/kcc/com/cmm/service/AdrCourtFileVO.java new file mode 100644 index 00000000..12863bf9 --- /dev/null +++ b/src/main/java/kcc/com/cmm/service/AdrCourtFileVO.java @@ -0,0 +1,72 @@ +package kcc.com.cmm.service; + +import java.io.Serializable; + +import org.apache.commons.lang3.builder.ToStringBuilder; + +@SuppressWarnings("serial") +public class AdrCourtFileVO implements Serializable { + + private String crtAtchFileId; + private String crtSeq; + private String crtSn; + private String crtAtchFileTy; + private String frstRegistPnttm; + private String frstRegisterId; + private String lastUpdtPnttm; + private String lastUpdusrId; + + + public String getCrtAtchFileId() { + return crtAtchFileId; + } + public void setCrtAtchFileId(String crtAtchFileId) { + this.crtAtchFileId = crtAtchFileId; + } + public String getCrtSeq() { + return crtSeq; + } + public void setCrtSeq(String crtSeq) { + this.crtSeq = crtSeq; + } + public String getCrtSn() { + return crtSn; + } + public void setCrtSn(String crtSn) { + this.crtSn = crtSn; + } + public String getCrtAtchFileTy() { + return crtAtchFileTy; + } + public void setCrtAtchFileTy(String crtAtchFileTy) { + this.crtAtchFileTy = crtAtchFileTy; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + + + + +} diff --git a/src/main/java/kcc/com/cmm/service/impl/AdrCourtFileMngServiceImpl.java b/src/main/java/kcc/com/cmm/service/impl/AdrCourtFileMngServiceImpl.java new file mode 100644 index 00000000..df7bb0e7 --- /dev/null +++ b/src/main/java/kcc/com/cmm/service/impl/AdrCourtFileMngServiceImpl.java @@ -0,0 +1,48 @@ +package kcc.com.cmm.service.impl; + +import java.io.File; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; +import kcc.com.cmm.service.AdrCourtFileMngService; +import kcc.com.cmm.service.AdrCourtFileVO; +import kcc.com.cmm.service.FileVO; +import kcc.kccadr.adjCourtCnctn.service.impl.AdjCourtCnctnDAO; + +/** + * @Class Name : EgovFileMngServiceImpl.java + * @Description : 파일정보의 관리를 위한 구현 클래스 + * @Modification Information + * + * 수정일 수정자 수정내용 + * ------- ------- ------------------- + * 2009. 3. 25. 이삼섭 최초생성 + * + * @author 공통 서비스 개발팀 이삼섭 + * @since 2009. 3. 25. + * @version + * @see + * + */ +@Service("AdrCourtFileMngService") +public class AdrCourtFileMngServiceImpl extends EgovAbstractServiceImpl implements AdrCourtFileMngService { + + @Resource(name = "AdjCourtCnctnDAO") + private AdjCourtCnctnDAO adjCourtCnctnDAO; + +// @Override +// public AdrCourtFileVO selectCourtFileInfs(AdrCourtFileVO adrCourtFileVO) throws Exception { +// return adjCourtCnctnDAO.selectCourtFileInfs(adrCourtFileVO); +// } + + @Override + public void insertCourtFileInf(AdrCourtFileVO adrCourtFileVO) throws Exception { + adjCourtCnctnDAO.insertCourtFileInf(adrCourtFileVO); + } +} diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java index 078fb1c8..534b7f0f 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java @@ -2,12 +2,13 @@ package kcc.kccadr.adjCourtCnctn.service; import java.util.List; -import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; +import org.springframework.web.multipart.MultipartHttpServletRequest; + import kcc.kccadr.cmm.RestResponse; public interface AdjCourtCnctnService { - RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO); + RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest); int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO); @@ -18,4 +19,5 @@ public interface AdjCourtCnctnService { RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO); void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO); + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java index 2ac699b4..ec25a19b 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -15,206 +15,222 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private static final long serialVersionUID = -1111076331699607617L; - private String courtSeq = ""; - private String courtNum = ""; - private String courtOrgNo = ""; - private String courtNo = ""; - private String dcsnDe = ""; - private String rcvDe = ""; - private String alctnDe = ""; - private String alctnMonth = ""; - private String officeWorkDe = ""; - private String rprtDe = ""; - private String rprtMonth = ""; - private String processDay = ""; - private String courtFld = ""; - private String accdntCn = ""; - private String reqInfo = ""; - private String aplcnInfo = ""; - private String rspndInfo = ""; - private String aplcnDpty = ""; - private String rspndDpty = ""; - private String courtRslt = ""; - private String courtDetailRslt = ""; - private String adjCmsnr = ""; - private String pay = ""; - private String appDe = ""; - private String pymntDay = ""; - private String extns = ""; - private String useYn = ""; - private String rmrks = ""; - private String frstRegistPnttm = ""; - private String frstRegisterId = ""; - private String lastUpdtPnttm = ""; - private String lastUpdusrId = ""; +// private String courtSeq = ""; +// private String courtNum = ""; +// private String courtOrgNo = ""; +// private String courtNo = ""; +// private String dcsnDe = ""; +// private String rcvDe = ""; +// private String alctnDe = ""; +// private String alctnMonth = ""; +// private String officeWorkDe = ""; +// private String rprtDe = ""; +// private String rprtMonth = ""; +// private String processDay = ""; +// private String courtFld = ""; +// private String accdntCn = ""; +// private String reqInfo = ""; +// private String aplcnInfo = ""; +// private String rspndInfo = ""; +// private String aplcnDpty = ""; +// private String rspndDpty = ""; +// private String courtRslt = ""; +// private String courtDetailRslt = ""; +// private String adjCmsnr = ""; +// private String pay = ""; +// private String appDe = ""; +// private String pymntDay = ""; +// private String extns = ""; +// private String useYn = ""; +// private String rmrks = ""; + + + + + + private String crtSeq; //법원연계 seq + private String crtSn; //법원연계 기일수 + private String crtOriNo; //본사건번호 + private String crtNo; //조정사건번호 + private String crtDcsnDe; //결정일 + private String crtRcptDe; //수령일 + private String crtAllctDe; //배당일 + private String crtRprtDe; //보고일 + private String crtClimntNm; //원고이름 + private String crtClimntPhone; //원고연락처 + private String crtClimntAgntNm; //원고-대리인 이름 + private String crtClimntAgtPhone; //원고-대리인 연락처 + private String crtClimntInfo; //원고정보 + private String crtDfndntNm; //피고이름 + private String crtDfndntPhone; //피고연락처 + private String crtDfndntAgntNm; //피고-대리인 이름 + private String crtDfndntAgntPhone; //피고-대리인 연락처 + private String crtDfndntInfo; //피고정보 + private String crtCn; //사건내용 + private String crtAtchFileId; //회신 첨부파일 아이디 + private String crtAllctDdlDe; //사무처리기한-배당일+45 자동으로 계산 이후 연장시 +30 + private String crtCcTy; //사건분류 - 저작물종류 + private String crtLinkHouse; //연계법원 + private String crtStatCd; //처리상태 + private String crtAgrment; //합의금 + + private String frstRegistPnttm; + private String frstRegisterId; + private String lastUpdtPnttm; + private String lastUpdusrId; private String searchCondition2 = ""; private String diffMonth = ""; - - - - public String getCourtSeq() { - return courtSeq; + public String getCrtSeq() { + return crtSeq; } - public void setCourtSeq(String courtSeq) { - this.courtSeq = courtSeq; + public void setCrtSeq(String crtSeq) { + this.crtSeq = crtSeq; } - public String getCourtNum() { - return courtNum; + public String getCrtSn() { + return crtSn; } - public void setCourtNum(String courtNum) { - this.courtNum = courtNum; + public void setCrtSn(String crtSn) { + this.crtSn = crtSn; } - public String getCourtOrgNo() { - return courtOrgNo; + public String getCrtOriNo() { + return crtOriNo; } - public void setCourtOrgNo(String courtOrgNo) { - this.courtOrgNo = courtOrgNo; + public void setCrtOriNo(String crtOriNo) { + this.crtOriNo = crtOriNo; } - public String getCourtNo() { - return courtNo; + public String getCrtNo() { + return crtNo; } - public void setCourtNo(String courtNo) { - this.courtNo = courtNo; + public void setCrtNo(String crtNo) { + this.crtNo = crtNo; } - public String getDcsnDe() { - return dcsnDe; + public String getCrtDcsnDe() { + return crtDcsnDe; } - public void setDcsnDe(String dcsnDe) { - this.dcsnDe = dcsnDe; + public void setCrtDcsnDe(String crtDcsnDe) { + this.crtDcsnDe = crtDcsnDe; } - public String getRcvDe() { - return rcvDe; + public String getCrtRcptDe() { + return crtRcptDe; } - public void setRcvDe(String rcvDe) { - this.rcvDe = rcvDe; + public void setCrtRcptDe(String crtRcptDe) { + this.crtRcptDe = crtRcptDe; } - public String getAlctnDe() { - return alctnDe; + public String getCrtAllctDe() { + return crtAllctDe; } - public void setAlctnDe(String alctnDe) { - this.alctnDe = alctnDe; + public void setCrtAllctDe(String crtAllctDe) { + this.crtAllctDe = crtAllctDe; } - public String getAlctnMonth() { - return alctnMonth; + public String getCrtRprtDe() { + return crtRprtDe; } - public void setAlctnMonth(String alctnMonth) { - this.alctnMonth = alctnMonth; + public void setCrtRprtDe(String crtRprtDe) { + this.crtRprtDe = crtRprtDe; } - public String getOfficeWorkDe() { - return officeWorkDe; + public String getCrtClimntNm() { + return crtClimntNm; } - public void setOfficeWorkDe(String officeWorkDe) { - this.officeWorkDe = officeWorkDe; + public void setCrtClimntNm(String crtClimntNm) { + this.crtClimntNm = crtClimntNm; } - public String getRprtDe() { - return rprtDe; + public String getCrtClimntPhone() { + return crtClimntPhone; } - public void setRprtDe(String rprtDe) { - this.rprtDe = rprtDe; + public void setCrtClimntPhone(String crtClimntPhone) { + this.crtClimntPhone = crtClimntPhone; } - public String getRprtMonth() { - return rprtMonth; + public String getCrtClimntAgntNm() { + return crtClimntAgntNm; } - public void setRprtMonth(String rprtMonth) { - this.rprtMonth = rprtMonth; + public void setCrtClimntAgntNm(String crtClimntAgntNm) { + this.crtClimntAgntNm = crtClimntAgntNm; } - public String getProcessDay() { - return processDay; + public String getCrtClimntAgtPhone() { + return crtClimntAgtPhone; } - public void setProcessDay(String processDay) { - this.processDay = processDay; + public void setCrtClimntAgtPhone(String crtClimntAgtPhone) { + this.crtClimntAgtPhone = crtClimntAgtPhone; } - public String getCourtFld() { - return courtFld; + public String getCrtClimntInfo() { + return crtClimntInfo; } - public void setCourtFld(String courtFld) { - this.courtFld = courtFld; + public void setCrtClimntInfo(String crtClimntInfo) { + this.crtClimntInfo = crtClimntInfo; } - public String getAccdntCn() { - return accdntCn; + public String getCrtDfndntNm() { + return crtDfndntNm; } - public void setAccdntCn(String accdntCn) { - this.accdntCn = accdntCn; + public void setCrtDfndntNm(String crtDfndntNm) { + this.crtDfndntNm = crtDfndntNm; } - public String getReqInfo() { - return reqInfo; + public String getCrtDfndntPhone() { + return crtDfndntPhone; } - public void setReqInfo(String reqInfo) { - this.reqInfo = reqInfo; + public void setCrtDfndntPhone(String crtDfndntPhone) { + this.crtDfndntPhone = crtDfndntPhone; } - public String getAplcnInfo() { - return aplcnInfo; + public String getCrtDfndntAgntNm() { + return crtDfndntAgntNm; } - public void setAplcnInfo(String aplcnInfo) { - this.aplcnInfo = aplcnInfo; + public void setCrtDfndntAgntNm(String crtDfndntAgntNm) { + this.crtDfndntAgntNm = crtDfndntAgntNm; } - public String getRspndInfo() { - return rspndInfo; + public String getCrtDfndntAgntPhone() { + return crtDfndntAgntPhone; } - public void setRspndInfo(String rspndInfo) { - this.rspndInfo = rspndInfo; + public void setCrtDfndntAgntPhone(String crtDfndntAgntPhone) { + this.crtDfndntAgntPhone = crtDfndntAgntPhone; } - public String getAplcnDpty() { - return aplcnDpty; + public String getCrtDfndntInfo() { + return crtDfndntInfo; } - public void setAplcnDpty(String aplcnDpty) { - this.aplcnDpty = aplcnDpty; + public void setCrtDfndntInfo(String crtDfndntInfo) { + this.crtDfndntInfo = crtDfndntInfo; } - public String getRspndDpty() { - return rspndDpty; + public String getCrtCn() { + return crtCn; } - public void setRspndDpty(String rspndDpty) { - this.rspndDpty = rspndDpty; + public void setCrtCn(String crtCn) { + this.crtCn = crtCn; } - public String getCourtRslt() { - return courtRslt; + public String getCrtAtchFileId() { + return crtAtchFileId; } - public void setCourtRslt(String courtRslt) { - this.courtRslt = courtRslt; + public void setCrtAtchFileId(String crtAtchFileId) { + this.crtAtchFileId = crtAtchFileId; } - public String getCourtDetailRslt() { - return courtDetailRslt; + public String getCrtAllctDdlDe() { + return crtAllctDdlDe; } - public void setCourtDetailRslt(String courtDetailRslt) { - this.courtDetailRslt = courtDetailRslt; + public void setCrtAllctDdlDe(String crtAllctDdlDe) { + this.crtAllctDdlDe = crtAllctDdlDe; } - public String getAdjCmsnr() { - return adjCmsnr; + public String getCrtCcTy() { + return crtCcTy; } - public void setAdjCmsnr(String adjCmsnr) { - this.adjCmsnr = adjCmsnr; + public void setCrtCcTy(String crtCcTy) { + this.crtCcTy = crtCcTy; } - public String getPay() { - return pay; + public String getCrtLinkHouse() { + return crtLinkHouse; } - public void setPay(String pay) { - this.pay = pay; + public void setCrtLinkHouse(String crtLinkHouse) { + this.crtLinkHouse = crtLinkHouse; } - public String getAppDe() { - return appDe; + public String getCrtStatCd() { + return crtStatCd; } - public void setAppDe(String appDe) { - this.appDe = appDe; + public void setCrtStatCd(String crtStatCd) { + this.crtStatCd = crtStatCd; } - public String getPymntDay() { - return pymntDay; + public String getCrtAgrment() { + return crtAgrment; } - public void setPymntDay(String pymntDay) { - this.pymntDay = pymntDay; - } - public String getExtns() { - return extns; - } - public void setExtns(String extns) { - this.extns = extns; - } - public String getUseYn() { - return useYn; - } - public void setUseYn(String useYn) { - this.useYn = useYn; + public void setCrtAgrment(String crtAgrment) { + this.crtAgrment = crtAgrment; } public String getFrstRegistPnttm() { return frstRegistPnttm; @@ -240,12 +256,6 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { public void setLastUpdusrId(String lastUpdusrId) { this.lastUpdusrId = lastUpdusrId; } - public String getRmrks() { - return rmrks; - } - public void setRmrks(String rmrks) { - this.rmrks = rmrks; - } public String getSearchCondition2() { return searchCondition2; } @@ -259,11 +269,4 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { this.diffMonth = diffMonth; } - - - - - - - } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java index 522cf68b..4e414e82 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.com.cmm.service.AdrCourtFileVO; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; @@ -37,5 +38,9 @@ public class AdjCourtCnctnDAO extends EgovAbstractDAO { public void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO) { update("adjCourtCnctnDAO.updateUseYn", adjCourtCnctnVO); } + + public void insertCourtFileInf(AdrCourtFileVO adrCourtFileVO) { + insert("adjCourtCnctnDAO.insertCourtFileInf", adrCourtFileVO); + } } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java index 6c3f856c..e0ac9cf2 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -1,34 +1,28 @@ package kcc.kccadr.adjCourtCnctn.service.impl; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; +import java.util.Map; import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.idgnr.EgovIdGnrService; -import kcc.com.cmm.service.CmmnDetailCode; +import kcc.com.cmm.service.AdrCourtFileMngService; +import kcc.com.cmm.service.AdrCourtFileVO; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.EgovFileMngUtil; +import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.DateUtil; -import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; -import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService; -import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; -import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; -import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO; -import kcc.kccadr.adjst.service.AdjstReqVO; -import kcc.kccadr.adjst.service.impl.AdjstReqDAO; -import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; -import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.cmm.RestResponse; -import kcc.let.sym.ccm.cde.service.CmmnDetailCodeVO; -import kcc.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; -import kcc.let.utl.fcc.service.EgovCryptoUtil; @Service("AdjCourtCnctnService") public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements AdjCourtCnctnService { @@ -39,12 +33,41 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements @Resource(name="courtCnctnGnrService") private EgovIdGnrService courtCnctnGnrService; + + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileMngService; + + @Resource(name = "EgovFileMngUtil") + private EgovFileMngUtil fileUtil; + + @Resource(name = "AdrCourtFileMngService") + private AdrCourtFileMngService adrCourtFileMngService; @Override - public RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) { + public RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) { try { - adjCourtCnctnVO.setCourtSeq(courtCnctnGnrService.getNextStringId()); + + adjCourtCnctnVO.setCrtSeq(courtCnctnGnrService.getNextStringId()); + + final Map files = multiRequest.getFileMap(); + if (!files.isEmpty()){ + List result = fileUtil.parseFileInf(files, "CRT_", 0, "", "", ""); + String atchFileId = fileMngService.insertFileInfs(result); + adjCourtCnctnVO.setCrtAtchFileId(atchFileId); + + AdrCourtFileVO adrCourtFileVO = new AdrCourtFileVO(); + + adrCourtFileVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq()); + adrCourtFileVO.setCrtSn(adjCourtCnctnVO.getCrtSn()); + adrCourtFileVO.setCrtAtchFileId(atchFileId); + adrCourtFileVO.setCrtAtchFileTy("10"); + adrCourtFileVO.setFrstRegisterId(adjCourtCnctnVO.getFrstRegisterId()); + + adrCourtFileMngService.insertCourtFileInf(adrCourtFileVO); + } + adjCourtCnctnDAO.insertCourtCnctn(adjCourtCnctnVO); + } catch (Exception e) { return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 9dfab47b..84bbd3a9 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.multipart.MultipartHttpServletRequest; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -52,8 +53,6 @@ public class AdjCourtCnctnController { adjCourtCnctnVO.setSearchSortOrd("desc"); } - System.out.println("searchMonth2 :: "+ adjCourtCnctnVO.getSearchMonth2()); - /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(adjCourtCnctnVO.getPageIndex()); @@ -63,7 +62,7 @@ public class AdjCourtCnctnController { adjCourtCnctnVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); adjCourtCnctnVO.setLastIndex(paginationInfo.getLastRecordIndex()); adjCourtCnctnVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO)); +// paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO)); model.addAttribute("paginationInfo", paginationInfo); List list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO); // 복호화 @@ -102,17 +101,15 @@ public class AdjCourtCnctnController { @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnRegist.do") public String adjCourtCnctnRegist(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { - AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO(); - model.addAttribute("courtVO", adjReqMgrPastVO); return "kccadr/adjCourtCnctn/adjCourtCnctnRegist"; } @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnRegistAjax.do") - public ResponseEntity adjCourtCnctnRegistAjax(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { + public ResponseEntity adjCourtCnctnRegistAjax(final MultipartHttpServletRequest multiRequest, AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId()); - return ResponseEntity.ok().body(adjCourtCnctnService.insertCourtCnctn(adjCourtCnctnVO)); + return ResponseEntity.ok().body(adjCourtCnctnService.insertCourtCnctn(adjCourtCnctnVO, multiRequest)); } @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnUpdateAjax.do") diff --git a/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java b/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java index e63c3a99..f6b02235 100644 --- a/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java +++ b/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java @@ -232,7 +232,7 @@ public class TextSenseController { } } - + //TextSense API 요청 처리 TextSenseVO apiTextSenseVO = new TextSenseVO(); String outputFileExt = "text"; diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index f2c9adc2..f32604fc 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -347,6 +347,8 @@ public class EgovMainController { // List quickList = menuCreateManageService.selectQuickListIncTop(menuManageJTreeVO) ; // model.addAttribute("quickList", quickList); // } + + model.addAttribute("authority", user.getAuthority()); return "main/inc/EgovIncTopnav"; // 내부업무의 상단메뉴 화면 } diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 7955cdaf..aa6b0ec8 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -260,62 +260,62 @@ public class EgovLoginController { * @return String * @exception Exception */ - @RequestMapping(value = "/web/user/login/login.do") - public String userLogin(HttpServletRequest request, HttpServletResponse response, ModelMap model, @RequestParam Map commandMap, HttpSession session) throws Exception { - Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); - if (isAuthenticated) - return "redirect:/web/main/mainPage.do"; - - // 로그인필요 URL 호출하여 온경우 - String beforeUrl = (String) commandMap.get("beforeUrl"); - String message = (String) commandMap.get("message"); - - // sns 회원가입 key 값 설정 - String naverClientId = itnNaverClientId; - String naverClientSecret = itnNaverClientSecret; - - String kakaoRestApiKey = itnKakaoRestApiKey; - String kakaoReturnUrl = itnKakaoReturnUrl; - - // config 정보 가져오기 - MberManageConfigVO mberConfigVO = new MberManageConfigVO(); - - List mberManageCnfVO = mberManageService.selectMberCnf(mberConfigVO); - - for (int i = 0; i < mberManageCnfVO.size(); i++) { - if (mberManageCnfVO.get(i).getIsSns().equals("Y")) { - if (mberManageCnfVO.get(i).getUseYn().equals("Y")) { - if (mberManageCnfVO.get(i).getConfigId().equals("snsNaver")) { - String redirectURI = URLEncoder.encode(itnNaverReturnUrl, "UTF-8"); - SecureRandom random = new SecureRandom(); - BigInteger state = new BigInteger(130, random); - String naver_url = "https://nid.naver.com/oauth2.0/authorize?response_type=code"; - naver_url += "&client_id=" + itnNaverClientId; - naver_url += "&redirect_url=" + redirectURI; - naver_url += "&state=" + state; - mberManageCnfVO.get(i).setSiteUrl(naver_url); - mberManageCnfVO.get(i).setSiteIcon("/img/login_naver_icon.png"); - - } else if (mberManageCnfVO.get(i).getConfigId().equals("snsKakao")) { - - String kakao_url = "https://kauth.kakao.com/oauth/authorize?response_type=code"; - kakao_url += "&client_id=" + kakaoRestApiKey; - kakao_url += "&redirect_uri=" + kakaoReturnUrl; - mberManageCnfVO.get(i).setSiteUrl(kakao_url); - mberManageCnfVO.get(i).setSiteIcon("/img/login_kakao_icon.png"); - - } else if (mberManageCnfVO.get(i).getConfigId().equals("snsGoogle")) { - - } - } - } - } - model.addAttribute("mberManageCnfVO", mberManageCnfVO); - model.addAttribute("beforeUrl", beforeUrl); - model.addAttribute("message", message); -// initRsa(request); - return "web/login/EgovLoginGnrlUsr"; - } +// @RequestMapping(value = "/web/user/login/login.do") +// public String userLogin(HttpServletRequest request, HttpServletResponse response, ModelMap model, @RequestParam Map commandMap, HttpSession session) throws Exception { +// Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); +// if (isAuthenticated) +// return "redirect:/web/main/mainPage.do"; +// +// // 로그인필요 URL 호출하여 온경우 +// String beforeUrl = (String) commandMap.get("beforeUrl"); +// String message = (String) commandMap.get("message"); +// +// // sns 회원가입 key 값 설정 +// String naverClientId = itnNaverClientId; +// String naverClientSecret = itnNaverClientSecret; +// +// String kakaoRestApiKey = itnKakaoRestApiKey; +// String kakaoReturnUrl = itnKakaoReturnUrl; +// +// // config 정보 가져오기 +// MberManageConfigVO mberConfigVO = new MberManageConfigVO(); +// +// List mberManageCnfVO = mberManageService.selectMberCnf(mberConfigVO); +// +// for (int i = 0; i < mberManageCnfVO.size(); i++) { +// if (mberManageCnfVO.get(i).getIsSns().equals("Y")) { +// if (mberManageCnfVO.get(i).getUseYn().equals("Y")) { +// if (mberManageCnfVO.get(i).getConfigId().equals("snsNaver")) { +// String redirectURI = URLEncoder.encode(itnNaverReturnUrl, "UTF-8"); +// SecureRandom random = new SecureRandom(); +// BigInteger state = new BigInteger(130, random); +// String naver_url = "https://nid.naver.com/oauth2.0/authorize?response_type=code"; +// naver_url += "&client_id=" + itnNaverClientId; +// naver_url += "&redirect_url=" + redirectURI; +// naver_url += "&state=" + state; +// mberManageCnfVO.get(i).setSiteUrl(naver_url); +// mberManageCnfVO.get(i).setSiteIcon("/img/login_naver_icon.png"); +// +// } else if (mberManageCnfVO.get(i).getConfigId().equals("snsKakao")) { +// +// String kakao_url = "https://kauth.kakao.com/oauth/authorize?response_type=code"; +// kakao_url += "&client_id=" + kakaoRestApiKey; +// kakao_url += "&redirect_uri=" + kakaoReturnUrl; +// mberManageCnfVO.get(i).setSiteUrl(kakao_url); +// mberManageCnfVO.get(i).setSiteIcon("/img/login_kakao_icon.png"); +// +// } else if (mberManageCnfVO.get(i).getConfigId().equals("snsGoogle")) { +// +// } +// } +// } +// } +// model.addAttribute("mberManageCnfVO", mberManageCnfVO); +// model.addAttribute("beforeUrl", beforeUrl); +// model.addAttribute("message", message); +//// initRsa(request); +// return "web/login/EgovLoginGnrlUsr"; +// } /** * (사용자) SSO 로그인 화면. @@ -564,6 +564,9 @@ public class EgovLoginController { } else if ("ROLE_USER_MANAGER".equals(s_loginInfo_getAuthority)) { model.addAttribute("message", egovMessageSource.getMessage("fail.common.login")); return "uat/uia/EgovLoginUsr"; + } else if ("ROLE_COURT_ADMIN".equals(s_loginInfo_getAuthority)) { + model.addAttribute("message", "법원연계 관리자는 별도 URL로 로그인 해주세요."); + return "uat/uia/EgovLoginUsrCourt"; } } @@ -1586,8 +1589,13 @@ public class EgovLoginController { return "redirect:/cmm/main/mainPage.do"; } else if ("ROLE_USER_MANAGER".equals(user.getAuthority())) { return "redirect:/web/main/mainPage.do"; - } else { // 일반관리자 경우 - return "redirect:/EgovTopPageLink.do?link=/cop/bbs/SelectBBSMasterInfs.do&baseMenuNo=4300000"; + } else if ("past_author".equals(user.getAuthority())) { + return "redirect:/kccadr/adjReqMgOff/adjReqMgrPastList.do"; + } else if ("ROLE_COURT_ADMIN".equals(user.getAuthority())) { + return "redirect:/kccadr/adjCourtCnctn/adjCourtCnctnList.do"; + } + else { // 일반관리자 경우 + return "redirect:/cmm/main/mainPage.do"; } } @@ -1602,6 +1610,12 @@ public class EgovLoginController { request.getSession().invalidate(); return "redirect:/uat/uia/EgovLoginUsr.do"; } + + @RequestMapping(value = "/uat/uia/actionLogoutCourt.do") + public String selectActionLogoutCourt(HttpServletRequest request, ModelMap model, HttpServletResponse response) throws Exception { + request.getSession().invalidate(); + return "redirect:/uat/uia/EgovLoginCourt.do"; + } /** * (사용자)로그아웃한다. @@ -2369,6 +2383,198 @@ public class EgovLoginController { return adjReqMgrVO; } + + + /** + * (관리자) 법원연계 조정위원 로그인 화면. + * + * @return String + * @exception Exception + */ + @RequestMapping(value = "/uat/uia/EgovLoginCourt.do") + public String EgovLoginCourt(HttpServletRequest request, HttpServletResponse response, ModelMap model) throws Exception { + Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); + //interceptor시 flashmap을 통해 파라미터 전달 받기 + Map flashMap = RequestContextUtils.getInputFlashMap(request); + if(flashMap !=null) { + System.out.println((String)flashMap.get("message")); + model.addAttribute("message", (String)flashMap.get("message")); + } + + if (isAuthenticated) + return "redirect:/cmm/main/mainPage.do"; + if (!isAuthenticated) { + return "uat/uia/EgovLoginUsrCourt"; + } + return "uat/uia/EgovLoginUsrCourt"; + } + + /** + * (관리자) 일반(스프링 시큐리티) 로그인을 처리한다(관리자) + * + * @param vo - 아이디, 비밀번호가 담긴 LoginVO + * @param request - 세션처리를 위한 HttpServletRequest + * @return result - 로그인결과(세션정보) + * @exception Exception + */ + @RequestMapping(value = "/uat/uia/actionSecurityLoginCourt.do") + public String selectActionSecurityLoginCourt(@ModelAttribute("loginVO") LoginVO loginVO, HttpServletResponse response, HttpServletRequest request, ModelMap model, HttpSession session) + throws Exception { + + Locale.setDefault(new Locale("ko", "Kr")); + + // 로그인 정보 check + if (loginVO.getId() == null || loginVO.getPassword() == null) { // 로그인 최초 화면 로딩 + return "uat/uia/EgovLoginUsrCourt"; + } + + loginVO.setId(loginVO.getId()); + loginVO.setPassword(loginVO.getPassword()); + + // 사용자일 경우 로그인 안되게 + LoginVO loginInfo = loginService.getUserAuth(loginVO); + String s_loginInfo_getAuthority = ""; + try { + s_loginInfo_getAuthority = loginInfo.getAuthority(); + + }catch(Exception ex) { + System.out.println(ex.getMessage()); + } + + if (null == loginInfo) { // 아이디 없음. + model.addAttribute("message", egovMessageSource.getMessage("fail.common.login")); + return "uat/uia/EgovLoginUsrCourt"; + } else { + if(!"ROLE_COURT_ADMIN".equals(s_loginInfo_getAuthority)){ + model.addAttribute("message", "법원연계 관리자만 로그인 가능합니다."); + return "uat/uia/EgovLoginUsrCourt"; + } + } + + // 1. 로그인 처리 + LoginVO resultVO = loginService.actionLogin(loginVO); + + //중복 호출 제거 + LoginVO loginGetUserAuth = loginService.getUserAuth(resultVO); + + if (loginGetUserAuth != null) { + resultVO.setAuthority(loginGetUserAuth.getAuthority()); + } + + if (null == resultVO.getId()) { // 로그인 실패 + loginService.updatePassMissPlus(loginVO); + model.addAttribute("message", egovMessageSource.getMessage("fail.common.login")); + return "uat/uia/EgovLoginUsrCourt"; + } else { + if (resultVO.getPassMiss() > 10) { + model.addAttribute("message", "패스워드가 10회 이상 틀려 로그인 할수 없습니다. 관리자에게 문의하시기 바랍니다."); + return "uat/uia/EgovLoginUsrCourt"; + } else { // 초기화 + loginService.updatePassMissReset(loginVO); + } + } + + // 2. 허용IP조회 + boolean loginPolicyYn = false; + + HttpServletRequest req = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest(); + String userIp = EgovClntInfo.getClntIP(req); + + /* + * 관리자 로그인 유형 추가_240109 + * loginTypeCd + * 001 : IP제어 + * 002 : OTP + * 003 : 법원연계 로그인 + * */ + + // IP 제어 로그인 + if("001".equals(resultVO.getLoginTypeCd())) { + + LoginPolicyVO loginPolicyVO = new LoginPolicyVO(); + loginPolicyVO.setIpInfo(userIp); + + boolean ipCheck = false; + List loginPolicyGroupList = new ArrayList(); + loginPolicyGroupList = egovLoginPolicyService.selectLoginGroupPolicyAll(loginPolicyVO); + if (loginPolicyGroupList != null) { + for (LoginPolicyVO tempPolicyVO : loginPolicyGroupList) { + if (userIp.contains(tempPolicyVO.getIpInfo().trim())) { + ipCheck = true; + break; + } + } + } + + if (!ipCheck) { + model.addAttribute("message", egovMessageSource.getMessage("fail.common.login")); + return "uat/uia/EgovLoginUsrCourt"; + } + } + + // resultVO.siteId 의 각 로그인 ip를 조회함 + if (resultVO != null && resultVO.getId() != null && !resultVO.getId().equals("")) { + // 세션에다 ip 등록 + resultVO.setIp(userIp); + // 2. spring security 연동 + + request.getSession().setAttribute("LoginVO", resultVO); + + UsernamePasswordAuthenticationFilter springSecurity = new UsernamePasswordAuthenticationFilter(); + + ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); + + Map beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class); + + if (beans.size() > 0) { + + springSecurity = (UsernamePasswordAuthenticationFilter) beans.values().toArray()[0]; + springSecurity.setUsernameParameter("egov_security_username"); + springSecurity.setPasswordParameter("egov_security_password"); + springSecurity.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(request.getServletContext().getContextPath() + "/egov_security_login", "POST")); + + } else { + throw new IllegalStateException("No AuthenticationProcessingFilter"); + } + + springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null); + { // 관리자 로그인 log 저장 + String uniqId = ""; + String ip = ""; + + /* Authenticated */ + LoginLog loginLog = new LoginLog(); + Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); + if (isAuthenticated.booleanValue()) { + LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + uniqId = user.getUniqId(); + ip = EgovClntInfo.getClntIP(request); + loginLog.setSiteId(user.getSiteId()); + HttpSession httpSession = request.getSession(true); + { + List siteManageList = new ArrayList(); + SiteManagerVO siteManagerVO = new SiteManagerVO(); + siteManagerVO.setFirstIndex(0); + siteManagerVO.setRecordCountPerPage(100); + siteManageList = egovSiteManagerService.selectSiteManagerList(siteManagerVO); + httpSession.setAttribute("siteManageList", siteManageList); + httpSession.setAttribute("adminId", user.getId()); + httpSession.setAttribute("loginId", user.getId()); // 자동완성 공통으로 쓰기위해 + httpSession.setAttribute("esntlId", user.getPassword()); + } + } + + } + + return "blank"; // 성공 시 페이지.. (redirect 불가) + // 개인키 삭제 + // return "blank"; // 성공 시 페이지.. (redirect 불가) + + } else { + model.addAttribute("message", egovMessageSource.getMessage("fail.common.login")); + return "uat/uia/EgovLoginUsrCourt"; + } + } } diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index cad60661..21faeaf9 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2876,8 +2876,8 @@ - - + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml index defeedcc..80b0f5c5 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml @@ -3,9 +3,10 @@ + - + <%-- diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserManage.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserManage.jsp index c0725691..6fb4fcbc 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserManage.jsp @@ -18,6 +18,7 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> @@ -253,7 +254,7 @@ function userListExcelDownload(){ --%> - + <%-- @@ -269,7 +270,13 @@ function userListExcelDownload(){ - + + + --%> + + + + diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp index 7edd7b3d..9427ec91 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp @@ -61,18 +61,29 @@ $( document ).ready(function(){ } */ - //직급 셀렉트박스 설정 - if("${userManageVO.authorCode}" == "ROLE_ADR_ADMIN"){ + var author = $("[name='authorCode'] option:selected").val(); + if(author == 'ROLE_ADR_ADMIN'){ $("#rank1").css('display', 'block'); - $("#rank2").css('display', 'none'); $("#rank1").attr('disabled', false); - $("#rank2").attr('disabled', true); -// $("#rank1").val("${userManageVO.ofcpsNm}").prop("selected", true); - }else{ - $("#rank1").css('display', 'none'); - $("#rank2").css('display', 'block'); + $("#rank2").css('display', 'none'); + $("#rank2").attr('disabled', true); + $("#rank3").css('display', 'none'); + $("#rank3").attr('disabled', true); + }else if(author == 'ROLE_COURT_ADMIN'){ + $("#rank1").css('display', 'none');; $("#rank1").attr('disabled', true); + $("#rank2").css('display', 'none'); + $("#rank2").attr('disabled', true); + $("#rank3").css('display', 'block'); + $("#rank3").attr('disabled', false); + } + else{ + $("#rank1").css('display', 'none'); + $("#rank1").attr('disabled', true); + $("#rank2").css('display', 'block'); $("#rank2").attr('disabled', false); + $("#rank3").css('display', 'none'); + $("#rank3").attr('disabled', true); } //첨부파일 버튼 처리 @@ -354,16 +365,29 @@ function nCheck2(){ } function authorChange(obj) { - if(obj.selectedIndex == '0'){ + var author = $("[name='authorCode'] option:selected").val(); + if(author == 'ROLE_ADR_ADMIN'){ $("#rank1").css('display', 'block'); - $("#rank2").css('display', 'none'); $("#rank1").attr('disabled', false); + $("#rank2").css('display', 'none'); $("#rank2").attr('disabled', true); - }else{ - $("#rank1").css('display', 'none'); - $("#rank2").css('display', 'block'); + $("#rank3").css('display', 'none'); + $("#rank3").attr('disabled', true); + }else if(author == 'ROLE_COURT_ADMIN'){ + $("#rank1").css('display', 'none');; $("#rank1").attr('disabled', true); + $("#rank2").css('display', 'none'); + $("#rank2").attr('disabled', true); + $("#rank3").css('display', 'block'); + $("#rank3").attr('disabled', false); + } + else{ + $("#rank1").css('display', 'none'); + $("#rank1").attr('disabled', true); + $("#rank2").css('display', 'block'); $("#rank2").attr('disabled', false); + $("#rank3").css('display', 'none'); + $("#rank3").attr('disabled', true); } } @@ -471,6 +495,11 @@ function authorChange(obj) { + + <%-- @@ -615,7 +644,8 @@ function authorChange(obj) { - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp index 7a573213..3e00ca4e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp @@ -12,17 +12,17 @@ -조정종결상세 +법원연계 조정 등록
-

한국저작권위원회 KOREA COPYRIGHT COMMISSION +

+ + + + + + + 한국저작권위원회 KOREA COPYRIGHT COMMISSION +

- - - + + + +

  • 로그인 타임아웃 :

    • - -<%--

    최종접속일시 :

    --%> -
diff --git a/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsrCourt.jsp b/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsrCourt.jsp new file mode 100644 index 00000000..1b203428 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsrCourt.jsp @@ -0,0 +1,157 @@ +<%-- + Class Name : EgovLoginUsr.jsp + Description : 로그인화면 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2009.03.10 박지욱 최초 생성 + 2011.08.31 JJY 경량환경 버전 생성 + + author : 공통서비스 개발팀 박지욱 + since : 2009.03.10 +--%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + + +로그인 + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + From d7976f96e997fefe1d72a76ece17fc6c9294350a Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 12 Jan 2024 11:47:08 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 법연연계 개발중 --- .../web/AdjCourtCnctnController.java | 51 + .../adjCourtCnctn/adjCourtCnctnApprov.jsp | 1315 +++++++++++++++++ 2 files changed, 1366 insertions(+) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnApprov.jsp diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 84bbd3a9..2c869c17 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -1,10 +1,12 @@ package kcc.kccadr.adjCourtCnctn.web; +import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -15,9 +17,16 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; +import kcc.com.cmm.util.DateUtil; +import kcc.com.cmm.util.StringUtil; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; +import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; +import kcc.kccadr.adjPgrMgr.ent.service.EntVO; +import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; +import kcc.kccadr.adjRppl.service.AdjRpplVO; +import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.cmm.RestResponse; /** @@ -120,4 +129,46 @@ public class AdjCourtCnctnController { return ResponseEntity.ok().body(adjCourtCnctnService.updateCourtCnctn(adjCourtCnctnVO)); } + + + + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnApprov.do") + public String adjCourtCnctnApprov(@ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO, ModelMap model) throws Exception { + String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + + if (loginVO == null) { + + model.addAttribute("msg", "로그인 해주세요."); + return "redirect:/web/user/login/ssoLogin.do"; + } + + internalApprovManageVO.setSearchSbmtId(loginVO.getUniqId()); + InternalApprovManageVO info = new InternalApprovManageVO(); + List approvLine = new ArrayList(); + + String aftThree = ""; + //접수일로부터 3개월뒤 날짜 구하기 + if(StringUtil.isNotEmpty(info.getReqDt())) { + + String reqDt = info.getReqDt(); + DateUtil dateUtil = new DateUtil(); + aftThree = dateUtil.AddDate(reqDt, 0, 3, 0); + + } + + // 20221201 이호영 + // 법인일 경우 법인명+대표자명 노출 + AdjRpplVO rpplVO = new AdjRpplVO(); + info.setRpplUsrTy(rpplVO.getRpplUsrTy()); + info.setRpplBizNm(rpplVO.getRpplNm()); + + model.addAttribute("info", info); + model.addAttribute("approvLine", approvLine); + model.addAttribute("aftThree", aftThree); //접수일로 3개월 뒤 날짜 정보 + //22.02.08 최고관리자의 경우 반려 결재 버튼 미노출 처리 + model.addAttribute("auth", loginVO.getAuthority()); + return "kccadr/adjCourtCnctn/adjCourtCnctnApprov"; + } } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnApprov.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnApprov.jsp new file mode 100644 index 00000000..38c845b3 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnApprov.jsp @@ -0,0 +1,1315 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ page import="kcc.kccadr.cmm.KccadrConstants"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<% pageContext.setAttribute("replaceChar", "\n"); %> + +<% + /** + * @Class Name : AdjustDeptManagerCreate.jsp + * @Description : 관리자 일정관리 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.16 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + +조정결재 + + + + + + + + + + + + +
+ + + + + + + " /> + " /> + " /> + "/> + "/> + "/> + "/> + + +
+ + + + + + + + + + + +
+
+ +
+

법원연계 결재 상세 -

+
    +
    • +

  • 조정진행관리

    • +

  • 내부결재목록

    • +
  • 조정결재상세
    • +
+
+ + +
+ + + + + + <%--
+

조정번호 : 2021조정054

+

접수일 : 2021-07-15

+

진행현황 : 조정진행

+
--%> + + +

사건 정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + + + + + + + + + + + +<%-- --%> + + + + + + + + + + + <%-- 조정기일 통지서요청(205010) 이후 결재 요청일 경우 조정기일 정보 노출_이준호_220222 --%> + <%-- 205010 --%> + + + + + + + + +

조정번호

 + + +

조정건명

 이용에 따른 분쟁

피고

 + + + (대표: ) + + + + + +

피고의 대리인

 + + () + +

피고

피고의 대리인

 + + () + +

접수연월일

 +

+ + + () + +

+

종료년월일

조정위원

 +

+ + + (부장: + + 위원: + + ) + +

+

장소

총괄 조정위원 +

+ +

+ 		진행상태 +

+ + + + + + + + +

+

조정결과

 +

+ <%-- --%> + +

+

종결일

조정기일

 +

+ +

+

+
+ + +
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + +

원고 정보

+ ${fn:replace(info.reqTempCn1, replaceChar, "
")} + 		+ ${fn:replace(info.reqCn1, replaceChar, "
")} +

피고정보

+ ${fn:replace(info.reqTempCn2, replaceChar, "
")} + 		+ ${fn:replace(info.reqCn2, replaceChar, "
")} +
+
+ + +
+ + +
+ +<%-- --%> +<%-- --%> + + + +

결재진행

+
+ <%-- --%> + + <%-- --%> +
+
+ + + + + + + + + + + + + + + + +
결재요청일 +

+ 		결재대기 +

+ +

+
+
+ + +
+ + + <%-- 반려 이후 제외 --%> + + + + + + + + + + + + + + + + + + + + + + + + +
+ +

+ +

+ + +

+ +
+ + + + + + + + +
+ +

담당자

+ +

+ + +

+ +
+
+ +

조정위원

+ +

+ + +

+ +
+
+ +

총괄조정위원

+ +

+ + +

+ +
+
+ +
+
+ <%-- 대결버튼은 현재 결재자 이거나 최고관리자인 경우만 나타나게 --%> + + + + + + <%-- 취하종결 상세보기 --%> + <%-- + + + + --%> + + <%-- 불성립종결, 직권조정, 조정권고 상세보기 --%> + <%-- + + + + + + + + + + + + + + + + + + + + --%> +
+
+ <%-- 최고관리자의 경우 결재, 반려 버튼 미노출 --%> + + + + + + + +
+
+ +
+ +
+
+ + + From dd0c7cffd5261c82b239bc1c6cf187b1e9be9c3b Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 15 Jan 2024 18:11:14 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 법원연계조정 개발 중 --- .../java/kcc/com/cmm/taglibs/SelectTag.java | 2 +- .../service/AdjCourtCnctnService.java | 17 +- .../service/AdjCourtCnctnVO.java | 110 ++++-- .../adjCourtCnctn/service/AdjCourtDeptVO.java | 126 +++++++ .../service/impl/AdjCourtCnctnDAO.java | 17 +- .../impl/AdjCourtCnctnServiceImpl.java | 25 +- .../web/AdjCourtCnctnController.java | 43 ++- .../adjPgrMgr/apm/web/ApmController.java | 1 - .../kcc/kccadr/cmm/KccadrCourtConstants.java | 6 + .../umt/service/EgovUserManageService.java | 5 +- .../impl/EgovUserManageServiceImpl.java | 15 +- .../uss/umt/service/impl/UserManageDAO.java | 4 + .../uss/umt/web/EgovUserManageController.java | 8 +- .../adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml | 242 ++++++++++++- .../let/uss/umt/EgovUserManage_SQL_Mysql.xml | 6 + src/main/webapp/WEB-INF/decorators.xml | 2 + .../jsp/cmm/uss/umt/EgovUserManage.jsp | 6 + .../jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp | 63 ++-- .../adjCourtCnctn/adjCourtCnctnDetail.jsp | 319 +++++------------- .../adjCourtCnctn/adjCourtCnctnDetailTab0.jsp | 231 +++++++++++++ .../adjCourtCnctn/adjCourtCnctnDetailTab1.jsp | 136 ++++++++ .../adjCourtCnctn/adjCourtCnctnList.jsp | 113 ++----- .../adjCourtCnctn/adjCourtCnctnRegist.jsp | 36 +- .../pop/adjCourtCnctnDeptPop.jsp | 85 +++++ 24 files changed, 1190 insertions(+), 428 deletions(-) create mode 100644 src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtDeptVO.java create mode 100644 src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnDeptPop.jsp diff --git a/src/main/java/kcc/com/cmm/taglibs/SelectTag.java b/src/main/java/kcc/com/cmm/taglibs/SelectTag.java index 21320ac6..6c445d85 100644 --- a/src/main/java/kcc/com/cmm/taglibs/SelectTag.java +++ b/src/main/java/kcc/com/cmm/taglibs/SelectTag.java @@ -223,7 +223,7 @@ public class SelectTag extends SimpleTagSupport { } if(flag){ - if (code.getCode().equals(selectedValue)) { + if (code.getCode().equals(selectedValue.trim())) { tag.append("\n\t\t"); } else { tag.append("\n\t\t"); diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java index 534b7f0f..bfbb3cfb 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java @@ -8,16 +8,21 @@ import kcc.kccadr.cmm.RestResponse; public interface AdjCourtCnctnService { - RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest); + RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) throws Exception; - int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO); + int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception; - List adjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO); + List adjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception; - AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO); + AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception; - RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO); + RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception; - void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO); + void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception; + public List selectAdjCourtCnctniFileList(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception; + + public void insertCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception; + + public AdjCourtDeptVO selectAdjCourtCnctniDeptPop() throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java index ec25a19b..47e137d4 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -14,40 +14,6 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { */ private static final long serialVersionUID = -1111076331699607617L; - -// private String courtSeq = ""; -// private String courtNum = ""; -// private String courtOrgNo = ""; -// private String courtNo = ""; -// private String dcsnDe = ""; -// private String rcvDe = ""; -// private String alctnDe = ""; -// private String alctnMonth = ""; -// private String officeWorkDe = ""; -// private String rprtDe = ""; -// private String rprtMonth = ""; -// private String processDay = ""; -// private String courtFld = ""; -// private String accdntCn = ""; -// private String reqInfo = ""; -// private String aplcnInfo = ""; -// private String rspndInfo = ""; -// private String aplcnDpty = ""; -// private String rspndDpty = ""; -// private String courtRslt = ""; -// private String courtDetailRslt = ""; -// private String adjCmsnr = ""; -// private String pay = ""; -// private String appDe = ""; -// private String pymntDay = ""; -// private String extns = ""; -// private String useYn = ""; -// private String rmrks = ""; - - - - - private String crtSeq; //법원연계 seq private String crtSn; //법원연계 기일수 private String crtOriNo; //본사건번호 @@ -82,6 +48,22 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private String searchCondition2 = ""; private String diffMonth = ""; + + + private String tabSeq; + private String atchFileId; + private String fileSn; + private String crtAtchFileTy; + private String orignlFileNm; + + private String pstinstCode; + private String crtDeptTy; + + + private String crtDeptKng; + private String crtDeptOrdi; + + public String getCrtSeq() { return crtSeq; } @@ -268,5 +250,65 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { public void setDiffMonth(String diffMonth) { this.diffMonth = diffMonth; } + public String getTabSeq() { + return tabSeq; + } + public void setTabSeq(String tabSeq) { + this.tabSeq = tabSeq; + } + public String getAtchFileId() { + return atchFileId; + } + public void setAtchFileId(String atchFileId) { + this.atchFileId = atchFileId; + } + public String getFileSn() { + return fileSn; + } + public void setFileSn(String fileSn) { + this.fileSn = fileSn; + } + public String getCrtAtchFileTy() { + return crtAtchFileTy; + } + public void setCrtAtchFileTy(String crtAtchFileTy) { + this.crtAtchFileTy = crtAtchFileTy; + } + public String getOrignlFileNm() { + return orignlFileNm; + } + public void setOrignlFileNm(String orignlFileNm) { + this.orignlFileNm = orignlFileNm; + } + public String getPstinstCode() { + return pstinstCode; + } + public void setPstinstCode(String pstinstCode) { + this.pstinstCode = pstinstCode; + } + public String getCrtDeptTy() { + return crtDeptTy; + } + public void setCrtDeptTy(String crtDeptTy) { + this.crtDeptTy = crtDeptTy; + } + public String getCrtDeptKng() { + return crtDeptKng; + } + public void setCrtDeptKng(String crtDeptKng) { + this.crtDeptKng = crtDeptKng; + } + public String getCrtDeptOrdi() { + return crtDeptOrdi; + } + public void setCrtDeptOrdi(String crtDeptOrdi) { + this.crtDeptOrdi = crtDeptOrdi; + } + + + + + + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtDeptVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtDeptVO.java new file mode 100644 index 00000000..bb51e515 --- /dev/null +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtDeptVO.java @@ -0,0 +1,126 @@ +package kcc.kccadr.adjCourtCnctn.service; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import kcc.com.cmm.ComDefaultVO; +import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; + +public class AdjCourtDeptVO extends ComDefaultVO implements Serializable { + + private static final long serialVersionUID = -1111076331699607617L; + + + private String esntlId; + private String crtSeq; + private String crtAtchFileId; + private String crtAllwanc; + private String crtPayDe; + private String crtRecivAccnt; + private String crtDeptTy; + + + private String frstRegistPnttm; + private String frstRegisterId; + private String lastUpdtPnttm; + private String lastUpdusrId; + + private String crtLinkHouse; + + private String emplyrId; + private String userNm; + private String pstinstCode; + + public String getCrtAtchFileId() { + return crtAtchFileId; + } + public void setCrtAtchFileId(String crtAtchFileId) { + this.crtAtchFileId = crtAtchFileId; + } + public String getCrtAllwanc() { + return crtAllwanc; + } + public void setCrtAllwanc(String crtAllwanc) { + this.crtAllwanc = crtAllwanc; + } + public String getCrtPayDe() { + return crtPayDe; + } + public void setCrtPayDe(String crtPayDe) { + this.crtPayDe = crtPayDe; + } + public String getCrtRecivAccnt() { + return crtRecivAccnt; + } + public void setCrtRecivAccnt(String crtRecivAccnt) { + this.crtRecivAccnt = crtRecivAccnt; + } + public String getEsntlId() { + return esntlId; + } + public void setEsntlId(String esntlId) { + this.esntlId = esntlId; + } + public String getCrtSeq() { + return crtSeq; + } + public void setCrtSeq(String crtSeq) { + this.crtSeq = crtSeq; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + public String getCrtLinkHouse() { + return crtLinkHouse; + } + public void setCrtLinkHouse(String crtLinkHouse) { + this.crtLinkHouse = crtLinkHouse; + } + public String getCrtDeptTy() { + return crtDeptTy; + } + public void setCrtDeptTy(String crtDeptTy) { + this.crtDeptTy = crtDeptTy; + } + public String getEmplyrId() { + return emplyrId; + } + public void setEmplyrId(String emplyrId) { + this.emplyrId = emplyrId; + } + public String getUserNm() { + return userNm; + } + public void setUserNm(String userNm) { + this.userNm = userNm; + } + public String getPstinstCode() { + return pstinstCode; + } + public void setPstinstCode(String pstinstCode) { + this.pstinstCode = pstinstCode; + } + +} diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java index 4e414e82..02de1118 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java @@ -7,9 +7,7 @@ import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.com.cmm.service.AdrCourtFileVO; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; -import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; -import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; -import kcc.kccadr.cmm.RestResponse; +import kcc.kccadr.adjCourtCnctn.service.AdjCourtDeptVO; @Repository("AdjCourtCnctnDAO") public class AdjCourtCnctnDAO extends EgovAbstractDAO { @@ -42,5 +40,16 @@ public class AdjCourtCnctnDAO extends EgovAbstractDAO { public void insertCourtFileInf(AdrCourtFileVO adrCourtFileVO) { insert("adjCourtCnctnDAO.insertCourtFileInf", adrCourtFileVO); } - + + public void insertCourtDept(AdjCourtDeptVO adjCourtDeptVO) { + insert("adjCourtCnctnDAO.insertCourtDept", adjCourtDeptVO); + } + + public List selectAdjCourtCnctniFileList(AdjCourtCnctnVO adjCourtCnctnVO) { + return (List) list("adjCourtCnctnDAO.selectAdjCourtCnctniFileList", adjCourtCnctnVO); + } + + public AdjCourtDeptVO selectAdjCourtCnctniDeptPop() { + return (AdjCourtDeptVO) select("adjCourtCnctnDAO.selectAdjCourtCnctniDeptPop"); + } } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java index e0ac9cf2..e0142744 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -22,6 +22,8 @@ import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.DateUtil; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; +import kcc.kccadr.adjCourtCnctn.service.AdjCourtDeptVO; +import kcc.kccadr.cmm.KccadrCourtConstants; import kcc.kccadr.cmm.RestResponse; @Service("AdjCourtCnctnService") @@ -48,6 +50,8 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements try { adjCourtCnctnVO.setCrtSeq(courtCnctnGnrService.getNextStringId()); + adjCourtCnctnVO.setCrtStatCd("101000"); + adjCourtCnctnVO.setCrtStatCd(KccadrCourtConstants.CRT_REG); final Map files = multiRequest.getFileMap(); if (!files.isEmpty()){ @@ -68,6 +72,14 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements adjCourtCnctnDAO.insertCourtCnctn(adjCourtCnctnVO); + AdjCourtDeptVO adjCourtDeptVO = new AdjCourtDeptVO(); + adjCourtDeptVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq()); + adjCourtDeptVO.setFrstRegisterId(adjCourtCnctnVO.getFrstRegisterId()); + adjCourtDeptVO.setCrtLinkHouse(adjCourtCnctnVO.getCrtLinkHouse()); + adjCourtDeptVO.setCrtDeptTy("10"); + + adjCourtCnctnDAO.insertCourtDept(adjCourtDeptVO); + } catch (Exception e) { return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); } @@ -115,6 +127,17 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements adjCourtCnctnDAO.updateUseYn(adjCourtCnctnVO); } - + public List selectAdjCourtCnctniFileList(AdjCourtCnctnVO adjCourtCnctnVO) { + return adjCourtCnctnDAO.selectAdjCourtCnctniFileList(adjCourtCnctnVO); + } + @Override + public void insertCourtDept(AdjCourtDeptVO adjCourtDeptVO) { + adjCourtCnctnDAO.insertCourtDept(adjCourtDeptVO); + } + + @Override + public AdjCourtDeptVO selectAdjCourtCnctniDeptPop() { + return adjCourtCnctnDAO.selectAdjCourtCnctniDeptPop(); + } } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 2c869c17..12432081 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -6,7 +6,6 @@ import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -21,12 +20,10 @@ import kcc.com.cmm.util.DateUtil; import kcc.com.cmm.util.StringUtil; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; -import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; -import kcc.kccadr.adjPgrMgr.ent.service.EntVO; +import kcc.kccadr.adjCourtCnctn.service.AdjCourtDeptVO; +import kcc.kccadr.adjPgrMgr.dtb.service.DtbVO; import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; -import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.adjRppl.service.AdjRpplVO; -import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.cmm.RestResponse; /** @@ -58,7 +55,7 @@ public class AdjCourtCnctnController { } if("".equals(adjCourtCnctnVO.getSearchSortCnd())){ - adjCourtCnctnVO.setSearchSortCnd("COURT_SEQ"); + adjCourtCnctnVO.setSearchSortCnd("CRT_SEQ"); adjCourtCnctnVO.setSearchSortOrd("desc"); } @@ -71,7 +68,7 @@ public class AdjCourtCnctnController { adjCourtCnctnVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); adjCourtCnctnVO.setLastIndex(paginationInfo.getLastRecordIndex()); adjCourtCnctnVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); -// paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO)); + paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO)); model.addAttribute("paginationInfo", paginationInfo); List list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO); // 복호화 @@ -95,14 +92,35 @@ public class AdjCourtCnctnController { public String adjCourtCnctnDetail(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); + + if(StringUtil.isEmpty(adjCourtCnctnVO.getTabSeq())) { + adjCourtCnctnVO.setTabSeq("0"); + } model.addAttribute("courtVO", adjCourtCnctnVO); return "kccadr/adjCourtCnctn/adjCourtCnctnDetail"; } + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.do") + public String adjCourtCnctnDetailTab0(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + + AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); + model.addAttribute("courtVO", adjCourtCnctnVO); + return "kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0"; + } + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.do") + public String adjCourtCnctnDetailTab1(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + + List list = adjCourtCnctnService.selectAdjCourtCnctniFileList(CourtVO); + model.addAttribute("list", list); + return "kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1"; + } + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnModify.do") public String adjCourtCnctnModify(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); + model.addAttribute("courtVO", adjCourtCnctnVO); return "kccadr/adjCourtCnctn/adjCourtCnctnModify"; } @@ -129,10 +147,6 @@ public class AdjCourtCnctnController { return ResponseEntity.ok().body(adjCourtCnctnService.updateCourtCnctn(adjCourtCnctnVO)); } - - - - @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnApprov.do") public String adjCourtCnctnApprov(@ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO, ModelMap model) throws Exception { String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); @@ -171,4 +185,11 @@ public class AdjCourtCnctnController { model.addAttribute("auth", loginVO.getAuthority()); return "kccadr/adjCourtCnctn/adjCourtCnctnApprov"; } + + @RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnDeptPop.do") + public String adjCourtCnctnDeptPop(@ModelAttribute("deptVO") AdjCourtDeptVO deptVO, ModelMap model) throws Exception { + + model.addAttribute("adjCourtDeptVO", adjCourtCnctnService.selectAdjCourtCnctniDeptPop()); // 조정조사관정보 + return "kccadr/adjCourtCnctn/pop/adjCourtCnctnDeptPop"; + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 6918a796..929d3e8f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -2174,7 +2174,6 @@ public class ApmController { , "" ); - System.out.println("adrSn : "+ adrSn); apmVO.setAdrSn(adrSn); diff --git a/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java b/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java new file mode 100644 index 00000000..de22552c --- /dev/null +++ b/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java @@ -0,0 +1,6 @@ +package kcc.kccadr.cmm; + +public class KccadrCourtConstants { + + public static final String CRT_REG = "101000"; // 사건접수 +} \ No newline at end of file diff --git a/src/main/java/kcc/let/uss/umt/service/EgovUserManageService.java b/src/main/java/kcc/let/uss/umt/service/EgovUserManageService.java index 7b6c5b1f..e83fa146 100644 --- a/src/main/java/kcc/let/uss/umt/service/EgovUserManageService.java +++ b/src/main/java/kcc/let/uss/umt/service/EgovUserManageService.java @@ -67,13 +67,16 @@ public interface EgovUserManageService { * @throws Exception */ public int selectUserListTotCnt(UserDefaultVO userSearchVO) throws Exception; + + public int selectUserCourtCnt(UserDefaultVO userSearchVO) throws Exception; /** * 화면에 조회된 사용자의 기본정보를 수정하여 항목의 정합성을 체크하고 수정된 데이터를 데이터베이스에 반영 * @param userManageVO 업무사용자 수정정보 + * @return * @throws Exception */ - public void updateUser(UserManageVO userManageVO) throws Exception; + public Boolean updateUser(UserManageVO userManageVO) throws Exception; /** * 사용자정보 수정시 히스토리 정보를 추가 diff --git a/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index 556f21eb..d2474652 100644 --- a/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -186,6 +186,11 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement public int selectUserListTotCnt(UserDefaultVO userSearchVO) { return userManageDAO.selectUserListTotCnt(userSearchVO); } + + @Override + public int selectUserCourtCnt(UserDefaultVO userSearchVO) { + return userManageDAO.selectUserCourtCnt(userSearchVO); + } /** * 화면에 조회된 사용자의 기본정보를 수정하여 항목의 정합성을 체크하고 수정된 데이터를 데이터베이스에 반영 @@ -193,12 +198,18 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement * @throws Exception */ @Override - public void updateUser(UserManageVO userManageVO) throws Exception { + public Boolean updateUser(UserManageVO userManageVO) throws Exception { //패스워드 암호화 String pass = EgovFileScrty.encryptPassword(userManageVO.getPassword(), userManageVO.getEmplyrId()); userManageVO.setPassword(pass); - + + int chkCourt_link_house_cnt = userManageDAO.selectUserCourtCnt(userManageVO); + + if(chkCourt_link_house_cnt > 0) { + return false; + } userManageDAO.updateUser(userManageVO); + return true; } /** diff --git a/src/main/java/kcc/let/uss/umt/service/impl/UserManageDAO.java b/src/main/java/kcc/let/uss/umt/service/impl/UserManageDAO.java index 7d06393a..092afb9f 100644 --- a/src/main/java/kcc/let/uss/umt/service/impl/UserManageDAO.java +++ b/src/main/java/kcc/let/uss/umt/service/impl/UserManageDAO.java @@ -82,6 +82,10 @@ public class UserManageDAO extends EgovAbstractDAO{ public int selectUserListTotCnt(UserDefaultVO userSearchVO) { return (Integer)select("userManageDAO.selectUserListTotCnt_S", userSearchVO); } + + public int selectUserCourtCnt(UserDefaultVO userSearchVO) { + return (Integer)select("userManageDAO.selectUser_Court", userSearchVO); + } /** * 화면에 조회된 사용자의 기본정보를 수정하여 항목의 정합성을 체크하고 수정된 데이터를 데이터베이스에 반영 diff --git a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java index e82c4ac7..4deb6fc8 100644 --- a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java @@ -856,7 +856,13 @@ public class EgovUserManageController { } userManageService.insertUserHistory(userManageVO); - userManageService.updateUser(userManageVO); + Boolean tOrF = userManageService.updateUser(userManageVO); + if(!tOrF) { + model.addAttribute("message", "이미 총괄 위원이 존재하는 연계법원입니다."); + redirectAttributes.addFlashAttribute("message", "이미 총괄 위원이 존재하는 연계법원입니다."); + return "redirect:/uss/umt/user/EgovUserManage.do"; + } + //권한업데이트 egovAuthorGroupService.updateAuthorGroup(authorGroup); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml index 80b0f5c5..35356a0b 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml @@ -4,6 +4,8 @@ + + + + + + + INSERT INTO adr_court_mgr @@ -242,6 +367,86 @@ #frstRegisterId# ) + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserManage.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserManage.jsp index 6fb4fcbc..3780c5e0 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserManage.jsp @@ -26,6 +26,12 @@ 사용자 목록 @@ -497,13 +495,16 @@ function authorChange(obj) { - + + - - <%-- - --%> + + + + 연계법원 + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetail.jsp index d3156bfb..fb8442c4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetail.jsp @@ -1,250 +1,105 @@ <%@ page contentType="text/html; charset=utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ 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="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> -<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> - + - -법원연계조정관리 - 상세 +조정진행 상세 + + - - - - -
- - - " /> - " /> - " /> -
-
- " /> -
- -
-
- -
-

법원연계조정상세

-
    -
    • -
  • -

    법원연계조정관리

    -
    • -
  • -

    법원연계조정목록

    -
    • -
  • 법원연계조정상세
    • -
-
- - - -
-
- -
-

조정 사건

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
번호 - -
결정일자 - - 수령일자 - -
배당일자 - - 배당월 - -
사무처리기한 - -
보고일자 - - 보고월 - -
소요일 - -
본 사건번호 - - 조정 사건번호 - -
분야 - -
신청인 정보 - -
피신청인 정보 - -
원고/
신청인(대리인)		 - -
피고/
피신청인(대리인)		 - -
사건내용 - -
결과 - -
세부결과 - -
조정위원 - - 수당금액 - -
대면기일 - -
지급일자 - - 1차연장 - -
비고 - -
-
- -
-
-
- - -
-
-
-
-
-
+ + " /> + " /> + +
+
+ +
+

법원연계조정 상세

+
    +
  • + +
    • +
  • + <>법원연계조정 관리

    +
    • +
  • +

    법원연계조정 목록

    +
    • +
  • + 법원연계조정 상세 +
    • +
+
+ +
+
+ + +<%-- --%> +
+
+
+
+
- diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp new file mode 100644 index 00000000..71d71a15 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp @@ -0,0 +1,231 @@ +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + +법원연계조정관리 - 상세 + + + + + + + +
+ + + " /> + " /> + " /> +
+
+ " /> +
+
+ " /> +
+ + +
+ + + +
+

조정 사건

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
결정일자 + + 수령일자 + +
배당일자 + + 사무처리기한 + +
보고일자 + +
본 사건번호 + + [] + 조정 사건번호 + + +
총괄조정위원 + + 조정위원 + + +
원고 이름 + + 원고 (대리인) 이름 + +
원고 연락처 + + 원고 (대리인) 연락처 + +
원고 정보 + +
피고 이름 + + 피고 (대리인) 이름 + +
피고 연락처 + + 피고 (대리인) 연락처 + +
피고 정보 + +
분야 + +
사건내용 + +
+
+ +
+
+
+ + + + + + +
+
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp new file mode 100644 index 00000000..be1c55c6 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp @@ -0,0 +1,136 @@ +<%@ 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"%> + + + +조정진행 상세 + + + + + + + +
+ " /> + " /> +
+ + + +
+ + +

신청 정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
일자일자문서 구분문서 명
+

+ +

+ 		+

${fn:substring(list.frstRegistPnttm, 0, 10)}

+ 		+ + + +
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp index fd211e6b..e229af4b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -15,28 +15,6 @@ + + +
+ + + +
+

조정위원 선택

+ + + + + + + + + + + + + + +
조사관
+
    +
  • + + + +
    • +
+
+
+ +
+
+ +
+ + From 3a0e0c76c8ad7ee46807bb07bd8ae8c4fba16b04 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 15 Jan 2024 19:46:13 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EB=B2=95=EC=9B=90=EC=97=B0=EA=B3=84=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=9C=84=EC=9B=90=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjCourtCnctnService.java | 4 +- .../service/AdjCourtCnctnVO.java | 8 + .../service/impl/AdjCourtCnctnDAO.java | 9 +- .../impl/AdjCourtCnctnServiceImpl.java | 13 +- .../web/AdjCourtCnctnController.java | 17 +++ .../adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml | 34 ++++- .../pop/adjCourtCnctnDeptPop.jsp | 138 +++++++++++------- 7 files changed, 163 insertions(+), 60 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java index bfbb3cfb..6371cfa3 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java @@ -24,5 +24,7 @@ public interface AdjCourtCnctnService { public void insertCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception; - public AdjCourtDeptVO selectAdjCourtCnctniDeptPop() throws Exception; + public List selectAdjCourtCnctniDeptPop() throws Exception; + + RestResponse insertAdjCourtCnctnDeptPopAjax(AdjCourtDeptVO deptVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java index 47e137d4..c3fde923 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -63,6 +63,8 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private String crtDeptKng; private String crtDeptOrdi; + private String esntlId; + public String getCrtSeq() { return crtSeq; @@ -304,6 +306,12 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { public void setCrtDeptOrdi(String crtDeptOrdi) { this.crtDeptOrdi = crtDeptOrdi; } + public String getEsntlId() { + return esntlId; + } + public void setEsntlId(String esntlId) { + this.esntlId = esntlId; + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java index 02de1118..d7444023 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java @@ -49,7 +49,12 @@ public class AdjCourtCnctnDAO extends EgovAbstractDAO { return (List) list("adjCourtCnctnDAO.selectAdjCourtCnctniFileList", adjCourtCnctnVO); } - public AdjCourtDeptVO selectAdjCourtCnctniDeptPop() { - return (AdjCourtDeptVO) select("adjCourtCnctnDAO.selectAdjCourtCnctniDeptPop"); + public List selectAdjCourtCnctniDeptPop() { + return (List) list("adjCourtCnctnDAO.selectAdjCourtCnctniDeptPop"); + } + + public void saveFromAdrCourtDeptMgr(AdjCourtDeptVO deptVO) { + update("adjCourtCnctnDAO.saveFromAdrCourtDeptMgr", deptVO); + } } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java index e0142744..8b6208a6 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -137,7 +137,18 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements } @Override - public AdjCourtDeptVO selectAdjCourtCnctniDeptPop() { + public List selectAdjCourtCnctniDeptPop() { return adjCourtCnctnDAO.selectAdjCourtCnctniDeptPop(); } + + @Override + public RestResponse insertAdjCourtCnctnDeptPopAjax(AdjCourtDeptVO deptVO) throws Exception { + try { + adjCourtCnctnDAO.saveFromAdrCourtDeptMgr(deptVO); + } catch (Exception e) + { e.printStackTrace(); + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()); + } } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 12432081..19f9e6a9 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -192,4 +192,21 @@ public class AdjCourtCnctnController { model.addAttribute("adjCourtDeptVO", adjCourtCnctnService.selectAdjCourtCnctniDeptPop()); // 조정조사관정보 return "kccadr/adjCourtCnctn/pop/adjCourtCnctnDeptPop"; } + + + @RequestMapping(value = "/kccadr/adjCourtCnctn/insertAdjCourtCnctnDeptPopAjax.do") + public ResponseEntity insertAdjCourtCnctnDeptPopAjax(@ModelAttribute("deptVO") AdjCourtDeptVO deptVO) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + deptVO.setLastUpdusrId(loginVO.getUniqId()); + deptVO.setFrstRegisterId(loginVO.getUniqId()); + + return ResponseEntity.ok().body(adjCourtCnctnService.insertAdjCourtCnctnDeptPopAjax(deptVO)); + } + + + + + } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml index 35356a0b..e62b9c03 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml @@ -489,6 +489,38 @@ COURT_SEQ = #courtSeq# --> + + + /* adjCourtCnctnDAO.saveFromAdrCourtDeptMgr */ + + MERGE INTO ADR_COURT_DEPT_MGR T1 USING DB_ROOT + ON ( + T1.CRT_SEQ = #crtSeq# + AND T1.ESNTL_ID = #esntlId# + ) + WHEN MATCHED THEN + UPDATE SET + CRT_SEQ = #crtSeq# + , ESNTL_ID = #esntlId# + , CRT_DEPT_TY = #pstinstCode# + , LAST_UPDT_PNTTM = NOW() + , LAST_UPDUSR_ID = #lastUpdusrId# + WHEN NOT MATCHED THEN + INSERT ( + CRT_SEQ + , ESNTL_ID + , CRT_DEPT_TY + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + ) VALUES ( + #crtSeq# + , #esntlId# + , #pstinstCode# + , NOW() + , #frstRegisterId# + ) + + INSERT @@ -540,7 +572,7 @@ - -
-

조정위원 선택

- - - - - - - - - - - - - - -
조사관
-
    -
  • - - - -
    • -
-
-
- -
-
- -
+
+ + + +
+
+ + +
+

조정위원 선택

+ + + + + + + + + + + + + + + + + + + +
조사관
${list.userNm } + +
+
+ +
+
+ +
From 6b6a1d8ad6d6acdb7ba51ab62ff6eb3c14e57811 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 15 Jan 2024 19:57:08 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 법원연계 결재 커밋 --- .../service/AdjCourtaprvlVO.java | 22 ++++ .../web/AdjCourtAprvlController.java | 112 ++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtaprvlVO.java create mode 100644 src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtaprvlVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtaprvlVO.java new file mode 100644 index 00000000..932ae1a8 --- /dev/null +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtaprvlVO.java @@ -0,0 +1,22 @@ +package kcc.kccadr.adjCourtCnctn.service; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import kcc.com.cmm.ComDefaultVO; +import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; + +public class AdjCourtaprvlVO extends ComDefaultVO implements Serializable { + + private static final long serialVersionUID = -1111076331699607617L; + + private String crtSeq; //법원연계 seq + private String crtSn; //법원연계 기일수 + + private String frstRegistPnttm; + private String frstRegisterId; + private String lastUpdtPnttm; + private String lastUpdusrId; + +} diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java new file mode 100644 index 00000000..d408b135 --- /dev/null +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java @@ -0,0 +1,112 @@ +package kcc.kccadr.adjCourtCnctn.web; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.multipart.MultipartHttpServletRequest; + +import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.LoginVO; +import kcc.com.cmm.util.DateUtil; +import kcc.com.cmm.util.StringUtil; +import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; +import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; +import kcc.kccadr.adjCourtCnctn.service.AdjCourtDeptVO; +import kcc.kccadr.adjPgrMgr.dtb.service.DtbVO; +import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; +import kcc.kccadr.adjRppl.service.AdjRpplVO; +import kcc.kccadr.cmm.CmmUtil; +import kcc.kccadr.cmm.KccadrConstants; +import kcc.kccadr.cmm.RestResponse; +import kcc.let.uss.umt.service.UserManageVO; + +@Controller +public class AdjCourtAprvlController { + + // 조정신청 서비스단 + @Resource(name = "AdjCourtCnctnService") + private AdjCourtCnctnService adjCourtCnctnService; + + @RequestMapping(value = "/kccadr/adjCourtAprvl/AprvlList.do") + public String AprvlList( + @ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO + , ModelMap model + , HttpServletRequest request) throws Exception { + + String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + + if (loginVO == null) { + + model.addAttribute("msg", "로그인 해주세요."); + return "redirect:/web/user/login/ssoLogin.do"; + } + + internalApprovManageVO.setFrstRegisterId(loginVO.getUniqId()); + internalApprovManageVO.setMemSeq(loginVO.getUniqId()); + internalApprovManageVO.setSearchSbmtId(loginVO.getUniqId()); + + if(internalApprovManageVO.getPageUnit() != 10) { + internalApprovManageVO.setPageUnit(internalApprovManageVO.getPageUnit()); + } + + if("".equals(internalApprovManageVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + internalApprovManageVO.setSearchSortCnd("RS.adrNo"); + internalApprovManageVO.setSearchSortOrd("desc"); + } + + //내부결재 목록 페이지 접근시 결재상태 - 결재대기(01), 결재진행중(02) 상태가 기본값으로 해달라는 요청_220225_이준호수정 + //내부결재 목록 페이지 접근시 결재상태 - 결재대기(01) 상태가 기본값으로 해달라는 요청_221201_조용준수정 + if("".equals(internalApprovManageVO.getSearchStatusArr()) || internalApprovManageVO.getSearchStatusArr() == null){ + //String[] defaultSearchStatusArr = {"01", "02"}; + String[] defaultSearchStatusArr = {"01"}; + internalApprovManageVO.setSearchStatusArr(defaultSearchStatusArr); + } + + if(StringUtils.isEmpty(internalApprovManageVO.getSearchStartDt()) && StringUtils.isEmpty(internalApprovManageVO.getSearchEndDt())){ + internalApprovManageVO.setSearchStartDt(CmmUtil.getDiffMonth(1 , "yyyy-MM-dd")); + internalApprovManageVO.setSearchEndDt(CmmUtil.getDateNow("yyyy-MM-dd")); + } + + /** paging */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(internalApprovManageVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(internalApprovManageVO.getPageUnit()); + paginationInfo.setPageSize(internalApprovManageVO.getPageSize()); + + //위원장 아이디는 위원장이 결재 시점에서만 조회되게 + // 리스트 조건절 결재선 1,2 라인이 결재 완료이고 위원장 아이디 일때만 조회 + UserManageVO userManageVO = new UserManageVO(); +// userManageVO = userManageService.selectUser(loginVO.getUniqId()); + + if(KccadrConstants.ADR_SBMT_TY_40.equals(userManageVO.getOfcpsNm())) { + internalApprovManageVO.setUiWonJangId(loginVO.getUniqId()); + } + + //22.02.08 이준호 내부결재목록 최고관리자의 경우 모든 결재가 보이게 처리 요청사항 적용 + if("ROLE_ADMIN".equals(loginVO.getAuthority())) { + internalApprovManageVO.setAuthor(loginVO.getAuthority()); + } + + internalApprovManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + internalApprovManageVO.setLastIndex(paginationInfo.getLastRecordIndex()); + internalApprovManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); +// paginationInfo.setTotalRecordCount(internalApprovManageService.selectInternalApprovManageCount(internalApprovManageVO)); + model.addAttribute("paginationInfo", paginationInfo); + + +// model.addAttribute("list", internalApprovManageService.selectInternalApprovManageList(internalApprovManageVO)); + return "kccadr/adjPgrMgr/iam/internalApprovManageList"; + } + +}