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 7eaf86d4..631b4a06 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java
@@ -40,17 +40,38 @@ public interface DntService {
void updateAdrMgrDetailSn(DntVO dntVO) throws Exception;
//기일통지서 승인요청시 기일관리 테이블에 제출 일자 수정해주기
- void dntUpdSbmtYn(DntVO dntVO) throws Exception;
+ void dntUpdSbmtYn(DntVO dntVO
+ , String p_code_desc
+ , String p_stat_cd
+ , String p_adrHstryMgrSeq
+ ) throws Exception;
//기일통지서 승인요청시 기일관리 테이블에 위원의 승인 일자 수정해주기
- void dntUpdApprYnY(DntVO dntVO) throws Exception;
+ void dntUpdApprYnY(DntVO dntVO
+ , String p_code_desc
+ , String p_stat_cd
+ , String p_adrHstryMgrSeq
+ ) throws Exception;
//기일통지서 승인요청시 기일관리 테이블에 위원의 반려 일자 수정해주기
- void dntUpdApprYnN(DntVO dntVO) throws Exception;
+ void dntUpdApprYnN(DntVO dntVO
+ , String p_code_desc
+ , String p_stat_cd
+ , String p_adrHstryMgrSeq
+ ) throws Exception;
void updateDistribution2(DrtVO drtVO
, String p_code_desc
, String p_stat_cd
) throws Exception;
+
+ DntVO selectAppSeq(DntVO dntVO) throws Exception;
+
+ DntVO selectAssHstrySeq(DntVO dntVO) throws Exception;
+
+ DntVO selectAdrAssMgr(DntVO dntVO) throws Exception;
+
+ DntVO selectAdrAppMgr(DntVO dntVO) throws Exception;
+
}
diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntVO.java
index 67caa50f..913bffcd 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntVO.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntVO.java
@@ -2,6 +2,7 @@ package kcc.kccadr.adjPgrMgr.dnt.service;
import java.io.Serializable;
+
import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
@SuppressWarnings("serial")
@@ -18,6 +19,13 @@ public class DntVO 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 DntVO 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/dnt/service/impl/DntDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntDAO.java
index 68012da7..e0e3560f 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
@@ -46,6 +46,7 @@ public class DntDAO extends EgovAbstractDAO {
update("Dnt.updateDistribution", dntVO);
}
+ //대석정보 변경
public void updateDistribution2(DrtVO drtVO) {
update("Dnt.updateDistribution2", drtVO);
}
@@ -73,4 +74,21 @@ public class DntDAO extends EgovAbstractDAO {
update("Dnt.dntUpdApprYnN", dntVO);
}
+
+ public DntVO selectAppSeq(DntVO dntVO) throws Exception {
+ return (DntVO) select("Dnt.selectAppSeq", dntVO);
+ }
+
+ public DntVO selectAssHstrySeq(DntVO dntVO) throws Exception {
+ return (DntVO) select("Dnt.selectAssHstrySeq", dntVO);
+ }
+
+ public DntVO selectAdrAssMgr(DntVO dntVO) throws Exception {
+ return (DntVO) select("Dnt.selectAdrAssMgr", dntVO);
+ }
+
+ public DntVO selectAdrAppMgr(DntVO dntVO) throws Exception {
+ return (DntVO) select("Dnt.selectAdrAppMgr", 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 4d928fb3..265ec824 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
@@ -136,6 +136,11 @@ public class DntServiceImpl implements DntService {
) throws Exception {
setDayNoticeInfo(dntVO);
+
+ //app_seq 값 가져오기
+ DntVO dntVOtmp = dntDAO.selectAppSeq(dntVO);
+ dntVO.setAppSeq(dntVOtmp.getAppSeq());
+
dntDAO.insertDateNotice(dntVO);
@@ -168,6 +173,11 @@ public class DntServiceImpl implements DntService {
public void insertAddDateNotice(DntVO dntVO) throws Exception{
setDayNoticeInfo(dntVO); //기일 장소 및 주소 셋팅해주기
+
+ //app_seq 값 가져오기
+ DntVO dntVOtmp = dntDAO.selectAppSeq(dntVO);
+ dntVO.setAppSeq(dntVOtmp.getAppSeq());
+
dntDAO.insertDateNotice(dntVO); //기일 정보 추가해 주기
}
@@ -196,7 +206,17 @@ public class DntServiceImpl implements DntService {
dntVO.setAddChgYn(dntVO.getAddChgYn0());
dntVO.setAssSeq(dntVO.getAssSeq0());
- dntDAO.updateDistribution(dntVO);
+
+ //select assHstrySeq
+ /*
+ DntVO dntVOTmp = dntDAO.selectAssHstrySeq(dntVO);
+ dntVO.setAssHstrySeq(dntVOTmp.getAssHstrySeq());
+
+
+ dntDAO.updateDistribution(dntVO);
+ */
+
+ pf_updateDistribution(dntVO);
//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09
@@ -211,9 +231,9 @@ public class DntServiceImpl implements DntService {
, dntVO.getLastUpdusrId()
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
- , "I" //, String p_useCd I/U/UI/II/RE
+ , "II" //, String p_useCd I/U/UI/II/RE
, "adr_ass_hstry" //, String p_tableName
- , " WHERE 1=1 AND ass_hstry_seq='"+dntVO.getAdrSeq()
+ , " WHERE 1=1 AND ass_hstry_seq='"+dntVO.getAssHstrySeq()
+"' " //, String p_updateQuery
);
@@ -228,7 +248,7 @@ public class DntServiceImpl implements DntService {
, dntVO.getLastUpdusrId()
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
- , "U" //, String p_useCd I/U/UI/II/RE
+ , "UI" //, String p_useCd I/U/UI/II/RE
, "ADR_ASS_MGR" //, String p_tableName
, "" //, String p_updateQuery
@@ -244,8 +264,11 @@ public class DntServiceImpl implements DntService {
dntVO.setAddUsrId(addUsrId);
dntVO.setAddChgYn(dntVO.getAddChgYn1());
dntVO.setAssSeq(dntVO.getAssSeq1());
+
- dntDAO.updateDistribution(dntVO);
+ //dntDAO.updateDistribution(dntVO);
+
+ pf_updateDistribution(dntVO);
//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09
@@ -260,9 +283,9 @@ public class DntServiceImpl implements DntService {
, dntVO.getLastUpdusrId()
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
- , "I" //, String p_useCd I/U/UI/II/RE
+ , "II" //, String p_useCd I/U/UI/II/RE
, "adr_ass_hstry" //, String p_tableName
- , " WHERE 1=1 AND ass_hstry_seq='"+dntVO.getAdrSeq()
+ , " WHERE 1=1 AND ass_hstry_seq='"+dntVO.getAssHstrySeq()
+"' " //, String p_updateQuery
);
@@ -277,7 +300,7 @@ public class DntServiceImpl implements DntService {
, dntVO.getLastUpdusrId()
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
- , "U" //, String p_useCd I/U/UI/II/RE
+ , "UI" //, String p_useCd I/U/UI/II/RE
, "ADR_ASS_MGR" //, String p_tableName
, "" //, String p_updateQuery
@@ -292,8 +315,10 @@ public class DntServiceImpl implements DntService {
dntVO.setAddUsrId(addUsrId);
dntVO.setAddChgYn(dntVO.getAddChgYn2());
dntVO.setAssSeq(dntVO.getAssSeq2());
+
- dntDAO.updateDistribution(dntVO);
+ //dntDAO.updateDistribution(dntVO);
+ pf_updateDistribution(dntVO);
//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09
@@ -308,9 +333,9 @@ public class DntServiceImpl implements DntService {
, dntVO.getLastUpdusrId()
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
- , "I" //, String p_useCd I/U/UI/II/RE
+ , "II" //, String p_useCd I/U/UI/II/RE
, "adr_ass_hstry" //, String p_tableName
- , " WHERE 1=1 AND ass_hstry_seq='"+dntVO.getAdrSeq()
+ , " WHERE 1=1 AND ass_hstry_seq='"+dntVO.getAssHstrySeq()
+"' " //, String p_updateQuery
);
@@ -325,7 +350,7 @@ public class DntServiceImpl implements DntService {
, dntVO.getLastUpdusrId()
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
- , "U" //, String p_useCd I/U/UI/II/RE
+ , "UI" //, String p_useCd I/U/UI/II/RE
, "ADR_ASS_MGR" //, String p_tableName
, "" //, String p_updateQuery
@@ -388,18 +413,145 @@ public class DntServiceImpl implements DntService {
dntDAO.updateAdrMgrDetailSn(dntVO);
}
- public void dntUpdSbmtYn(DntVO dntVO) throws Exception{
+ public void dntUpdSbmtYn(DntVO dntVO
+ , String p_code_desc
+ , String p_stat_cd
+ , String p_adrHstryMgrSeq
+ ) throws Exception{
dntDAO.dntUpdSbmtYn(dntVO);
+
+ System.out.println("dntVO.getSbmtYn()s");
+ System.out.println(dntVO.getSbmtYn());
+
+ String s_sbmt_yn = "Y";
+ if (dntVO.getSbmtYn()==null
+ || dntVO.getSbmtYn().equals("Y")) {
+ s_sbmt_yn = "N";
+
+ }
+ System.out.println("dntVO.getSbmtYn()e");
+ //이력관리를 위한 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
+ , "U" //, String p_useCd I/U/UI/II/RE
+ , "ADR_APP_MGR" //, String p_tableName
+ , " SET SBMT_YN = '"+s_sbmt_yn+"' WHERE ADR_SEQ='"+dntVO.getAdrSeq()+"' AND ADR_SN='"+dntVO.getAdrSn()+"' AND APP_SEQ='"+dntVO.getAppSeq()+"' " //, String p_updateQuery
+
+ );
+ //adr_hstry_mgr에 값 넣기 - 끝
}
- public void dntUpdApprYnY(DntVO dntVO) throws Exception{
+ public void dntUpdApprYnY(DntVO dntVO
+ , String p_code_desc
+ , String p_stat_cd
+ , String p_adrHstryMgrSeq
+ ) throws Exception{
+
+ DntVO dntVOTmp = dntDAO.selectAdrAppMgr(dntVO);
+
dntDAO.dntUpdApprYnY(dntVO);
+
+ String s_updateQuery = "";
+
+ /*
+ dntVOTmp.getApprYn()!=null
+ , " SET APPR_YN = '"+((dntVOTmp.getApprYn()!=null)?dntVOTmp.getApprYn():null)+"' WHERE ADR_SEQ='"+dntVO.getAdrSeq()+"' AND ADR_SN='"+dntVO.getAdrSn()+"' AND APP_SEQ='"+dntVO.getAppSeq()+"' " //, String p_updateQuery
+ */
+
+ //이력관리를 위한 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
+ , "U" //, String p_useCd I/U/UI/II/RE
+ , "ADR_APP_MGR" //, String p_tableName
+
+ , " SET APPR_YN = null WHERE ADR_SEQ='"+dntVO.getAdrSeq()+"' AND ADR_SN='"+dntVO.getAdrSn()+"' AND APP_SEQ='"+dntVO.getAppSeq()+"' " //, String p_updateQuery
+
+ );
+ //adr_hstry_mgr에 값 넣기 - 끝
}
- public void dntUpdApprYnN(DntVO dntVO) throws Exception{
+ public void dntUpdApprYnN(DntVO dntVO
+ , String p_code_desc
+ , String p_stat_cd
+ , String p_adrHstryMgrSeq
+ ) throws Exception{
+ DntVO dntVOTmp = dntDAO.selectAdrAppMgr(dntVO);
+
dntDAO.dntUpdApprYnN(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
+ , "U" //, String p_useCd I/U/UI/II/RE
+ , "ADR_APP_MGR" //, String p_tableName
+ , " SET APPR_YN = '"+dntVOTmp.getApprYn()+"' WHERE ADR_SEQ='"+dntVO.getAdrSeq()+"' AND ADR_SN='"+dntVO.getAdrSn()+"' AND APP_SEQ='"+dntVO.getAppSeq()+"' " //, String p_updateQuery
+
+ );
+ //adr_hstry_mgr에 값 넣기 - 끝
}
+
+ @Override
+ public DntVO selectAppSeq(DntVO dntVO) throws Exception {
+ DntVO result = dntDAO.selectAppSeq(dntVO);
+ return result;
+ }
+
+ @Override
+ public DntVO selectAssHstrySeq(DntVO dntVO) throws Exception {
+ DntVO result = dntDAO.selectAssHstrySeq(dntVO);
+ return result;
+ }
+
+ @Override
+ public DntVO selectAdrAssMgr(DntVO dntVO) throws Exception {
+ DntVO result = dntDAO.selectAdrAssMgr(dntVO);
+ return result;
+ }
+
+ @Override
+ public DntVO selectAdrAppMgr(DntVO dntVO) throws Exception {
+ DntVO result = dntDAO.selectAdrAppMgr(dntVO);
+ return result;
+ }
+
+ private void pf_updateDistribution(DntVO dntVO) throws Exception{
+ //select assHstrySeq
+ DntVO dntVOTmp = dntDAO.selectAssHstrySeq(dntVO);
+ dntVO.setAssHstrySeq(dntVOTmp.getAssHstrySeq());
+
+
+ dntDAO.updateDistribution(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 adf1a204..b11be931 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java
@@ -326,7 +326,7 @@ public class DntController {
, ""
);
- //대석 등록
+ //대석 등록 - 이력관리 하지 않는다.
//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09
dntService.updateDistribution(dntVO
, "조정진행관리>>조정진행목록>조정진행상세>기일등록>대석등록-수정" //String p_code_desc - CC199
@@ -847,7 +847,13 @@ public class DntController {
dntVO.setFrstRegisterId(userId);
dntVO.setLastUpdusrId(userId);
- dntService.dntUpdSbmtYn(dntVO);
+
+
+ dntService.dntUpdSbmtYn(dntVO
+ , "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정" //String p_code_desc - CC199
+ , "A120" //String p_stat_cd
+ , ""
+ );
modelAndView.addObject("result", "SUCCESS");
diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java
index 3f8aec76..89be8fa5 100644
--- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java
+++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java
@@ -708,6 +708,8 @@ public class AdjstConciliatorController {
}
modelAndView.addObject("rs", (rs>0));
modelAndView.addObject("result", KccadrConstants.SUCCESS);
+ modelAndView.addObject("adrHstryMgrSeq", s_adrHstryMgrSeq);
+
}else{
modelAndView.addObject("rs", (rs>0));
modelAndView.addObject("result", KccadrConstants.FAIL);
@@ -740,12 +742,20 @@ public class AdjstConciliatorController {
if(dntVO.getApprYn().equals("Y")) {
//승인 처리
- dntService.dntUpdApprYnY(dntVO);
+ dntService.dntUpdApprYnY(dntVO
+ , "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-통지확인요청-Y" //String p_code_desc - CC199
+ , "A135" //String p_stat_cd
+ , dntVO.getAssHstrySeq()
+ );
}else {
//반려 처리 - 제출 이전의 상태로 변경함 (sbmt_yn : N, appr_yn : n 상태로 만듬)
- dntService.dntUpdApprYnN(dntVO);
+ dntService.dntUpdApprYnN(dntVO
+ , "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-통지확인요청-N" //String p_code_desc - CC199
+ , "A136" //String p_stat_cd
+ , ""
+ );
}
diff --git a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java
index feef02d0..4fcb11e1 100644
--- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java
+++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java
@@ -140,6 +140,7 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService {
//
if (adrHstryMgrVOTmp1.getMenuId().equals("201050") //접수결재완료 취소
|| adrHstryMgrVOTmp1.getMenuId().equals("202050") //조정부지정완료 취소
+ || adrHstryMgrVOTmp1.getMenuId().equals("205050") //기일통지서완료 취소
) { //결재완료인 경우는 앞단과 연관된 액션이 많아서, 결재완료 이후 값만 삭제처리하도록 대상을 가져온다.
tlist = adrHstryMgrDAO.selectCancelListGt(adrHstryMgrVO);
@@ -173,6 +174,9 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService {
}
+ }else if (adrHstryMgrDetailTmpVO.getUseCd().equals("UI")
+ || adrHstryMgrDetailTmpVO.getUseCd().equals("II")) {
+ //변경 불가한 수정, 저장 이므로 skip 한다.
}else {
//step3-1.가 아니면 오류발생 rollback 한다. - Q
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 e113a402..0377371d 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
@@ -66,7 +66,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#
@@ -127,8 +130,11 @@
, b.frst_regist_pnttm
, b.frst_register_id
FROM (
+ SELECT #assHstrySeq# AS ass_hstry_seq
+ /*
SELECT IFNULL(MAX(ass_hstry_seq),0)+1 ass_hstry_seq
- FROM adr_ass_hstry
+ FROM adr_ass_hstry
+ */
)a,
(
SELECT adr_seq, adr_sn, ass_seq, add_usr_id, SYS_DATETIME as frst_regist_pnttm, #lastUpdusrId# as frst_register_id
@@ -228,4 +234,46 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 e8803421..dcb273e0 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,6 +311,7 @@ $(document).ready(function(){
<%-- " /> --%>
+
" />
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp
index edab1640..3034db95 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp
@@ -69,15 +69,17 @@
alert("처리중 오류가 발생하였습니다.");
}
}else if(returnData.result == 'SUCCESS'){
+ var s_adrHstryMgrSeq = returnData.adrHstryMgrSeq;
+
if(type == "R"){
//기일변경 요청, 기일통지서요청 상태일때 기일 승일 일자 업데이트
if(statCd == '204010' || statCd == '205010'){
- updtDntApprYn('N');
+ updtDntApprYn('N', s_adrHstryMgrSeq);
}
alert("반려되었습니다.");
}else{
if(statCd == '204010' || statCd == '205010'){
- updtDntApprYn('Y');
+ updtDntApprYn('Y', s_adrHstryMgrSeq);
}
var exportUrl = "";
@@ -145,10 +147,13 @@
}
//기일통지서승인 일자 업데이트 처리해주기
- function updtDntApprYn(status){
+ function updtDntApprYn(status
+ , s_adrHstryMgrSeq
+ ){
var data = new FormData(document.getElementById("detailForm"));
data.append("apprYn" ,status);
+ data.append("assHstrySeq" ,s_adrHstryMgrSeq);
$.ajax({
type: "POST",