From a8ea24f3a7501b135a84f1f9a98672218159b713 Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 28 Sep 2022 18:27:17 +0900 Subject: [PATCH] =?UTF-8?q?2022-09-28=2018:26=20=EC=9B=8C=ED=81=AC?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=20-=20=EA=B8=B0=EC=9D=BC=EC=A1=B0?= =?UTF-8?q?=EC=84=9C=20=EC=9E=91=EC=84=B1=20=EC=A0=84=EA=B9=8C=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/chd/service/ChdService.java | 18 ++- .../kccadr/adjPgrMgr/chd/service/ChdVO.java | 32 ++++ .../chd/service/impl/ChdServiceImpl.java | 144 ++++++++++++++++-- .../adjPgrMgr/chd/web/ChdController.java | 24 ++- .../dnt/service/impl/DntServiceImpl.java | 7 +- .../web/AdjstConciliatorController.java | 4 + .../kccadr/adjPgrMgr/chd/Chd_SQL_Mysql.xml | 5 +- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 5 +- .../ars/tab/adjstReqStatusTabDetail.jsp | 5 +- .../jsp/web/kccadr/kccadrCom/workFlowJS.jsp | 26 +--- .../jsp/web/kccadr/kccadrCom/workFlowJsp.jsp | 4 +- 11 files changed, 225 insertions(+), 49 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/ChdService.java b/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/ChdService.java index a5d4e613..65291307 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/ChdService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/ChdService.java @@ -10,13 +10,25 @@ public interface ChdService { ChdVO selectDateNotice(ChdVO chdVO) throws Exception; - int udateDateNotice(ChdVO chdVO) throws Exception; + int udateDateNotice(ChdVO chdVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception; - int insertDateNotice(ChdVO chdVO) throws Exception; + int insertDateNotice(ChdVO chdVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception; int deleteDateNotice(ChdVO chdVO); - void updateDistribution(ChdVO chdVO) throws Exception; + void updateDistribution(ChdVO chdVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception; void udateDateConfirm(ChdVO chdVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/ChdVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/ChdVO.java index 7053c9d8..c65d8f76 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/ChdVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/ChdVO.java @@ -2,6 +2,7 @@ package kcc.kccadr.adjPgrMgr.chd.service; import java.io.Serializable; + import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; @SuppressWarnings("serial") @@ -18,6 +19,13 @@ public class ChdVO extends PgrCmmVO implements Serializable { private String addChgYn; + private String appSeq; + + private String assHstrySeq; + + private String apprYn; + + public String getAppDe() { return appDe; } @@ -66,6 +74,30 @@ public class ChdVO extends PgrCmmVO implements Serializable { this.addChgYn = addChgYn; } + public String getAppSeq() { + return appSeq; + } + + public void setAppSeq(String appSeq) { + this.appSeq = appSeq; + } + + public String getAssHstrySeq() { + return assHstrySeq; + } + + public void setAssHstrySeq(String assHstrySeq) { + this.assHstrySeq = assHstrySeq; + } + + public String getApprYn() { + return apprYn; + } + + public void setApprYn(String apprYn) { + this.apprYn = apprYn; + } + diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/impl/ChdServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/impl/ChdServiceImpl.java index e9dfac39..340da9af 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/impl/ChdServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/chd/service/impl/ChdServiceImpl.java @@ -6,12 +6,12 @@ import javax.annotation.Resource; import org.springframework.stereotype.Repository; -import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.com.cmm.util.StringUtil; import kcc.kccadr.adjPgrMgr.chd.service.ChdService; import kcc.kccadr.adjPgrMgr.chd.service.ChdVO; -import kcc.kccadr.adjPgrMgr.dtb.service.DtbVO; -import kcc.kccadr.adjPgrMgr.dtb.service.impl.DtbDAO; +import kcc.kccadr.adjPgrMgr.dnt.service.DntVO; +import kcc.kccadr.adjPgrMgr.dnt.service.impl.DntDAO; +import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; import kcc.let.utl.fcc.service.EgovCryptoUtil; @Repository("chdService") @@ -24,9 +24,15 @@ public class ChdServiceImpl implements ChdService { @Resource(name = "ChdDAO") ChdDAO chdDAO; + @Resource(name = "DntDAO") + DntDAO dntDAO; + @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; + // 조정사건이력관리 DAO + @Resource(name = "adrHstryMgrDAO") + private AdrHstryMgrDAO adrHstryMgrDAO; @Override public List selectDateNoticeList(ChdVO chdVO) throws Exception { @@ -76,10 +82,33 @@ public class ChdServiceImpl implements ChdService { @Override - public int udateDateNotice(ChdVO chdVO) throws Exception { + public int udateDateNotice(ChdVO chdVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception { setDayNoticeInfo(chdVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(chdVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , chdVO.getFrstRegisterId() + , chdVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_APP_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + return chdDAO.udateDateNotice(chdVO); } @@ -102,10 +131,46 @@ public class ChdServiceImpl implements ChdService { @Override - public int insertDateNotice(ChdVO chdVO) throws Exception { + public int insertDateNotice(ChdVO chdVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception { setDayNoticeInfo(chdVO); + + //app_seq 값 가져오기 + DntVO dntVO = new DntVO(); + dntVO.setAdrSeq(chdVO.getAdrSeq()); + dntVO.setAdrSn(chdVO.getAdrSn()); + + DntVO dntVOtmp = dntDAO.selectAppSeq(dntVO); + chdVO.setAppSeq(dntVOtmp.getAppSeq()); + chdDAO.insertDateNotice(chdVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(chdVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , chdVO.getFrstRegisterId() + , chdVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_APP_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+chdVO.getAdrSeq() + +"' AND adr_sn='"+chdVO.getAdrSn() + +"' AND app_seq='"+chdVO.getAppSeq() + +"' " //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + return 1; } @@ -119,7 +184,11 @@ public class ChdServiceImpl implements ChdService { @Override - public void updateDistribution(ChdVO chdVO) throws Exception { + public void updateDistribution(ChdVO chdVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception { if (!StringUtil.isEmpty(chdVO.getAddUsrId0())) { @@ -129,7 +198,26 @@ public class ChdServiceImpl implements ChdService { chdVO.setAddChgYn(chdVO.getAddChgYn0()); chdVO.setAssSeq(chdVO.getAssSeq0()); - chdDAO.updateDistribution(chdVO); + chdDAO.updateDistribution(chdVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(chdVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , chdVO.getFrstRegisterId() + , chdVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "UI" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 } @@ -140,7 +228,26 @@ public class ChdServiceImpl implements ChdService { chdVO.setAddChgYn(chdVO.getAddChgYn1()); chdVO.setAssSeq(chdVO.getAssSeq1()); - chdDAO.updateDistribution(chdVO); + chdDAO.updateDistribution(chdVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(chdVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , chdVO.getFrstRegisterId() + , chdVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "UI" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 } if (!StringUtil.isEmpty(chdVO.getAddUsrId2())) { @@ -150,7 +257,26 @@ public class ChdServiceImpl implements ChdService { chdVO.setAddChgYn(chdVO.getAddChgYn2()); chdVO.setAssSeq(chdVO.getAssSeq2()); - chdDAO.updateDistribution(chdVO); + chdDAO.updateDistribution(chdVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(chdVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , chdVO.getFrstRegisterId() + , chdVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "UI" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java index 23a57261..c324da5c 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java @@ -187,11 +187,19 @@ public class ChdController { } */ - chdService.udateDateNotice(chdVO); + chdService.udateDateNotice(chdVO + , "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일변경-수정(장소/시간)" //String p_code_desc - CC199 + , "A128" //String p_stat_cd + , "" + ); //대석 등록 - chdService.updateDistribution(chdVO); + chdService.updateDistribution(chdVO + , "조정진행관리>>조정진행목록>조정진행상세>기일등록>대석등록-수정" //String p_code_desc - CC199 + , "A130" //String p_stat_cd 대석등록-수정 + , "" + ); /* AdjReqMgrVO arv = new AdjReqMgrVO(); arv.setAdrSeq(chdVO.getAdrSeq()); // 조정일련번호 @@ -296,10 +304,18 @@ public class ChdController { } */ - chdService.insertDateNotice(chdVO); + chdService.insertDateNotice(chdVO + , "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일변경" //String p_code_desc - CC199 + , "A127" //String p_stat_cd + , "" + ); //대석 등록 - chdService.updateDistribution(chdVO); + chdService.updateDistribution(chdVO + , "조정진행관리>>조정진행목록>조정진행상세>기일등록>대석등록-수정" //String p_code_desc - CC199 + , "A130" //String p_stat_cd 대석등록-수정 + , "" + ); /* AdjReqMgrVO arv = new AdjReqMgrVO(); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntServiceImpl.java index 265ec824..8dea2f6f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntServiceImpl.java @@ -459,10 +459,10 @@ public class DntServiceImpl implements DntService { DntVO dntVOTmp = dntDAO.selectAdrAppMgr(dntVO); - + dntVO.setAppSeq(dntVOTmp.getAppSeq()); dntDAO.dntUpdApprYnY(dntVO); - String s_updateQuery = ""; + //String s_updateQuery = ""; /* dntVOTmp.getApprYn()!=null @@ -495,9 +495,10 @@ public class DntServiceImpl implements DntService { , String p_stat_cd , String p_adrHstryMgrSeq ) throws Exception{ + DntVO dntVOTmp = dntDAO.selectAdrAppMgr(dntVO); - + dntVO.setAppSeq(dntVOTmp.getAppSeq()); dntDAO.dntUpdApprYnN(dntVO); diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index 89be8fa5..2428c8ba 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -710,6 +710,10 @@ public class AdjstConciliatorController { modelAndView.addObject("result", KccadrConstants.SUCCESS); modelAndView.addObject("adrHstryMgrSeq", s_adrHstryMgrSeq); + System.out.println("s_adrHstryMgrSeq=================="); + System.out.println(s_adrHstryMgrSeq); + System.out.println("s_adrHstryMgrSeq==================="); + }else{ modelAndView.addObject("rs", (rs>0)); modelAndView.addObject("result", KccadrConstants.FAIL); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/chd/Chd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/chd/Chd_SQL_Mysql.xml index d95c9cab..d99a9d5c 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/chd/Chd_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/chd/Chd_SQL_Mysql.xml @@ -70,7 +70,10 @@ ) VALUES ( #adrSeq# , #adrSn# - , NVL((SELECT COUNT(1) FROM ADR_APP_MGR WHERE ADR_SEQ=#adrSeq# AND ADR_SN=#adrSn# ),0)+1 + , #appSeq# + /* + , NVL((SELECT COUNT(1) FROM ADR_APP_MGR WHERE ADR_SEQ=adrSeq AND ADR_SN=adrSn ),0)+1 + */ , #adrAdmId# , #appDeDay#||#appDeTime#||'00' , #appPlace# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index 17bf8707..d7f1b102 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -311,7 +311,10 @@ $(document).ready(function(){ - + - + - - - - - - - - - - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp index eeb78565..33c4c1b0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp @@ -43,8 +43,8 @@

  • 4차 기일 개최

    • -

  • 기일변경

    • -

  • 변론서 및 답변서

    • +

  • 기일변경

    • +

  • 변론서 및 답변서

  • 취하신청

    다음

    취하종결