tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2022-09-28 18:26 워크플로우 - 기일조서 작성 전까지

Browse Source
This commit is contained in:
myname 2022-09-28 18:27:17 +09:00
parent 77d67cf783
commit a8ea24f3a7
11 changed files with 225 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/kcc/kccadr/adjPgrMgr/chd/service/ChdService.java
View File

@ -10,13 +10,25 @@ public interface ChdService {
ChdVO selectDateNotice(ChdVO chdVO) throws Exception; 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); 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; void udateDateConfirm(ChdVO chdVO) throws Exception;

32
src/main/java/kcc/kccadr/adjPgrMgr/chd/service/ChdVO.java
View File

@ -2,6 +2,7 @@ package kcc.kccadr.adjPgrMgr.chd.service;
import java.io.Serializable; import java.io.Serializable;
import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
@SuppressWarnings("serial") @SuppressWarnings("serial")
@ -18,6 +19,13 @@ public class ChdVO extends PgrCmmVO implements Serializable {
private String addChgYn; private String addChgYn;
private String appSeq;
private String assHstrySeq;
private String apprYn;
public String getAppDe() { public String getAppDe() {
return appDe; return appDe;
} }
@ -66,6 +74,30 @@ public class ChdVO extends PgrCmmVO implements Serializable {
this.addChgYn = addChgYn; 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;
}

144
src/main/java/kcc/kccadr/adjPgrMgr/chd/service/impl/ChdServiceImpl.java
View File

@ -6,12 +6,12 @@ import javax.annotation.Resource;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import kcc.com.cmm.util.StringUtil; import kcc.com.cmm.util.StringUtil;
import kcc.kccadr.adjPgrMgr.chd.service.ChdService; import kcc.kccadr.adjPgrMgr.chd.service.ChdService;
import kcc.kccadr.adjPgrMgr.chd.service.ChdVO; import kcc.kccadr.adjPgrMgr.chd.service.ChdVO;
import kcc.kccadr.adjPgrMgr.dtb.service.DtbVO; import kcc.kccadr.adjPgrMgr.dnt.service.DntVO;
import kcc.kccadr.adjPgrMgr.dtb.service.impl.DtbDAO; import kcc.kccadr.adjPgrMgr.dnt.service.impl.DntDAO;
import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.fcc.service.EgovCryptoUtil;
@Repository("chdService") @Repository("chdService")
@ -24,9 +24,15 @@ public class ChdServiceImpl implements ChdService {
@Resource(name = "ChdDAO") @Resource(name = "ChdDAO")
ChdDAO chdDAO; ChdDAO chdDAO;
@Resource(name = "DntDAO")
DntDAO dntDAO;
@Resource(name = "egovCryptoUtil") @Resource(name = "egovCryptoUtil")
EgovCryptoUtil egovCryptoUtil; EgovCryptoUtil egovCryptoUtil;
// 조정사건이력관리 DAO
@Resource(name = "adrHstryMgrDAO")
private AdrHstryMgrDAO adrHstryMgrDAO;
@Override @Override
public List<ChdVO> selectDateNoticeList(ChdVO chdVO) throws Exception { public List<ChdVO> selectDateNoticeList(ChdVO chdVO) throws Exception {
@ -76,10 +82,33 @@ public class ChdServiceImpl implements ChdService {
@Override @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); 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); return chdDAO.udateDateNotice(chdVO);
} }
@ -102,10 +131,46 @@ public class ChdServiceImpl implements ChdService {
@Override @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); 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); 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; return 1;
} }
@ -119,7 +184,11 @@ public class ChdServiceImpl implements ChdService {
@Override @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())) { if (!StringUtil.isEmpty(chdVO.getAddUsrId0())) {
@ -129,7 +198,26 @@ public class ChdServiceImpl implements ChdService {
chdVO.setAddChgYn(chdVO.getAddChgYn0()); chdVO.setAddChgYn(chdVO.getAddChgYn0());
chdVO.setAssSeq(chdVO.getAssSeq0()); 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.setAddChgYn(chdVO.getAddChgYn1());
chdVO.setAssSeq(chdVO.getAssSeq1()); 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())) { if (!StringUtil.isEmpty(chdVO.getAddUsrId2())) {
@ -150,7 +257,26 @@ public class ChdServiceImpl implements ChdService {
chdVO.setAddChgYn(chdVO.getAddChgYn2()); chdVO.setAddChgYn(chdVO.getAddChgYn2());
chdVO.setAssSeq(chdVO.getAssSeq2()); 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에 값 넣기 - 끝
} }

24
src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java
View File

@ -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(); AdjReqMgrVO arv = new AdjReqMgrVO();
arv.setAdrSeq(chdVO.getAdrSeq()); // 조정일련번호 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(); AdjReqMgrVO arv = new AdjReqMgrVO();

7
src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntServiceImpl.java
View File

@ -459,10 +459,10 @@ public class DntServiceImpl implements DntService {
DntVO dntVOTmp = dntDAO.selectAdrAppMgr(dntVO); DntVO dntVOTmp = dntDAO.selectAdrAppMgr(dntVO);
dntVO.setAppSeq(dntVOTmp.getAppSeq());
dntDAO.dntUpdApprYnY(dntVO); dntDAO.dntUpdApprYnY(dntVO);
String s_updateQuery = ""; //String s_updateQuery = "";
/* /*
dntVOTmp.getApprYn()!=null dntVOTmp.getApprYn()!=null
@ -495,9 +495,10 @@ public class DntServiceImpl implements DntService {
, String p_stat_cd , String p_stat_cd
, String p_adrHstryMgrSeq , String p_adrHstryMgrSeq
) throws Exception{ ) throws Exception{
DntVO dntVOTmp = dntDAO.selectAdrAppMgr(dntVO); DntVO dntVOTmp = dntDAO.selectAdrAppMgr(dntVO);
dntVO.setAppSeq(dntVOTmp.getAppSeq());
dntDAO.dntUpdApprYnN(dntVO); dntDAO.dntUpdApprYnN(dntVO);

4
src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java
View File

@ -710,6 +710,10 @@ public class AdjstConciliatorController {
modelAndView.addObject("result", KccadrConstants.SUCCESS); modelAndView.addObject("result", KccadrConstants.SUCCESS);
modelAndView.addObject("adrHstryMgrSeq", s_adrHstryMgrSeq); modelAndView.addObject("adrHstryMgrSeq", s_adrHstryMgrSeq);
System.out.println("s_adrHstryMgrSeq==================");
System.out.println(s_adrHstryMgrSeq);
System.out.println("s_adrHstryMgrSeq===================");
}else{ }else{
modelAndView.addObject("rs", (rs>0)); modelAndView.addObject("rs", (rs>0));
modelAndView.addObject("result", KccadrConstants.FAIL); modelAndView.addObject("result", KccadrConstants.FAIL);

5
src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/chd/Chd_SQL_Mysql.xml
View File

@ -70,7 +70,10 @@
) VALUES ( ) VALUES (
#adrSeq# #adrSeq#
, #adrSn# , #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# , #adrAdmId#
, #appDeDay#||#appDeTime#||'00' , #appDeDay#||#appDeTime#||'00'
, #appPlace# , #appPlace#

5
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp
View File

@ -311,7 +311,10 @@ $(document).ready(function(){
<!-- 워크플로우용 스크립트 시작 --> <!-- 워크플로우용 스크립트 시작 -->
<c:forEach var="list" items="${list_mgr}" varStatus="status"> <c:forEach var="list" items="${list_mgr}" varStatus="status">
<c:if test="${fn:length(list.menuId) eq '6' or list.menuId eq 'A260'}"> <c:if test="${fn:length(list.menuId) eq '6'
or list.menuId eq 'A260'
or list.menuId eq 'C150'
}">
<script> <script>
//<!-- 조정진행워크플로우 체크 --> //<!-- 조정진행워크플로우 체크 -->
$("#${list.menuId}").addClass("status01"); $("#${list.menuId}").addClass("status01");

5
src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp
View File

@ -100,7 +100,10 @@
</script> </script>
<!-- 워크플로우용 스크립트 시작 --> <!-- 워크플로우용 스크립트 시작 -->
<c:forEach var="list" items="${list_mgr}" varStatus="status"> <c:forEach var="list" items="${list_mgr}" varStatus="status">
<c:if test="${fn:length(list.menuId) eq '6' or list.menuId eq 'A260'}"> <c:if test="${fn:length(list.menuId) eq '6'
or list.menuId eq 'A260'
or list.menuId eq 'C150'
}">
<script> <script>
//<!-- 조정진행워크플로우 체크 --> //<!-- 조정진행워크플로우 체크 -->
$("#${list.menuId}").addClass("status01"); $("#${list.menuId}").addClass("status01");

26
src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJS.jsp
View File

@ -4,29 +4,5 @@
<!-- 워크플로우용 스크립트 시작 --> <!-- 워크플로우용 스크립트 시작 -->
<c:forEach var="list" items="${param.list_mgrs}" varStatus="status"> <!-- 더이상 사용안함 -->
<c:if test="${fn:length(list.menuId) eq '6' or list.menuId eq 'A260'}">
<script>
alert(${fn:length(list.menuId)});
//<!-- 조정진행워크플로우 체크 -->
alert(${list.menuId});
</script>
</c:if>
</c:forEach>
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#${info.statCd}").addClass("status02");
</script>
<!-- 신청서 보완 체크시-->
<c:if test="${info.statCd lt '101050' and info.statCd ne '101010'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#101011").addClass("status02");
</script>
</c:if>
<!-- 워크플로우용 스크립트 끝 --> <!-- 워크플로우용 스크립트 끝 -->

4
src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp
View File

@ -43,8 +43,8 @@
<li><p>4차 기일 개최</p></li> <li><p>4차 기일 개최</p></li>
</ul> </ul>
</li> </li>
<li style="position: absolute; top: 146px"><p>기일변경</p></li> <li style="position: absolute; top: 146px" id="204050"><p>기일변경</p></li>
<li><p>변론서 및 답변서</p></li> <li><p id="C150">변론서 및 답변서</p></li>
<li style="width: 450px;"><p>취하신청</p><img src="/kccadrPb/usr/image/workflow/nexticon1.png" alt="다음" style="position:absolute; left: 203px;"><p style="margin-left: 7px;">취하종결</p></li> <li style="width: 450px;"><p>취하신청</p><img src="/kccadrPb/usr/image/workflow/nexticon1.png" alt="다음" style="position:absolute; left: 203px;"><p style="margin-left: 7px;">취하종결</p></li>
</ul> </ul>
</div> </div>