diff --git a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java index 161b09c9..328cacbd 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java @@ -70,6 +70,14 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable { private String sbsttTblNm3; //'대리결재자3-테이블명 info-내부관리자, mgr-조정위원', + private String sbmtStepCnt; //전체 단계수 + private String sbmtYn1; //1번진행 상황 Y/N/A + private String sbmtYn2; //2번진행 상황 Y/N/A + private String sbmtYn3; //3번진행 상황 Y/N/A + + private String whereQuery; //조건 쿼리 + + public String getRegisterId() { return registerId; } @@ -346,4 +354,34 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable { public void setSbsttTblNm3(String sbsttTblNm3) { this.sbsttTblNm3 = sbsttTblNm3; } + public String getSbmtStepCnt() { + return sbmtStepCnt; + } + public void setSbmtStepCnt(String sbmtStepCnt) { + this.sbmtStepCnt = sbmtStepCnt; + } + public String getSbmtYn1() { + return sbmtYn1; + } + public void setSbmtYn1(String sbmtYn1) { + this.sbmtYn1 = sbmtYn1; + } + public String getSbmtYn2() { + return sbmtYn2; + } + public void setSbmtYn2(String sbmtYn2) { + this.sbmtYn2 = sbmtYn2; + } + public String getSbmtYn3() { + return sbmtYn3; + } + public void setSbmtYn3(String sbmtYn3) { + this.sbmtYn3 = sbmtYn3; + } + public String getWhereQuery() { + return whereQuery; + } + public void setWhereQuery(String whereQuery) { + this.whereQuery = whereQuery; + } } diff --git a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtMgrHstryService.java b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtMgrHstryService.java index 0c8936dc..1dc021d7 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtMgrHstryService.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtMgrHstryService.java @@ -33,6 +33,8 @@ public interface AdrSbmtMgrHstryService { //D int delete(AdrSbmtLineMgrUsrVO vo) throws Exception; + + int deleteWithQuery(AdrSbmtLineMgrUsrVO vo) throws Exception; //L List selectList(AdrSbmtLineMgrUsrVO vo) throws Exception; diff --git a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtMgrHstryDAO.java b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtMgrHstryDAO.java index 4b54c070..dfd321f8 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtMgrHstryDAO.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtMgrHstryDAO.java @@ -170,6 +170,10 @@ public class AdrSbmtMgrHstryDAO extends EgovAbstractDAO { return delete("AdrSbmtMgrHstryDAO.delete", VO); } + public int deleteWithQuery(AdrSbmtLineMgrUsrVO VO) throws Exception { + return delete("AdrSbmtMgrHstryDAO.deleteWithQuery", VO); + } + //L public List selectList(AdrSbmtLineMgrUsrVO VO) throws Exception { List tlist = (List) list("AdrSbmtMgrHstryDAO.selectList", VO); diff --git a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtMgrHstryServiceImpl.java b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtMgrHstryServiceImpl.java index b451f42b..e466bf06 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtMgrHstryServiceImpl.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtMgrHstryServiceImpl.java @@ -114,6 +114,10 @@ public class AdrSbmtMgrHstryServiceImpl implements AdrSbmtMgrHstryService { return adrSbmtMgrHstryDAO.delete(VO); } + public int deleteWithQuery(AdrSbmtLineMgrUsrVO VO) throws Exception{ + return adrSbmtMgrHstryDAO.deleteWithQuery(VO); + } + //List public List selectList(AdrSbmtLineMgrUsrVO VO) throws Exception{ return adrSbmtMgrHstryDAO.selectList(VO); diff --git a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java index 184de5c7..901bf54d 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java +++ b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java @@ -36,6 +36,14 @@ public interface AprvlMgrService { , String p_adrHstryMgrSeq , AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO ) throws Exception; + + //조정사건결재수정 - 2022-10고도화 + int updateAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + , AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO + ) throws Exception; //조정사건결재 조정부 저장 int insertAdrSbmtDetailMgr(AprvlMgrVO aprvlMgrVO diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java index 1ee1dfea..5caf2d05 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java @@ -45,7 +45,10 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr //결재대리인 일련 번호 @Resource(name = "adrSbmtMgrHstryService") private AdrSbmtMgrHstryService adrSbmtMgrHstryService; - + + //결재대리인 일련 번호 + @Resource(name = "aprvlMgrService") + private AprvlMgrService aprvlMgrService; public void insert(AprvlMgrVO aprvlMgrVO) throws Exception { @@ -264,6 +267,132 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr return rs; } + //조종사건수정 + public int updateAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + , AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO + ) throws Exception { + + + //step1.결재가 안된 데이터만 확인 - sbmtYn1,2,3 + //step2.기존 이력 데이터를 모두 삭제하고 D - adr_sbmt_mgr_hstry + //step3.데이터를 업데이트 -adr_sbmt_mgr + //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry + + //step0.조정부 대상 값을 가져온다. + //AprvlMgrVO aprvlMgrVOtmp = aprvlMgrDAO.select4InsertAdrSbmtMgr(aprvlMgrVO); + + System.out.println("======================================202210==고도화 결재선 교체 - 수정=="); + + + //aprvlMgrVO.setSbmtSeq(aprvlMgrVOtmp.getSbmtSeq()); + + + if ("A".equals(adrSbmtLineMgrUsrVO.getSbmtYn1())) { //1단계 결재 전임 + if ("".equals(adrSbmtLineMgrUsrVO.getSbsttSbmtId1())) { + aprvlMgrVO.setSbmtId1(adrSbmtLineMgrUsrVO.getSbmtId1()); + }else { + aprvlMgrVO.setSbmtId1(adrSbmtLineMgrUsrVO.getSbsttSbmtId1()); + } + //step1.결재가 안된 데이터만 확인 - sbmtYn1,2,3 + //step2.기존 이력 데이터를 모두 삭제하고 D - adr_sbmt_mgr_hstry + adrSbmtLineMgrUsrVO.setWhereQuery(" AND agnt_sbmt_id='ID1' "); + adrSbmtMgrHstryService.deleteWithQuery(adrSbmtLineMgrUsrVO); + + + //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry + this._insertAdrSbmtMgrHstry( + adrSbmtLineMgrUsrVO + , aprvlMgrVO + , "ID1" + , adrSbmtLineMgrUsrVO.getSbsttSbmtId1() + , adrSbmtLineMgrUsrVO.getSbmtId1() + ); + } + + + if ("A".equals(adrSbmtLineMgrUsrVO.getSbmtYn2())) { //1단계 결재 전임 + if ("".equals(adrSbmtLineMgrUsrVO.getSbsttSbmtId2())) { + aprvlMgrVO.setSbmtId2(adrSbmtLineMgrUsrVO.getSbmtId2()); + }else { + aprvlMgrVO.setSbmtId2(adrSbmtLineMgrUsrVO.getSbsttSbmtId2()); + } + //step1.결재가 안된 데이터만 확인 - sbmtYn1,2,3 + //step2.기존 이력 데이터를 모두 삭제하고 D - adr_sbmt_mgr_hstry + adrSbmtLineMgrUsrVO.setWhereQuery(" AND agnt_sbmt_id='ID2' "); + adrSbmtMgrHstryService.deleteWithQuery(adrSbmtLineMgrUsrVO); + + //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry + this._insertAdrSbmtMgrHstry( + adrSbmtLineMgrUsrVO + , aprvlMgrVO + , "ID2" + , adrSbmtLineMgrUsrVO.getSbsttSbmtId2() + , adrSbmtLineMgrUsrVO.getSbmtId2() + ); + } + + if ("A".equals(adrSbmtLineMgrUsrVO.getSbmtYn3())) { //1단계 결재 전임 + if ("".equals(adrSbmtLineMgrUsrVO.getSbsttSbmtId3())) { + aprvlMgrVO.setSbmtId3(adrSbmtLineMgrUsrVO.getSbmtId3()); + }else { + aprvlMgrVO.setSbmtId3(adrSbmtLineMgrUsrVO.getSbsttSbmtId3()); + } + //step1.결재가 안된 데이터만 확인 - sbmtYn1,2,3 + //step2.기존 이력 데이터를 모두 삭제하고 D - adr_sbmt_mgr_hstry + adrSbmtLineMgrUsrVO.setWhereQuery(" AND agnt_sbmt_id='ID3' "); + adrSbmtMgrHstryService.deleteWithQuery(adrSbmtLineMgrUsrVO); + + //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry + this._insertAdrSbmtMgrHstry( + adrSbmtLineMgrUsrVO + , aprvlMgrVO + , "ID3" + , adrSbmtLineMgrUsrVO.getSbsttSbmtId3() + , adrSbmtLineMgrUsrVO.getSbmtId3() + ); + } + + //step2.기존 이력 데이터를 모두 삭제하고 D - adr_sbmt_mgr_hstry + //adrSbmtMgrHstryService.deleteWithQuery(adrSbmtLineMgrUsrVO); + + + //step1.가져온 값으로 저장 + //int rs = aprvlMgrDAO.insertAdrSbmtMgrWithSelectedData(aprvlMgrVOtmp); + //step3.데이터를 업데이트 -adr_sbmt_mgr + int rs = aprvlMgrDAO.update(aprvlMgrVO); + + //sbmt seq 데이터 저장 + //aprvlMgrVO.setSbmtSeq(aprvlMgrVOtmp.getSbmtSeq()); + + /* + int rs = aprvlMgrDAO.insertAdrSbmtMgr(aprvlMgrVO); + */ + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(aprvlMgrVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , aprvlMgrVO.getFrstRegisterId() + , aprvlMgrVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "adr_sbmt_mgr" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + + return rs; + } + //조정사건조정부 결재 public int insertAdrSbmtDetailMgr(AprvlMgrVO aprvlMgrVO , String p_code_desc @@ -396,13 +525,16 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr p_adrSbmtLineMgrUsrVO.setFrstRegisterId(p_aprvlMgrVO.getFrstRegisterId()); - //저장 - adrSbmtMgrHstryService.insert(p_adrSbmtLineMgrUsrVO - , "관리자>>결재선>대결등록" //String p_code_desc - CC199 - , "A002" //String p_stat_cd - , "" - ); - //AdrSbmtLineMgrUsrVO + if (!p_SbsttSId1.equals(p_sbmtId1)) { + //저장 + adrSbmtMgrHstryService.insert(p_adrSbmtLineMgrUsrVO + , "관리자>>결재선>대결등록" //String p_code_desc - CC199 + , "A002" //String p_stat_cd + , "" + ); + //AdrSbmtLineMgrUsrVO + } + }catch(Exception ex) { ex.printStackTrace(); diff --git a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java index 62753237..754a7b82 100644 --- a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java +++ b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java @@ -444,6 +444,187 @@ public class AprvlMgr202210Controller { return modelAndView; } + /** + * 결재 상태 수정 1단계 + * 1.결재선 확인 + * 2.조정사건결재에 저장 + * 3.조정부 테이블에 저장 + * 4.마스터 상태값 변경 + * 5.결과 통보 + */ + @RequestMapping(value="/kccadr/aprvlMgr202210/aprvl/checkNUpdateAprvlStep1Ajax.do") + public ModelAndView checkNUpdateAprvlStep1Ajax( + HttpServletRequest request + , AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO + ) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //결재자 수정 처리 - 결재 하지 않은 결재자 정보만 업데이트 처리한다. + //so, 결재가 안된 데이터만 확인해서 변경 여부에 관계없이 기존 이력 데이터를 모두 삭제하고, 데이터를 업데이트, 이력 정보 남기기 처리를 해야 한다. + //step1.결재가 안된 데이터만 확인 - sbmtYn1,2,3 + //step2.기존 이력 데이터를 모두 삭제하고 D - adr_sbmt_mgr_hstry + //step3.데이터를 업데이트 -adr_sbmt_mgr + //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry + + //System.out.println("adjstReqStatusTabStatusStep1Ajax"); + + try { + System.out.println("adrSbmtLineMgrUsrVO.getSbmtYn1()-start"); + + System.out.println(adrSbmtLineMgrUsrVO.getSbmtYn1()); + System.out.println(adrSbmtLineMgrUsrVO.getSbmtYn2()); + System.out.println(adrSbmtLineMgrUsrVO.getSbmtYn3()); + + System.out.println(adrSbmtLineMgrUsrVO.getSbmtId1()); + System.out.println(adrSbmtLineMgrUsrVO.getSbmtId2()); + System.out.println(adrSbmtLineMgrUsrVO.getSbmtId3()); + + System.out.println(adrSbmtLineMgrUsrVO.getSbsttSbmtId1()); + System.out.println(adrSbmtLineMgrUsrVO.getSbsttSbmtId2()); + System.out.println(adrSbmtLineMgrUsrVO.getSbsttSbmtId3()); + + System.out.println("adrSbmtLineMgrUsrVO.getSbmtYn1()-end"); + + AdjReqMgrVO arv = new AdjReqMgrVO(); + + //history 테이블에서 관련 테이블의 상세한 정보를 찾기 위해서 필요한 값들. + //arv.setRefSeq1(aprvlMgrVO.getRefSeq1()); + //arv.setRefSeq2(aprvlMgrVO.getRefSeq2()); + + + + //로그인 정보 획득 - ssoLoginVO 사용 + LoginVO loginVO = checkLoginUtil.getLoginVO(); + + /* + * 1.결재선 확인 + * 2.조정사건결재에 저장 + * 3.조정부 테이블에 저장 + * 4.마스터 상태값 변경 + * 5.결과 통보 + */ + + //step.1.결재선 확인======================================================================= + /* + AprvlLineMgrVO aprvlLineMgrVO = new AprvlLineMgrVO(); + aprvlLineMgrVO.setSbmtTyCd(adrSbmtLineMgrUsrVO.getSbmtTyCd()); + aprvlLineMgrVO = aprvlLineMgrService.selectDetail(aprvlLineMgrVO); + + if (aprvlLineMgrVO==null) { + modelAndView.addObject("result", "FAIL"); + modelAndView.addObject("message", "요청하신 결재선이 없습니다.-step1"); + + return modelAndView; + } + */ + AprvlMgrVO aprvlMgrVO = new AprvlMgrVO(); + aprvlMgrVO.setAdrSeq(adrSbmtLineMgrUsrVO.getAdrSeq()); + aprvlMgrVO.setAdrSn(adrSbmtLineMgrUsrVO.getAdrSn()); + aprvlMgrVO.setSbmtSeq(adrSbmtLineMgrUsrVO.getSbmtSeq()); + //aprvlMgrVO.setSbmtTyCd(adrSbmtLineMgrUsrVO.getSbmtTyCd()); + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + + //step.2.조정사건결재에 저장======================================================================= + int i = 0; + //조정사건결재 추가 + aprvlMgrVO.setFrstRegisterId(loginVO.getUniqId()); + aprvlMgrVO.setLastUpdusrId(loginVO.getUniqId()); + //aprvlMgrVO.setSbmtMemTy("10"); //조정부결재구분 10-대부분은 승인, 3개만 20-결재 -201010/202010/309010 + /* + if ( + "201010".equals(aprvlMgrVO.getSbmtTy()) + || "202010".equals(aprvlMgrVO.getSbmtTy()) + || "309010".equals(aprvlMgrVO.getSbmtTy()) + ) { + aprvlMgrVO.setSbmtMemTy("20"); //조정부결재구분 10-대부분은 승인, 3개만 20-결재 -201010/202010/309010 + } + */ + + /* + System.out.println(adrSbmtLineMgrUsrVO.getSbmtId1()); + System.out.println(adrSbmtLineMgrUsrVO.getSbmtId2()); + System.out.println(adrSbmtLineMgrUsrVO.getSbmtId3()); + System.out.println(adrSbmtLineMgrUsrVO.getSbmtId4()); + System.out.println(adrSbmtLineMgrUsrVO.getSbmtId5()); + System.out.println(adrSbmtLineMgrUsrVO.getSbmtId6()); + */ + + //조정사건결재 내용 추가해주기 + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + i = aprvlMgrService.updateAdrSbmtMgr202210(aprvlMgrVO + , "조정진행관리>>결재및대결관리목록>결재및대결관리상세>결재수정" //String p_code_desc - CC199 + , "A075" //String p_stat_cd 결재수정 + , s_adrHstryMgrSeq + , adrSbmtLineMgrUsrVO + ); + + //조정부가 있는지 확인 하자. + //aprvlMgrVO = aprvlMgrService.selectDetail(aprvlMgrVO); + + + //조정부가 있으면 조정부 추가 + /* + if ( + "60".equals(aprvlMgrVO.getSbmtId1().trim()) + || "60".equals(aprvlMgrVO.getSbmtId2().trim()) + || "60".equals(aprvlMgrVO.getSbmtId3().trim()) + || "60".equals(aprvlMgrVO.getSbmtId4().trim()) + || "60".equals(aprvlMgrVO.getSbmtId5().trim()) + || "60".equals(aprvlMgrVO.getSbmtId6().trim()) + ) { + aprvlMgrService.deleteDetail(aprvlMgrVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + i = aprvlMgrService.insertAdrSbmtDetailMgr(aprvlMgrVO + , "조정진행관리>>조정진행목록>조정진행상세>결재요청-조정부" //String p_code_desc - CC199 + , "A080" //String p_stat_cd + , s_adrHstryMgrSeq + ); + } + */ + + + //adr_mgr_master & hist 값 넣기 + /* + if(i > 0 ){ + + arv.setAdrSeq(aprvlMgrVO.getAdrSeq()); //조정일련번호 + arv.setAdrSn(aprvlMgrVO.getAdrSn()); //조정일련번호 회차 + arv.setStatCd(aprvlMgrVO.getSbmtTy()); //최종 변경 상태값 + //arv.setLastUpdusrId(loginVO.getId()); //최종 변경자 + arv.setLastUpdusrId(loginVO.getUniqId()); //최종 변경자 + + + + i = kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); + } + */ + + + if (i<=0) { + modelAndView.addObject("status", "success"); + modelAndView.addObject("message", "결재선 생성 실패.-step2"); + + return modelAndView; + } + + + modelAndView.addObject("status", "success"); + }catch(Exception ex) { + modelAndView.addObject("status", "fail"); + modelAndView.addObject("message", "결재선 생성 실패.-step0"); + + } + + + return modelAndView; + } /** * 결재선 없이 his 만 저장용 diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml index 8ee533ba..7f96c43d 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml @@ -916,7 +916,12 @@ s3.tbl_nm AS sbsttTblNm3, '0' AS ord - FROM ( + + , a.sbmt_step_cnt AS sbmtStepCnt + , a.sbmt_yn1 AS sbmtYn1 + , a.sbmt_yn2 AS sbmtYn2 + , a.sbmt_yn3 AS sbmtYn3 + FROM ( SELECT IF(id1 IS null, aaa.sbmt_id1, id1) AS sbmt_id1 , IF(id1 IS null, NULL, aaa.sbmt_id1) AS sbstt_sbmt_id1 @@ -926,6 +931,11 @@ , IF(id3 IS null, aaa.sbmt_id3, id3) AS sbmt_id3 , IF(id3 IS null, NULL, aaa.sbmt_id3) AS sbstt_sbmt_id3 + + , aaa.sbmt_step_cnt + , aaa.sbmt_yn1 + , aaa.sbmt_yn2 + , aaa.sbmt_yn3 FROM ( SELECT a.adr_seq @@ -1007,7 +1017,7 @@ ON(1=1) - ) a + ) a LEFT OUTER JOIN ( SELECT esntl_id, user_nm, 'info' AS tbl_nm FROM lettnemplyrinfo diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtMgrHstry_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtMgrHstry_SQL_Cubrid.xml index 5c89905b..c17cbe3d 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtMgrHstry_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtMgrHstry_SQL_Cubrid.xml @@ -151,6 +151,18 @@ + + + DELETE FROM + + WHERE + adr_seq = #adrSeq# + AND adr_sn = #adrSn# + AND sbmt_seq = #sbmtSeq# + $whereQuery$ + + + + + + + @@ -1268,7 +1307,7 @@ function setSbmtPerson(pram){
    -
  • +
  • 팀장
    @@ -1288,7 +1327,7 @@ function setSbmtPerson(pram){
    • -
  • +
  • 부서장
    @@ -1308,7 +1347,7 @@ function setSbmtPerson(pram){
    • -
  • +
  • 위원장