diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java
index 631b4a06..f02d1608 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java
@@ -3,6 +3,7 @@ package kcc.kccadr.adjPgrMgr.dnt.service;
import java.util.List;
import kcc.kccadr.adjPgrMgr.drt.service.DrtVO;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
public interface DntService {
@@ -34,10 +35,20 @@ public interface DntService {
DntVO selectDateNoticeDate(DntVO dntVO) throws Exception;
- void insertAddDateNotice(DntVO dntVO) throws Exception;
+ DntVO selectAdrMgrDetailSn(AdjReqMgrVO adjReqMgrVO) throws Exception;
+
+ void insertAddDateNotice(DntVO dntVO
+ , String p_code_desc
+ , String p_stat_cd
+ , String p_adrHstryMgrSeq
+ ) throws Exception;
//기일추가시 사건 정보 테이블에서 차수 변경해주기
- void updateAdrMgrDetailSn(DntVO dntVO) throws Exception;
+ void updateAdrMgrDetailSn(DntVO dntVO
+ , String p_code_desc
+ , String p_stat_cd
+ , String p_adrHstryMgrSeq
+ ) throws Exception;
//기일통지서 승인요청시 기일관리 테이블에 제출 일자 수정해주기
void dntUpdSbmtYn(DntVO dntVO
diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntDAO.java
index e0e3560f..d1c90b3a 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntDAO.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntDAO.java
@@ -7,6 +7,7 @@ import org.springframework.stereotype.Repository;
import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
import kcc.kccadr.adjPgrMgr.dnt.service.DntVO;
import kcc.kccadr.adjPgrMgr.drt.service.DrtVO;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
@Repository("DntDAO")
public class DntDAO extends EgovAbstractDAO {
@@ -55,6 +56,10 @@ public class DntDAO extends EgovAbstractDAO {
return (DntVO) select("Dnt.selectDateNoticeDate", dntVO);
}
+ public DntVO selectAdrMgrDetailSn(AdjReqMgrVO adjReqMgrVO) throws Exception {
+ return (DntVO) select("Dnt.selectAdrMgrDetailSn", adjReqMgrVO);
+ }
+
public void updateAdrMgrDetailSn(DntVO dntVO) throws Exception{
update("Dnt.updateAdrMgrDetailSn", dntVO);
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 3999232e..376a337b 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
@@ -10,6 +10,7 @@ import kcc.com.cmm.util.StringUtil;
import kcc.kccadr.adjPgrMgr.dnt.service.DntService;
import kcc.kccadr.adjPgrMgr.dnt.service.DntVO;
import kcc.kccadr.adjPgrMgr.drt.service.DrtVO;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
import kcc.let.utl.fcc.service.EgovCryptoUtil;
@@ -170,7 +171,11 @@ public class DntServiceImpl implements DntService {
return 1;
}
- public void insertAddDateNotice(DntVO dntVO) throws Exception{
+ public void insertAddDateNotice(DntVO dntVO
+ , String p_code_desc
+ , String p_stat_cd
+ , String p_adrHstryMgrSeq
+ ) throws Exception{
setDayNoticeInfo(dntVO); //기일 장소 및 주소 셋팅해주기
@@ -180,6 +185,28 @@ public class DntServiceImpl implements DntService {
dntDAO.insertDateNotice(dntVO); //기일 정보 추가해 주기
+
+ //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09
+ //adr_hstry_mgr에 값 넣기 - 시작
+ adrHstryMgrDAO.insert4Func(dntVO.getAdrSeq()
+ //, "상태코드수정"
+ , p_code_desc
+ //, adjReqMgrVO.getStatCd()
+ , p_stat_cd
+
+ , dntVO.getFrstRegisterId()
+ , dntVO.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='"+dntVO.getAdrSeq()
+ +"' AND adr_sn='"+dntVO.getAdrSn()
+ +"' AND app_seq='"+dntVO.getAppSeq()
+ +"' " //, String p_updateQuery
+
+ );
+ //adr_hstry_mgr에 값 넣기 - 끝
}
@@ -408,9 +435,57 @@ public class DntServiceImpl implements DntService {
return dntDAO.selectDateNoticeDate(dntVO);
}
- public void updateAdrMgrDetailSn(DntVO dntVO) throws Exception{
+ @Override
+ public DntVO selectAdrMgrDetailSn(AdjReqMgrVO adjReqMgrVO) throws Exception {
+ return dntDAO.selectAdrMgrDetailSn(adjReqMgrVO);
+ }
+
+ public void updateAdrMgrDetailSn(DntVO dntVO
+ , String p_code_desc
+ , String p_stat_cd
+ , String p_adrHstryMgrSeq
+ ) throws Exception{
+ //step1.현재의 adr_sn, upuserid, upregdt를 가져온다.
+
+ /*
+ * UPDATE adr_mgr_detail
+ SET ADR_SN = #adrSn# ,
+ LAST_UPDUSR_ID = #lastUpdusrId# ,
+ LAST_UPDT_PNTTM = SYS_DATETIME
+ WHERE ADR_SEQ = #adrSeq#
+ * */
+ AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO();
+ adjReqMgrVO.setAdrSeq(dntVO.getAdrSeq());
+ DntVO dntVOT = dntDAO.selectAdrMgrDetailSn(adjReqMgrVO);
+
+
+ //step2.차수 변경
dntDAO.updateAdrMgrDetailSn(dntVO);
+
+
+ //step3.이력 정보 남기기
+ //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09
+ //adr_hstry_mgr에 값 넣기 - 시작
+ adrHstryMgrDAO.insert4Func(dntVO.getAdrSeq()
+ //, "상태코드수정"
+ , p_code_desc
+ //, adjReqMgrVO.getStatCd()
+ , p_stat_cd
+
+ , dntVO.getFrstRegisterId()
+ , dntVO.getLastUpdusrId()
+
+ , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
+ //, "UI" //, String p_useCd I/U/UI/II/RE
+ , "U" //, String p_useCd I/U/UI/II/RE
+ , "ADR_MGR_DETAIL" //, String p_tableName
+ , " SET ADR_SN = '"+dntVOT.getAdrSn()+"' "
+ + "WHERE ADR_SEQ='"+dntVOT.getAdrSeq()+"' " //, String p_updateQuery
+
+ );
+ //adr_hstry_mgr에 값 넣기 - 끝
+
}
public void dntUpdSbmtYn(DntVO dntVO
diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java
index f32b9dfb..d97db011 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java
@@ -444,10 +444,18 @@ public class DntController {
//기일 정보 추가해주기
- dntService.insertAddDateNotice(dntVO);
+ dntService.insertAddDateNotice(dntVO
+ , "조정진행관리>>조정진행목록>조정진행상세>기일등록>다음기일지정" //String p_code_desc - CC199
+ , "A121" //String p_stat_cd
+ , s_adrHstryMgrSeq
+ );
//사건 정보 차수 변경해 주기
- dntService.updateAdrMgrDetailSn(dntVO);
+ dntService.updateAdrMgrDetailSn(dntVO
+ , "조정진행관리>>조정진행목록>조정진행상세>기일등록>다음기일지정-차수수정" //String p_code_desc - CC199
+ , "A123" //String p_stat_cd
+ , s_adrHstryMgrSeq
+ );
//대석 등록
dntService.updateDistribution(dntVO
@@ -456,6 +464,7 @@ public class DntController {
, s_adrHstryMgrSeq
);
+
//사건 상태정보 업데이트 해주기
AdjReqMgrVO arv = new AdjReqMgrVO();
diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dnt/Dnt_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dnt/Dnt_SQL_Mysql.xml
index 0377371d..6297e080 100644
--- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dnt/Dnt_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dnt/Dnt_SQL_Mysql.xml
@@ -182,7 +182,20 @@
ORDER BY M.APP_SEQ DESC
LIMIT 1
-
+
+
+
UPDATE adr_mgr_detail
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 13247fb5..de4f6b39 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
@@ -504,6 +504,14 @@ $(document).ready(function(){
${list.menuId}
+
+
+
+
+
@@ -993,16 +1001,23 @@ $(document).ready(function(){
+
-
+
-
-
+
+
+
+
+
@@ -1459,8 +1474,10 @@ $(document).ready(function(){
-
-
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntAddReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntAddReg.jsp
index b693f306..c8db378c 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntAddReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntAddReg.jsp
@@ -195,6 +195,18 @@
" />
" />
+
" />
" />
@@ -320,9 +332,18 @@
| 조정부장 |
+
+
+<%-- --%>
+
+
+
+
+ |
| 조정위원1 |
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp
index 54dbeb74..9c4300cd 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp
@@ -29,6 +29,14 @@
${list.menuId}
+
+
+
+
+