2022-09-22 14:49 되돌리기

This commit is contained in:
myname 2022-09-22 00:34:35 +09:00
parent 74afafad95
commit e4f1111efd
6 changed files with 76 additions and 35 deletions

View File

@ -114,10 +114,10 @@ public class DtbServiceImpl implements DtbService {
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
, "I" //, String p_useCd I/U/UI/II/RE
, "ADR_ASS_MGR" //, String p_tableName
, " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()
+ " AND adr_sn='"+dtbVO.getAdrSn()
+ " AND ass_seq='"+dtbVO.getAssSeq()
+"' " //, String p_updateQuery
, " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()+"'"
+ " AND adr_sn='"+dtbVO.getAdrSn()+"'"
+ " AND ass_seq='"+dtbVO.getAssSeq()+"'"
);
//adr_hstry_mgr에 넣기 -
@ -152,10 +152,10 @@ public class DtbServiceImpl implements DtbService {
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
, "I" //, String p_useCd I/U/UI/II/RE
, "ADR_ASS_MGR" //, String p_tableName
, " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()
+ " AND adr_sn='"+dtbVO.getAdrSn()
+ " AND ass_seq='"+dtbVO.getAssSeq()
+"' " //, String p_updateQuery
, " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()+"'"
+ " AND adr_sn='"+dtbVO.getAdrSn()+"'"
+ " AND ass_seq='"+dtbVO.getAssSeq()+"'"
);
//adr_hstry_mgr에 넣기 -
@ -187,10 +187,10 @@ public class DtbServiceImpl implements DtbService {
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
, "I" //, String p_useCd I/U/UI/II/RE
, "ADR_ASS_MGR" //, String p_tableName
, " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()
+ " AND adr_sn='"+dtbVO.getAdrSn()
+ " AND ass_seq='"+dtbVO.getAssSeq()
+"' " //, String p_updateQuery
, " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()+"'"
+ " AND adr_sn='"+dtbVO.getAdrSn()+"'"
+ " AND ass_seq='"+dtbVO.getAssSeq()+"'"
);
//adr_hstry_mgr에 넣기 -
@ -221,10 +221,9 @@ public class DtbServiceImpl implements DtbService {
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
, "I" //, String p_useCd I/U/UI/II/RE
, "ADR_ASS_MGR" //, String p_tableName
, " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()
+ " AND adr_sn='"+dtbVO.getAdrSn()
+ " AND ass_seq='"+dtbVO.getAssSeq()
+"' " //, String p_updateQuery
, " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()+"'"
+ " AND adr_sn='"+dtbVO.getAdrSn()+"'"
+ " AND ass_seq='"+dtbVO.getAssSeq()+"'"
);
//adr_hstry_mgr에 넣기 -
@ -233,7 +232,7 @@ public class DtbServiceImpl implements DtbService {
}
int rs = dtbDAO.updateDistribution_setp1(dtbVO);
int rs = dtbDAO.updateDistribution_setp1(dtbVO); //adr_mgr_detail 에서 조정부/조정조사관 업데이트를
//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09
//adr_hstry_mgr에 넣기 - 시작
@ -248,9 +247,13 @@ public class DtbServiceImpl implements DtbService {
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
, "U" //, String p_useCd I/U/UI/II/RE
, "ADR_ASS_MGR" //, String p_tableName
, "" //, String p_updateQuery
, "ADR_MGR_DETAIL" //, String p_tableName
, " SET ADR_ADM_ID = null"
+ " , MEM_DEPT_SEQ = null"
+ " , LAST_UPDT_PNTTM = SYS_DATETIME"
+ " , LAST_UPDUSR_ID = '"+dtbVO.getLastUpdusrId()+"'"
+ " WHERE ADR_SEQ = '"+dtbVO.getAdrSeq()+"'"
+ " AND ADR_SN = '"+dtbVO.getAdrSn()+"'"
);
//adr_hstry_mgr에 넣기 -

View File

@ -37,7 +37,7 @@ public interface AdrHstryMgrService {
List<AdrHstryMgrVO> selectPagingList(AdrHstryMgrVO adrHstryMgrVO) throws Exception;
//L
List<AdrHstryMgrVO> selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception;
List<AdrHstryMgrVO> selectCancelListEqual(AdrHstryMgrVO adrHstryMgrVO) throws Exception;
//D
int delete4CancelAll(AdrHstryMgrVO adrHstryMgrVO) throws Exception;

View File

@ -197,9 +197,14 @@ public class AdrHstryMgrDAO extends EgovAbstractDAO {
}
*/
//L
public List<AdrHstryMgrVO> selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception {
List<AdrHstryMgrVO> tlist = (List<AdrHstryMgrVO>) list("AdrHstryMgrDAO.selectCancelList", adrHstryMgrVO);
//L
public List<AdrHstryMgrVO> selectCancelListEqual(AdrHstryMgrVO adrHstryMgrVO) throws Exception {
List<AdrHstryMgrVO> tlist = (List<AdrHstryMgrVO>) list("AdrHstryMgrDAO.selectCancelListEqual", adrHstryMgrVO);
return tlist;
}
public List<AdrHstryMgrVO> selectCancelListGt(AdrHstryMgrVO adrHstryMgrVO) throws Exception {
List<AdrHstryMgrVO> tlist = (List<AdrHstryMgrVO>) list("AdrHstryMgrDAO.selectCancelListGt", adrHstryMgrVO);
return tlist;
}

View File

@ -104,8 +104,8 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService {
*/
//List
public List<AdrHstryMgrVO> selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception{
return adrHstryMgrDAO.selectCancelList(adrHstryMgrVO);
public List<AdrHstryMgrVO> selectCancelListEqual(AdrHstryMgrVO adrHstryMgrVO) throws Exception{
return adrHstryMgrDAO.selectCancelListEqual(adrHstryMgrVO);
}
//D
@ -129,9 +129,24 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService {
//step4.각각의 상세 전체 대상 삭제 - Q
//step5.전체 대상 삭제 - Q
//step0.해당 취소의 상태 코드 값을 가져온다.
AdrHstryMgrVO adrHstryMgrVOTmp1 = adrHstryMgrDAO.selectDetail(adrHstryMgrVO);
//step1.전체 리스트를 가져온다.
List<AdrHstryMgrVO> tlist = adrHstryMgrDAO.selectCancelList(adrHstryMgrVO);
//List<AdrHstryMgrVO> tlist = adrHstryMgrDAO.selectCancelListEqual(adrHstryMgrVO);
List<AdrHstryMgrVO> tlist = null;
//
if (adrHstryMgrVOTmp1.getMenuId().equals("201050") //접수결재완료 취소
|| adrHstryMgrVOTmp1.getMenuId().equals("202050") //조정부지정완료 취소
) { //결재완료인 경우는 앞단과 연관된 액션이 많아서, 결재완료 이후 값만 삭제처리하도록 대상을 가져온다.
tlist = adrHstryMgrDAO.selectCancelListGt(adrHstryMgrVO);
}else {
tlist = adrHstryMgrDAO.selectCancelListEqual(adrHstryMgrVO);
}
for (int i=0;i<tlist.size();i++) {
AdrHstryMgrVO adrHstryMgrTmpVO = tlist.get(i);
@ -189,7 +204,7 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService {
i_ret = kccadrMgrUdtService.updateAdrMgrUdt4Cancel(arv
, ""
, adrHstryMgrVOTmp1.getMenuId() //취소 요청 코드
);
//제거할것.--rollback 발생용

View File

@ -69,7 +69,7 @@ public class KccadrMgrUdtServiceImpl implements KccadrMgrUdtService{
//adr_hstry_mgr에 넣기 -
int rs = _updateAdrMgrUdt(adjReqMgrVO);
int rs = _updateAdrMgrUdt(adjReqMgrVO, "");
return rs;
@ -141,10 +141,10 @@ public class KccadrMgrUdtServiceImpl implements KccadrMgrUdtService{
@Override
public int updateAdrMgrUdt4Cancel(AdjReqMgrVO adjReqMgrVO
, String s_adrHstryMgrSeq
, String s_ref_seq_1
) throws Exception {
int rs = _updateAdrMgrUdt(adjReqMgrVO);
int rs = _updateAdrMgrUdt(adjReqMgrVO, s_ref_seq_1);
return rs;
@ -185,7 +185,9 @@ public class KccadrMgrUdtServiceImpl implements KccadrMgrUdtService{
// private function
//
//////////////////////////////////////////////////////////////////////////
private int _updateAdrMgrUdt(AdjReqMgrVO adjReqMgrVO) throws Exception {
private int _updateAdrMgrUdt(AdjReqMgrVO adjReqMgrVO
, String s_ref_seq_1
) throws Exception {
// 필수값 체크
if (StringUtil2.isEmpty(adjReqMgrVO.getAdrSeq())

View File

@ -188,7 +188,7 @@
</select>
<!-- 취소 대상 리스트 L -->
<select id="AdrHstryMgrDAO.selectCancelList" parameterClass="AdrHstryMgrVO" resultClass="AdrHstryMgrVO">
<select id="AdrHstryMgrDAO.selectCancelListEqual" parameterClass="AdrHstryMgrVO" resultClass="AdrHstryMgrVO">
SELECT
<include refid="AdrHstryMgrDAO.select_column_name"/>
FROM
@ -202,7 +202,23 @@
ORDER BY a.adr_hstry_mgr_seq DESC
</select>
<!-- 취소 대상 리스트 L -->
<select id="AdrHstryMgrDAO.selectCancelListGt" parameterClass="AdrHstryMgrVO" resultClass="AdrHstryMgrVO">
SELECT
<include refid="AdrHstryMgrDAO.select_column_name"/>
FROM
<include refid="AdrHstryMgrDAO.table_name"/> a
WHERE
a.adr_seq = #adrSeq#
AND a.adr_hstry_mgr_seq > #adrHstryMgrSeq#
AND 0>=instr(a.menu_id,'V')
ORDER BY a.adr_hstry_mgr_seq DESC
</select>
<!-- insert 쿼리 -->
<update id="AdrHstryMgrDAO.deleteQuery" parameterClass="AdrHstryMgrVO">
DELETE