2022-10-28 15:07 결재선 추가, 상태값 변경 추가

This commit is contained in:
myname 2022-10-28 15:07:25 +09:00
parent 4f708a0d2f
commit dee725243b
27 changed files with 4523 additions and 32 deletions

View File

@ -165,6 +165,9 @@ public class AdjstIncidentVO extends ComDefaultVO implements Serializable {
private String rejectCn;
private String adrOjctDe;
private String codeNm;
private String code;
public String getAdrSeq() {
return adrSeq;
@ -870,6 +873,22 @@ public class AdjstIncidentVO extends ComDefaultVO implements Serializable {
public void setAdrOjctDe(String adrOjctDe) {
this.adrOjctDe = adrOjctDe;
}
public String getCodeNm() {
return codeNm;
}
public void setCodeNm(String codeNm) {
this.codeNm = codeNm;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}

View File

@ -214,12 +214,13 @@ public class PgrCmmServiceImpl implements PgrCmmService {
, p_adrHstryMgrSeq //, String p_adrHstryMgrSeq
, "I" //, String p_useCd I/U/UI/II/RE
, "ADR_CLOSE_DOC" //, String p_tableName
, " WHERE 1=1 AND adr_seq='"+closeVO.getAdrSeq()
+" AND adr_sn='"+closeVO.getAdrSn()
+" AND close_doc_ty='"+closeVO.getCloseDocTy()
+" AND close_doc='"+closeVO.getCloseDoc()
+"' " //, String p_updateQuery
, " WHERE 1=1 "
+ " AND adr_seq='"+closeVO.getAdrSeq()+"'"
+" AND adr_sn='"+closeVO.getAdrSn()+"'"
+" AND close_doc_ty='"+closeVO.getCloseDocTy()+"'"
+" AND close_doc='"+closeVO.getCloseDoc()+"'"
+" " //, String p_updateQuery
);
//adr_hstry_mgr에 넣기 -
}

View File

@ -681,6 +681,64 @@ public class AdjReqMgrOffLineController {
*/
}
//결재선 tree 리스트 정보 가져오기 - 502030
@RequestMapping("/kccadr/adjReqMgOff/adjReqMgrOffAppReqPop502030Ajax.do")
public void adjReqMgrOffAppReqPop502030Ajax(
@ModelAttribute("searchVO") CmmnDetailCodeVO searchVO
, ModelMap model
, HttpServletResponse response
, HttpServletRequest request
) throws Exception {
ObjectMapper mapper = new ObjectMapper();
//response.setHeader("Content-Type", "text/html;charset=utf-8");
PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8"));
//1depth로 사용자 정보 가져오기
List<CmmnDetailCodeVO> resultList = null;
CmmnDetailCodeVO topCmmnDetailCodeVO = new CmmnDetailCodeVO();
topCmmnDetailCodeVO.setParent("#");
topCmmnDetailCodeVO.setId("0");
if ("CC401".equals(searchVO.getId())) {
topCmmnDetailCodeVO.setText("직급별");
resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithPerson502030(searchVO) ;
System.out.println("직급별");
//조정부장 복호화 할것.
for (int i=0;i<resultList.size();i++) {
CmmnDetailCodeVO result = resultList.get(i);
if ("50".equals(result.getParent())) { //조정부장은 이름 복호화 할것.
result.setText(egovCryptoUtil.decrypt(result.getText()));
resultList.set(i, result);
}
}
}else if ("CC402".equals(searchVO.getId())) {
topCmmnDetailCodeVO.setText("부서별");
resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithPerson502030Dept(searchVO) ;
System.out.println("부서별");
//조정부장 복호화 할것.
for (int i=0;i<resultList.size();i++) {
CmmnDetailCodeVO result = resultList.get(i);
if (result.getParent().indexOf("MEM_")==0) { //조정부장은 이름 복호화 할것.
result.setText(egovCryptoUtil.decrypt(result.getText()));
resultList.set(i, result);
}
}
}
resultList.add(0, topCmmnDetailCodeVO);
mapper.writeValue(out, resultList);
out.flush();
}
/**
* 매뉴 정보를 조회한다.
*

View File

@ -85,6 +85,39 @@ public class AdvcAprvlController {
return "kccadr/advcAprvl/popup/advcAprvlReqPop";
}
@RequestMapping("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do")
public String adjReqMgrOffAppReqPop30(
@ModelAttribute("AdrSbmtLineMgrUsrVO") AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO
//, @ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO
, ModelMap model
) throws Exception {
return "kccadr/advcAprvl/popup/advcAprvlReqPop30";
}
@RequestMapping("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do")
public String adjReqMgrOffAppReqPop50(
@ModelAttribute("AdrSbmtLineMgrUsrVO") AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO
//, @ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO
, ModelMap model
) throws Exception {
return "kccadr/advcAprvl/popup/advcAprvlReqPop50";
}
@RequestMapping("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do")
public String adjReqMgrOffAppReqPop502030(
@ModelAttribute("AdrSbmtLineMgrUsrVO") AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO
//, @ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO
, ModelMap model
) throws Exception {
return "kccadr/advcAprvl/popup/advcAprvlReqPop502030";
}
/**
* auth : 이준호
* 결재선 지정 팝업

View File

@ -40,8 +40,10 @@ public interface AdrSbmtLineMgrUsrService {
//L page
List<AdrSbmtLineMgrUsrVO> selectPagingList(AdrSbmtLineMgrUsrVO vo) throws Exception;
//L-기본결재선
//L-기본결재선203040
AdrSbmtLineMgrUsrVO selectDefault(AdrSbmtLineMgrUsrVO vo) throws Exception;
//502030
AdrSbmtLineMgrUsrVO selectDefault502030(AdrSbmtLineMgrUsrVO vo) throws Exception;
//L-대결결재선
AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO vo) throws Exception;

View File

@ -61,6 +61,10 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable {
private String step; //'결재진행단계',
private String memName1; //'결재자1-조정부장이름',
private String memName2; //'결재자2-조정부장이름',
private String memName3; //'결재자3-조정부장이름',
public String getRegisterId() {
return registerId;
}
@ -301,4 +305,22 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable {
public void setStep(String step) {
this.step = step;
}
public String getMemName1() {
return memName1;
}
public void setMemName1(String memName1) {
this.memName1 = memName1;
}
public String getMemName2() {
return memName2;
}
public void setMemName2(String memName2) {
this.memName2 = memName2;
}
public String getMemName3() {
return memName3;
}
public void setMemName3(String memName3) {
this.memName3 = memName3;
}
}

View File

@ -181,6 +181,10 @@ public class AdrSbmtLineMgrUsrDAO extends EgovAbstractDAO {
return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectDefault", VO);
}
public AdrSbmtLineMgrUsrVO selectDefault502030(AdrSbmtLineMgrUsrVO VO) throws Exception {
return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectDefault502030", VO);
}
public AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO VO) throws Exception {
return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectSbstt", VO);
}

View File

@ -125,6 +125,9 @@ public class AdrSbmtLineMgrUsrServiceImpl implements AdrSbmtLineMgrUsrService {
public AdrSbmtLineMgrUsrVO selectDefault(AdrSbmtLineMgrUsrVO VO) throws Exception{
return adrSbmtLineMgrUsrDAO.selectDefault(VO);
}
public AdrSbmtLineMgrUsrVO selectDefault502030(AdrSbmtLineMgrUsrVO VO) throws Exception{
return adrSbmtLineMgrUsrDAO.selectDefault502030(VO);
}
public AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO VO) throws Exception{
return adrSbmtLineMgrUsrDAO.selectSbstt(VO);

View File

@ -162,6 +162,55 @@ public class AprvlMgr202210Controller {
}
return modelAndView;
}
/**
* 결재 상태 저장 1단계
* 1.결재선 확인
* 2.조정사건결재에 저장
* 3.조정부 테이블에 저장
* 4.마스터 상태값 변경
* 5.결과 통보
*/
@RequestMapping(value="/kccadr/aprvlMgr202210/aprvl/saveDefaultAprvl502030Step1Ajax.do")
public ModelAndView saveDefaultAprvl502030Step1Ajax(
HttpServletRequest request
, AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO
) throws Exception {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
//System.out.println("adjstReqStatusTabStatusStep1Ajax");
try {
//로그인 정보 획득 - ssoLoginVO 사용
LoginVO loginVO = checkLoginUtil.getLoginVO();
//step1.기본 결재선 저장
adrSbmtLineMgrUsrVO.setRegisterId(loginVO.getUniqId()); //사용 대상자
adrSbmtLineMgrUsrVO.setFrstRegisterId(loginVO.getUniqId()); //등록자
//adrSbmtLineMgrUsrVO.setSbmtTyCd("000000");//000000-공통으로 관리 한다.
adrSbmtLineMgrUsrService.insert(
adrSbmtLineMgrUsrVO
, "관리자>>결재선>기본결재선등록" //String p_code_desc - CC199
, "A001" //String p_stat_cd
, ""
);
modelAndView.addObject("status", "success");
}catch(Exception ex) {
modelAndView.addObject("status", "fail");
modelAndView.addObject("message", "기본 결재선 생성 실패.-step0");
}
return modelAndView;
}
@ -506,6 +555,98 @@ public class AprvlMgr202210Controller {
}
//결재선 tree 기본결재선 가져오기 - 502030 : 조정부장
@RequestMapping("/kccadr/aprvlMgr202210/advcAprvlReqDefaultLoad502030Ajax.do")
public ModelAndView advcAprvlReqDefaultLoad502030Ajax(
AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO
, ModelMap model
, HttpServletResponse response
, HttpServletRequest request
) throws Exception {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
/*
ObjectMapper mapper = new ObjectMapper();
//response.setHeader("Content-Type", "text/html;charset=utf-8");
PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8"));
*/
//1depth로 사용자 정보 가져오기
AdrSbmtLineMgrUsrVO resultData = null;
try {
//로그인 정보 획득 - ssoLoginVO 사용
LoginVO loginVO = checkLoginUtil.getLoginVO();
adrSbmtLineMgrUsrVO.setRegisterId(loginVO.getUniqId());
resultData = adrSbmtLineMgrUsrService.selectDefault502030(adrSbmtLineMgrUsrVO);
//조정부장인 경우 이름 처리를 한다.
if ("".equals(resultData.getUserNm1()) || resultData.getUserNm1()==null) {
resultData.setUserNm1(egovCryptoUtil.decrypt(resultData.getMemName1()));
}
modelAndView.addObject("result", "success");
modelAndView.addObject("resultData", resultData);
}catch(Exception ex) {
modelAndView.addObject("result", "fail");
modelAndView.addObject("message", "결재선 생성 실패.-step0");
}
//mapper.writeValue(out, resultList);
//out.flush();
return modelAndView;
}
//결재선 tree 기본결재선 가져오기 - 30 : 부서장
@RequestMapping("/kccadr/aprvlMgr202210/advcAprvlReqDefaultLoad30Ajax.do")
public ModelAndView advcAprvlReqDefaultLoad30Ajax(
AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO
, ModelMap model
, HttpServletResponse response
, HttpServletRequest request
) throws Exception {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
/*
ObjectMapper mapper = new ObjectMapper();
//response.setHeader("Content-Type", "text/html;charset=utf-8");
PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8"));
*/
//1depth로 사용자 정보 가져오기
AdrSbmtLineMgrUsrVO resultData = null;
try {
//로그인 정보 획득 - ssoLoginVO 사용
LoginVO loginVO = checkLoginUtil.getLoginVO();
adrSbmtLineMgrUsrVO.setRegisterId(loginVO.getUniqId());
resultData = adrSbmtLineMgrUsrService.selectDefault502030(adrSbmtLineMgrUsrVO);
//조정부장인 경우 이름 처리를 한다.
if ("".equals(resultData.getUserNm1()) || resultData.getUserNm1()==null) {
resultData.setUserNm1(egovCryptoUtil.decrypt(resultData.getMemName1()));
}
modelAndView.addObject("result", "success");
modelAndView.addObject("resultData", resultData);
}catch(Exception ex) {
modelAndView.addObject("result", "fail");
modelAndView.addObject("message", "결재선 생성 실패.-step0");
}
//mapper.writeValue(out, resultList);
//out.flush();
return modelAndView;
}
//결재선 tree 대결자 정보 가져오기
@RequestMapping("/kccadr/aprvlMgr202210/advcSbsttAprvlReqDefaultLoadAjax.do")
public ModelAndView advcSbsttAprvlReqDefaultLoadAjax(

View File

@ -92,9 +92,16 @@ public interface EgovCcmCmmnDetailCodeManageService {
List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithCodeDept(CmmnDetailCodeVO searchVO) throws Exception;
//직급별 tree 생성을 위한 리스트들
//203040
List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPerson(CmmnDetailCodeVO searchVO) throws Exception;
//502030 : 50-조정부장
List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPerson502030(CmmnDetailCodeVO searchVO) throws Exception;
//부서별 tree 생성을 위한 리스트들
List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPersonDept(CmmnDetailCodeVO searchVO) throws Exception;
//502030 : 50-조정부장
List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPerson502030Dept(CmmnDetailCodeVO searchVO) throws Exception;
void updateCmmnDetailCodePk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception;

View File

@ -143,11 +143,21 @@ public class CmmnDetailCodeManageDAO extends EgovAbstractDAO {
return (List<CmmnDetailCodeVO>) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson", searchVO);
}
@SuppressWarnings("unchecked")
public List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPerson502030(CmmnDetailCodeVO searchVO) throws Exception{
return (List<CmmnDetailCodeVO>) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson502030", searchVO);
}
@SuppressWarnings("unchecked")
public List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPersonDept(CmmnDetailCodeVO searchVO) throws Exception{
return (List<CmmnDetailCodeVO>) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPersonDept", searchVO);
}
@SuppressWarnings("unchecked")
public List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPerson502030Dept(CmmnDetailCodeVO searchVO) throws Exception{
return (List<CmmnDetailCodeVO>) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson502030Dept", searchVO);
}
public void updateCmmnDetailCodePk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception{
update("CmmnDetailCodeManageDAO.updateCmmnDetailCodePk", cmmnDetailCodeVO);
}

View File

@ -152,12 +152,22 @@ public class EgovCcmCmmnDetailCodeManageServiceImpl extends EgovAbstractServiceI
public List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPerson(CmmnDetailCodeVO searchVO) throws Exception {
return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson(searchVO);
}
@Override
public List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPerson502030(CmmnDetailCodeVO searchVO) throws Exception {
return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson502030(searchVO);
}
@Override
public List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPersonDept(CmmnDetailCodeVO searchVO) throws Exception {
return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPersonDept(searchVO);
}
@Override
public List<CmmnDetailCodeVO> selectCmmnDetailCodeListWithPerson502030Dept(CmmnDetailCodeVO searchVO) throws Exception {
return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson502030Dept(searchVO);
}
@Override
public void updateCmmnDetailCodePk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception {
cmmnDetailCodeManageDAO.updateCmmnDetailCodePk(cmmnDetailCodeVO);

View File

@ -206,6 +206,9 @@
,DTL.APP_YN AS appYn
,DEPT.MEM_DEPT_NM AS memDeptNm
,USR.USER_NM AS adrAdmNm
, advc.codeNm
, advc.code
FROM (
SELECT
ADR_SEQ
@ -264,6 +267,35 @@
) rppl
ON RS.ADR_SEQ = rppl.ADR_SEQ
LEFT OUTER JOIN (
SELECT bb.adr_seq
, cc.code_nm codeNm
, cc.code
FROM (
/* 이력중에 코드값이 있는 최근 값을 필터링한다. */
SELECT b.adr_seq, MAX(adr_hstry_mgr_seq) adr_hstry_mgr_seq
FROM ADR_MGR_MASTER a
, adr_hstry_mgr b
, lettccmmndetailcode c
WHERE a.adr_seq=b.adr_seq
AND b.menu_id=c.code
AND length(b.menu_id)=6
AND c.code_id='CC013'
GROUP BY b.adr_seq
)aa
, adr_hstry_mgr bb
, lettccmmndetailcode cc
WHERE 1=1
AND aa.adr_seq=bb.adr_seq
AND aa.adr_hstry_mgr_seq=bb.adr_hstry_mgr_seq
AND cc.code_id='CC013'
AND bb.menu_id=cc.code
) advc
ON RS.ADR_SEQ = advc.ADR_SEQ
WHERE 1=1
<isNotEmpty property="searchKeyword">
<isEqual prepend="AND" property="searchCondition" compareValue="1">

View File

@ -361,10 +361,10 @@
IF(MAX(sbmt_line_cnt)>=6,'A',NULL) AS sbmtYn6 ,
NULL AS sbmtDe6 ,
NOW() AS frstRegistPnttm ,
'USRCNFRM_00000002060' AS frstRegisterId ,
#frstRegisterId# AS frstRegisterId ,
NULL AS lastUpdtPnttm ,
NULL AS lastUpdusrId
FROM ( SELECT 'ADR_0000000000003231' adr_seq ,
FROM ( SELECT #adrSeq# adr_seq ,
'1' adr_sn ,
cc.* ,
CONCAT( IF(num=1, IF(sbmt_grade_cd1='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=2, IF(sbmt_grade_cd2='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=3, IF(sbmt_grade_cd3='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=4, IF(sbmt_grade_cd4='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=5, IF(sbmt_grade_cd5='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=6, IF(sbmt_grade_cd6='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) ) sbmt_id
@ -445,8 +445,8 @@
adr_mem_dept_mgr b ,
adr_mem_dept_map c ,
adr_mem_mgr d
WHERE a.adr_seq ='ADR_0000000000003231'
AND a.adr_sn ='1'
WHERE a.adr_seq =#adrSeq#
AND a.adr_sn =#adrSn#
AND a.mem_dept_seq=b.mem_dept_seq
AND b.mem_dept_seq=c.mem_dept_seq
AND c.mem_grade ='01'
@ -494,14 +494,14 @@
,
( SELECT IFNULL(MAX(sbmt_seq),0)+1 sbmt_seq
FROM adr_sbmt_mgr
WHERE adr_seq='ADR_0000000000003231'
WHERE adr_seq=#adrSeq#
AND adr_sn ='1'
)
dd
LEFT OUTER JOIN
( SELECT MAX(last_updusr_id) usr_101050
FROM adr_hstry a
WHERE adr_seq='ADR_0000000000003231'
WHERE adr_seq=#adrSeq#
AND stat_cd='101050'
)
ee
@ -552,6 +552,316 @@
</select>
<!-- 정보 L -->
<select id="AdrSbmtLineMgrUsrDAO.selectDefault502030" parameterClass="AdrSbmtLineMgrUsrVO" resultClass="AdrSbmtLineMgrUsrVO">
SELECT *
FROM (
SELECT
a.sbmt_id1 AS sbmtId1
, b1.user_nm userNm1
, a.sbmt_id2 AS sbmtId2
, b2.user_nm userNm2
, a.sbmt_id3 AS sbmtId3
, b3.user_nm userNm3
, a.sbstt_sbmt_id1 AS sbsttSbmtId1
, s1.user_nm sbsttUserNm1
, a.sbstt_sbmt_id2 AS sbsttSbmtId2
, s2.user_nm sbsttUserNm2
, a.sbstt_sbmt_id3 AS sbsttSbmtId3
, s3.user_nm sbsttUserNm3
, '0' AS ord
, c1.mem_name memName1
, c2.mem_name memName2
, c3.mem_name memName3
FROM adr_sbmt_line_mgr_usr a
LEFT OUTER JOIN lettnemplyrinfo b1
ON(a.sbmt_id1=b1.esntl_id)
LEFT OUTER JOIN lettnemplyrinfo b2
ON(a.sbmt_id2=b2.esntl_id)
LEFT OUTER JOIN lettnemplyrinfo b3
ON(a.sbmt_id3=b3.esntl_id)
LEFT OUTER JOIN ADR_MEM_MGR c1
ON(a.sbmt_id1=c1.mem_seq)
LEFT OUTER JOIN ADR_MEM_MGR c2
ON(a.sbmt_id2=c2.mem_seq)
LEFT OUTER JOIN ADR_MEM_MGR c3
ON(a.sbmt_id3=c3.mem_seq)
LEFT OUTER JOIN lettnemplyrinfo s1
ON(a.sbstt_sbmt_id1=s1.esntl_id)
LEFT OUTER JOIN lettnemplyrinfo s2
ON(a.sbstt_sbmt_id2=s2.esntl_id)
LEFT OUTER JOIN lettnemplyrinfo s3
ON(a.sbstt_sbmt_id3=s3.esntl_id)
WHERE a.register_id = #registerId#
AND sbmt_ty_cd = #sbmtTyCd#
UNION ALL
SELECT
aaaaa.sbmtId1
, b1.user_nm userNm1
, aaaaa.sbmtId2
, b2.user_nm userNm2
, aaaaa.sbmtId3
, b3.user_nm userNm3
, '' sbsttSbmtId1
, '' sbsttUserNm1
, '' sbsttSbmtId2
, '' sbsttUserNm2
, '' sbsttSbmtId3
, '' sbsttUserNm3
/*
, a.sbmt_id2 AS sbmtId2
, b2.user_nm userNm2
, a.sbmt_id3 AS sbmtId3
, b3.user_nm userNm3
, a.sbstt_sbmt_id1 AS sbsttSbmtId1
, s1.user_nm sbsttUserNm1
, a.sbstt_sbmt_id2 AS sbsttSbmtId2
, s2.user_nm sbsttUserNm2
, a.sbstt_sbmt_id3 AS sbsttSbmtId3
, s3.user_nm sbsttUserNm3
*/
, '1' AS ord
, c1.mem_name memName1
, c2.mem_name memName2
, c3.mem_name memName3
FROM (
SELECT *
FROM ( SELECT adr_seq AS adrSeq ,
adr_sn AS adrSn ,
MAX(sbmt_seq) AS sbmtSeq ,
MAX(sbmt_ty_cd) AS sbmtTy ,
'10'
/* 10- 조정종결만 */
AS sbmtMemTy ,
MAX(sbmt_line_cnt) AS sbmtStepCnt ,
MAX(IF(num =1,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd1)),NULL)) AS sbmtId1 ,
IF(MAX(sbmt_line_cnt)>=1,'A',NULL) AS sbmtYn1 ,
NULL AS sbmtDe1 ,
MAX(IF(num =2,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd2)),NULL)) AS sbmtId2 ,
IF(MAX(sbmt_line_cnt)>=2,'A',NULL) AS sbmtYn2 ,
NULL AS sbmtDe2 ,
MAX(IF(num =3,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd3)),NULL)) AS sbmtId3 ,
IF(MAX(sbmt_line_cnt)>=3,'A',NULL) AS sbmtYn3 ,
NULL AS sbmtDe3 ,
MAX(IF(num =4,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd4)),NULL)) AS sbmtId4 ,
IF(MAX(sbmt_line_cnt)>=4,'A',NULL) AS sbmtYn4 ,
NULL AS sbmtDe4 ,
MAX(IF(num =5,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd5)),NULL)) AS sbmtId5 ,
IF(MAX(sbmt_line_cnt)>=5,'A',NULL) AS sbmtYn5 ,
NULL AS sbmtDe5 ,
MAX(IF(num =6,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd6)),NULL)) AS sbmtId6 ,
IF(MAX(sbmt_line_cnt)>=6,'A',NULL) AS sbmtYn6 ,
NULL AS sbmtDe6 ,
NOW() AS frstRegistPnttm ,
#frstRegisterId# AS frstRegisterId ,
NULL AS lastUpdtPnttm ,
NULL AS lastUpdusrId
FROM ( SELECT #adrSeq# adr_seq ,
'1' adr_sn ,
cc.* ,
CONCAT( IF(num=1, IF(sbmt_grade_cd1='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=2, IF(sbmt_grade_cd2='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=3, IF(sbmt_grade_cd3='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=4, IF(sbmt_grade_cd4='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=5, IF(sbmt_grade_cd5='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=6, IF(sbmt_grade_cd6='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) ) sbmt_id
/* , bb.sbmt_id */
,
aa.* ,
dd.*
FROM ( SELECT b.* ,
a.*
FROM adr_sbmt_line_mgr a
/*기준 결재선 */
,
( SELECT 1 AS NUM
UNION ALL
SELECT 2
UNION ALL
SELECT 3
UNION ALL
SELECT 4
UNION ALL
SELECT 5
UNION ALL
SELECT 6
)
b
WHERE 1 =1
AND a.sbmt_ty_cd =#sbmtTyCd#
AND a.sbmt_line_cnt>=b.NUM
)
aa
LEFT OUTER JOIN adr_sbmt_grade_mgr bb
/* 기본 결재자 연결 */
ON (
(
aa.sbmt_grade_cd1=bb.sbmt_grade_cd
AND aa.num =1
)
OR
(
aa.sbmt_grade_cd2=bb.sbmt_grade_cd
AND aa.num =2
)
OR
(
aa.sbmt_grade_cd3=bb.sbmt_grade_cd
AND aa.num =3
)
OR
(
aa.sbmt_grade_cd4=bb.sbmt_grade_cd
AND aa.num =4
)
OR
(
aa.sbmt_grade_cd5=bb.sbmt_grade_cd
AND aa.num =5
)
OR
(
aa.sbmt_grade_cd6=bb.sbmt_grade_cd
AND aa.num =6
)
)
LEFT OUTER JOIN
( SELECT c.mem_grade,
d.mem_seq
FROM adr_mgr_detail a ,
adr_mem_dept_mgr b ,
adr_mem_dept_map c ,
adr_mem_mgr d
WHERE a.adr_seq =#adrSeq#
AND a.adr_sn =#adrSn#
AND a.mem_dept_seq=b.mem_dept_seq
AND b.mem_dept_seq=c.mem_dept_seq
AND c.mem_grade ='01'
AND c.mem_seq =d.mem_seq
)
cc
ON (
(
aa.sbmt_grade_cd1='50'
AND cc.mem_grade ='01'
AND aa.num =1
)
OR
(
aa.sbmt_grade_cd2='50'
AND cc.mem_grade ='01'
AND aa.num =2
)
OR
(
aa.sbmt_grade_cd3='50'
AND cc.mem_grade ='01'
AND aa.num =3
)
OR
(
aa.sbmt_grade_cd4='50'
AND cc.mem_grade ='01'
AND aa.num =4
)
OR
(
aa.sbmt_grade_cd5='50'
AND cc.mem_grade ='01'
AND aa.num =5
)
OR
(
aa.sbmt_grade_cd6='50'
AND cc.mem_grade ='01'
AND aa.num =6
)
)
/* 조정부장 연결 */
,
( SELECT IFNULL(MAX(sbmt_seq),0)+1 sbmt_seq
FROM adr_sbmt_mgr
WHERE adr_seq=#adrSeq#
AND adr_sn ='1'
)
dd
LEFT OUTER JOIN
( SELECT MAX(last_updusr_id) usr_101050
FROM adr_hstry a
WHERE adr_seq=#adrSeq#
AND stat_cd='101050'
)
ee
ON (
1=1
)
)
aaa
GROUP BY adr_seq,
adr_sn
)
aaaa
WHERE 1=1
AND
(
TRIM(aaaa.sbmtId1)!='50' OR aaaa.sbmtId1 IS NULL
)
AND
(
TRIM(aaaa.sbmtId2)!='50' OR aaaa.sbmtId2 IS NULL
)
AND
(
TRIM(aaaa.sbmtId3)!='50' OR aaaa.sbmtId3 IS NULL
)
AND
(
TRIM(aaaa.sbmtId4)!='50' OR aaaa.sbmtId4 IS NULL
)
AND
(
TRIM(aaaa.sbmtId5)!='50' OR aaaa.sbmtId5 IS NULL
)
AND
(
TRIM(aaaa.sbmtId6)!='50' OR aaaa.sbmtId6 IS NULL
)
)aaaaa
LEFT OUTER JOIN lettnemplyrinfo b1
ON(aaaaa.sbmtId1=b1.esntl_id)
LEFT OUTER JOIN lettnemplyrinfo b2
ON(aaaaa.sbmtId2=b2.esntl_id)
LEFT OUTER JOIN lettnemplyrinfo b3
ON(aaaaa.sbmtId3=b3.esntl_id)
LEFT OUTER JOIN ADR_MEM_MGR c1
ON(aaaaa.sbmtId1=c1.mem_seq)
LEFT OUTER JOIN ADR_MEM_MGR c2
ON(aaaaa.sbmtId2=c2.mem_seq)
LEFT OUTER JOIN ADR_MEM_MGR c3
ON(aaaaa.sbmtId3=c3.mem_seq)
)aaaaaa
ORDER BY aaaaaa.ord
LIMIT 1
</select>
<!-- 정보 L -->
<select id="AdrSbmtLineMgrUsrDAO.selectSbstt" parameterClass="AdrSbmtLineMgrUsrVO" resultClass="AdrSbmtLineMgrUsrVO">
SELECT a.sbmt_id1 AS sbmtId1 ,

View File

@ -589,7 +589,184 @@
]]>
</select>
<select id="CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson502030" parameterClass="CmmnDetailCodeVO" resultClass="CmmnDetailCodeVO">
/* 502030 */
<![CDATA[
SELECT *
FROM (
SELECT *
FROM (
SELECT CODE_NM AS text ,
CODE AS id ,
'0' AS parent ,
USE_AT AS useAt,
SORT AS sort
FROM LETTCCMMNDETAILCODE
WHERE CODE_ID=#id#
/* 조정부장용 하드코딩 */
UNION ALL
SELECT '조정부장','50','0','Y','4'
/* two depth */
UNION ALL
SELECT b.code_nm ,
b.code ,
'0' ,
b.use_at ,
b.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
/* three depth */
UNION ALL
SELECT c.code_nm ,
c.code ,
'0' ,
c.use_at ,
c.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
/* four depth */
UNION ALL
SELECT d.code_nm ,
d.code ,
'0' ,
d.use_at ,
d.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c ,
LETTCCMMNDETAILCODE_dept d
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
AND c.code =d.code_id
/* five depth */
UNION ALL
SELECT e.code_nm ,
e.code ,
'0' ,
e.use_at ,
e.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c ,
LETTCCMMNDETAILCODE_dept d ,
LETTCCMMNDETAILCODE_dept e
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
AND c.code =d.code_id
AND d.code =e.code_id
)
A
/* 소속 사람들 */
UNION ALL
SELECT b.user_nm, b.esntl_id, a.id, a.useAt, a.sort
/*
SELECT a.text, a.id, a.parent, a.useAt, a.sort
, b.*
*/
FROM (
/* SELECT CL_CODE_NM AS text , CL_CODE AS id , '0' AS parent , USE_AT AS useAt , '' as sort FROM LETTCCMMNCLCODE UNION SELECT CODE_ID_NM AS text , CODE_ID AS id , '0' AS parent, USE_AT AS useAt, '' as sort FROM LETTCCMMNCODE
WHERE CODE_ID=id UNION */
/* one depth */
SELECT CODE_NM AS text ,
CODE AS id ,
'0' AS parent ,
USE_AT AS useAt,
SORT AS sort
FROM LETTCCMMNDETAILCODE
WHERE CODE_ID=#id#
/* two depth */
UNION ALL
SELECT b.code_nm ,
b.code ,
a.code ,
b.use_at ,
b.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
/* three depth */
UNION ALL
SELECT c.code_nm ,
c.code ,
b.code ,
c.use_at ,
c.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
/* four depth */
UNION ALL
SELECT d.code_nm ,
d.code ,
c.code ,
d.use_at ,
d.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c ,
LETTCCMMNDETAILCODE_dept d
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
AND c.code =d.code_id
/* five depth */
UNION ALL
SELECT e.code_nm ,
e.code ,
d.code ,
e.use_at ,
e.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c ,
LETTCCMMNDETAILCODE_dept d ,
LETTCCMMNDETAILCODE_dept e
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
AND c.code =d.code_id
AND d.code =e.code_id
)
A , lettnemplyrinfo b
WHERE a.id=b.ofcps_nm
UNION all
SELECT a.mem_name, a.mem_seq, '50' id,a.mem_appr_yn,0
FROM ADR_MEM_MGR a
WHERE a.mem_appr_yn='Y'
)aa
ORDER BY Aa.parent ,
Aa.sort+0
]]>
</select>
<select id="CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPersonDept" parameterClass="CmmnDetailCodeVO" resultClass="CmmnDetailCodeVO">
<![CDATA[
SELECT *
@ -767,6 +944,216 @@
]]>
</select>
<select id="CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson502030Dept" parameterClass="CmmnDetailCodeVO" resultClass="CmmnDetailCodeVO">
<![CDATA[
SELECT *
FROM (
SELECT *
FROM (
SELECT CODE_NM AS text ,
CODE AS id ,
'0' AS parent ,
USE_AT AS useAt,
SORT AS sort
FROM LETTCCMMNDETAILCODE
WHERE CODE_ID=#id#
/* 조정부장들부서 */
UNION ALL
SELECT mem_dept_nm, mem_dept_seq, '0', use_yn, 10
FROM ADR_MEM_DEPT_MGR
WHERE use_yn='Y'
/* two depth */
UNION ALL
SELECT b.code_nm ,
b.code ,
'0' ,
b.use_at ,
b.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
/* three depth */
UNION ALL
SELECT c.code_nm ,
c.code ,
'0' ,
c.use_at ,
c.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
/* four depth */
UNION ALL
SELECT d.code_nm ,
d.code ,
'0' ,
d.use_at ,
d.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c ,
LETTCCMMNDETAILCODE_dept d
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
AND c.code =d.code_id
/* five depth */
UNION ALL
SELECT e.code_nm ,
e.code ,
'0' ,
e.use_at ,
e.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c ,
LETTCCMMNDETAILCODE_dept d ,
LETTCCMMNDETAILCODE_dept e
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
AND c.code =d.code_id
AND d.code =e.code_id
)
A
/* 소속 사람들 */
UNION ALL
SELECT c.user_nm
, c.esntl_id
, b.dept_ty
, a.useAt
, a.sort
/*
SELECT b.user_nm, b.esntl_id, a.id, a.useAt, a.sort
SELECT a.text, a.id, a.parent, a.useAt, a.sort
, b.*
*/
FROM (
/* SELECT CL_CODE_NM AS text , CL_CODE AS id , '0' AS parent , USE_AT AS useAt , '' as sort FROM LETTCCMMNCLCODE UNION SELECT CODE_ID_NM AS text , CODE_ID AS id , '0' AS parent, USE_AT AS useAt, '' as sort FROM LETTCCMMNCODE
WHERE CODE_ID=id UNION */
/* one depth */
SELECT CODE_NM AS text ,
CODE AS id ,
'0' AS parent ,
USE_AT AS useAt,
SORT AS sort
FROM LETTCCMMNDETAILCODE
WHERE CODE_ID=#id#
/* two depth */
UNION ALL
SELECT b.code_nm ,
b.code ,
a.code ,
b.use_at ,
b.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
/* three depth */
UNION ALL
SELECT c.code_nm ,
c.code ,
b.code ,
c.use_at ,
c.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
/* four depth */
UNION ALL
SELECT d.code_nm ,
d.code ,
c.code ,
d.use_at ,
d.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c ,
LETTCCMMNDETAILCODE_dept d
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
AND c.code =d.code_id
/* five depth */
UNION ALL
SELECT e.code_nm ,
e.code ,
d.code ,
e.use_at ,
e.sort
FROM LETTCCMMNDETAILCODE a ,
LETTCCMMNDETAILCODE_dept b ,
LETTCCMMNDETAILCODE_dept c ,
LETTCCMMNDETAILCODE_dept d ,
LETTCCMMNDETAILCODE_dept e
WHERE a.CODE_ID=#id#
AND a.code =b.code_id
AND b.code =c.code_id
AND c.code =d.code_id
AND d.code =e.code_id
)
A
, dept_usr_info b
, lettnemplyrinfo c
WHERE a.id=b.dept_ty
AND b.mngr_id=c.emplyr_id
/* 조정부장들 */
UNION ALL
SELECT
/* 조정부장명 */
T2.MEM_NAME AS memName,
/* 조정부장ID */
T2.MEM_SEQ AS memSeq,
T1.MEM_DEPT_SEQ AS memDeptSeq ,
T1.USE_YN ,
10
FROM ADR_MEM_DEPT_MGR T1
INNER JOIN ADR_MEM_DEPT_MAP C
ON T1.MEM_DEPT_SEQ = C.MEM_DEPT_SEQ
INNER JOIN ADR_MEM_MGR T2
ON C.MEM_SEQ = T2.MEM_SEQ
WHERE C.MEM_GRADE = '01'
AND T1.USE_YN = 'Y'
)aa
ORDER BY Aa.parent ,
Aa.sort+0
]]>
</select>
<update id="CmmnDetailCodeManageDAO.updateCmmnDetailCodePk" parameterClass="CmmnDetailCode">
UPDATE LETTCCMMNDETAILCODE
SET CODE_NM = #codeNm#

View File

@ -302,9 +302,32 @@ $(document).ready(function(){
pop.sbmtTyCd.value=param;
//commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
if (param=='201010'){ //20, 30, 40
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
//commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}else if (param=='202010'){ //30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop'));
}else if (param=='204010'
|| param=='205010'
|| param=='302010'
|| param=='303010'
|| param=='304010'
|| param=='305010'
|| param=='306010'
|| param=='307010'
){ //50
//204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop'));
}else if (param=='309010'){ //50, 20, 30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}
}
/* 워크플로우 */
$(function(){
$(".work_flow_wrap .btn_open").click(function(){
@ -459,6 +482,7 @@ $(document).ready(function(){
<c:otherwise>
<button type="button" class="btnType02" onclick="fncGo('dtb/dtbDetail.do')">조정부상세</button>
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('202010');">배당결재요청</button>
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('202010');">배당결재요청(새로운결재선)</button>
</c:otherwise>
</c:choose>
</c:if>
@ -677,6 +701,7 @@ $(document).ready(function(){
|| info.statCd== KccadrConstants.ADR_CLOSE_RETN
}">
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('309010');">종결결재</button>
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('309010');">종결결재(새로운결재선)</button>
</c:if>
<!-- 직권조정결정서 확인 완료 후 -->
@ -704,6 +729,7 @@ $(document).ready(function(){
<c:when test="${not empty resultCloseDoc}">
<!-- <button type="button" class="btnType02" onclick="fncGo('cfrm/cfrmDetail.do');">확정증명원</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('309010');">종결결재</button>
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('309010');">종결결재(새로운결재선)</button>
</c:when>
<c:when test="${ojctCnt == 0 && info.closeDocTy ne '70'}">
<button type="button" class="btnType02" onclick="fncGo('cfrm/cfrmReg.do');">확정증명원 등록</button>

View File

@ -186,11 +186,33 @@ function fncCancelDo(p_a, p_b){
</tr>
</thead>
<tbody>
<!-- 최종 되돌리기 위치를 찾는다. -->
<c:forEach var="list" items="${list_mgr}" varStatus="status">
<c:if test="${fn:length(list.menuId) eq 6}">
<c:if test="${list.menuId*1 gt 200000 and list.menuId*1 ne 201090}">
<c:if test="${list.menuId*1 gt 200000
and list.menuId*1 ne 201090
and list.menuId*1 ne 201050
and list.menuId*1 ne 202050
and list.menuId*1 ne 204050
and list.menuId*1 ne 205050
and list.menuId*1 ne 302050
and list.menuId*1 ne 303050
and list.menuId*1 ne 304050
and list.menuId*1 ne 305050
and list.menuId*1 ne 306050
and list.menuId*1 ne 307050
and list.menuId*1 ne 309050
}"><!--
아래 번호는 skip 대상임
302050 기일조서 결재완료
205050 기일통지서 승인
202050 조정부지정완료
201050 접수결재완료
-->
<c:set var="lastCount" value="${status.count}"/>
@ -239,7 +261,7 @@ function fncCancelDo(p_a, p_b){
<p>
<c:if test="${lastCount eq status.count}">
<a href="javascript:fncCancelDo('${list.adrSeq}','${list.adrHstryMgrSeq}');">되돌리기</a>
<a href="javascript:fncCancelDo('${list.adrSeq}','${list.adrHstryMgrSeq}');">되돌리기</a>${list.menuId}
</c:if>

View File

@ -186,6 +186,38 @@
});
}
//결재선 팝업 - 고도화
function fnc_aprvl_pop(param){
var pop = document.pop;
pop.sbmtTyCd.value=param;
//commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
if (param=='201010'){ //20, 30, 40
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
//commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}else if (param=='202010'){ //30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop'));
}else if (param=='204010'
|| param=='205010'
|| param=='302010'
|| param=='303010'
|| param=='304010'
|| param=='305010'
|| param=='306010'
|| param=='307010'
){ //50
//204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop'));
}else if (param=='309010'){ //50, 20, 30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}
}
//기일통지서제출 일자 업데이트 처리해주기
function updtDntSbmt(){
@ -261,6 +293,16 @@
</script>
</head>
<body>
<!-- 고도화로 추가됨 -->
<form id="pop" name="pop" method="post">
<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${info.adrSeq}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn}" />" />
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<!-- 고도화로 추가됨 -->
<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
</form>
<form id="dlvpop" name="dlvpop" method="post">
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<input type="hidden" id="regNm" name="regNm" />
@ -439,6 +481,7 @@
<c:if test="${info.statCd== KccadrConstants.ADR_APP_CHG_RETN
|| info.statCd== KccadrConstants.ADR_APP_NTC_APPR}">
<button class="btnType02" onclick="fnc_aprvl_step_1('204010'); return false;">기일변경 승인 요청</button>
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('204010');">기일변경 승인 요청(새로운결재선)</button>
<button type="button" class="btnType06" onclick="fncReg()">등록</button>
</c:if>
<%-- 기일변경 통지서 등록화면이라서 송달정보 입력은 주석처리했음 20220126 --%>

View File

@ -224,6 +224,38 @@
});
}
//결재선 팝업 - 고도화
function fnc_aprvl_pop(param){
var pop = document.pop;
pop.sbmtTyCd.value=param;
//commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
if (param=='201010'){ //20, 30, 40
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
//commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}else if (param=='202010'){ //30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop'));
}else if (param=='204010'
|| param=='205010'
|| param=='302010'
|| param=='303010'
|| param=='304010'
|| param=='305010'
|| param=='306010'
|| param=='307010'
){ //50
//204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop'));
}else if (param=='309010'){ //50, 20, 30
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
}
}
function fncPrint() {
var form = document.listForm;
@ -339,6 +371,17 @@
</script>
</head>
<body>
<!-- 고도화로 추가됨 -->
<form id="pop" name="pop" method="post">
<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${info.adrSeq}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn}" />" />
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<!-- 고도화로 추가됨 -->
<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
</form>
<form id="dlvpop" name="dlvpop" method="post">
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<input type="hidden" id="regNm" name="regNm" />
@ -612,6 +655,7 @@
|| info.statCd== KccadrConstants.ADR_APP_ADD
|| info.statCd== KccadrConstants.ADR_APP_CHG_APPR}">
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('205010');">기일통지서 승인 요청</button>
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('205010');">기일통지서 승인 요청(새로운결재선)</button>
<!-- <button type="button" class="btnType06" onclick="fncDel()">삭제</button> -->
<!-- <button type="button" class="btnType06" onclick="fncUpd()">수정</button> -->
</c:if>

View File

@ -1019,7 +1019,7 @@
<div class="btn_wrap btn_layout01">
<div class="area_left">
<%-- 대결버튼은 현재 결재자 이거나 최고관리자인 경우만 나타나게 --%>
<c:if test="${fn:indexOf(info.targetId, LoginVO.uniqId) ne -1 or auth eq 'ROLE_ADMIN'}">
<c:if test="${fn:indexOf(info.targetId, LoginVO.uniqId) ne -1}"><!-- or auth eq 'ROLE_ADMIN' -->
<button type="button" class="btnType02" onclick="fnc_sbstt_aprvl_pop('${info.step}'); return false;">대결</button>
</c:if>
@ -1060,7 +1060,8 @@
<div class="area_right">
<%-- 최고관리자의 경우 결재, 반려 버튼 미노출 --%>
<c:if test="${(info.confirmStatus eq '01' or info.confirmStatus eq '02') and fn:indexOf(info.targetId, LoginVO.uniqId) ne -1
and auth ne 'ROLE_ADMIN'}">
}">
<!-- and auth ne 'ROLE_ADMIN' -->
<button type="button" class="btnType02" onclick="fncReject(); return false;">반려</button>
<button type="button" class="btnType06" onclick="fncConfirm(); return false;">결재</button>
</c:if>

View File

@ -725,6 +725,16 @@
});
}
function fnc_sbstt_aprvl_pop(param){
//commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
var detailForm = document.detailForm;
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcSbsttAprvlReqPop.do", '1000', '700', "sbsttInfoPop", $('#detailForm'));
//var detailForm = document.detailForm;
//commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adrDetailPop.do", "840", "800", "adrDetailPop", $('#detailForm'));
}
</script>
<style>
.tbType02 .btnType02, .tb_tit+.btn_area button{width: 95px; height: 35px; padding: 0; font-size: 17px; vertical-align: baseline;}
@ -1139,7 +1149,7 @@
<div class="btn_wrap btn_layout01">
<div class="area_left">
<%-- 대결버튼은 현재 결재자 이거나 최고관리자인 경우만 나타나게 --%>
<c:if test="${fn:indexOf(info.targetId, LoginVO.uniqId) ne -1 or auth eq 'ROLE_ADMIN'}">
<c:if test="${fn:indexOf(info.targetId, LoginVO.uniqId) ne -1}"><!-- or auth eq 'ROLE_ADMIN' -->
<button type="button" class="btnType02" onclick="fnc_sbstt_aprvl_pop('${info.step}'); return false;">대결</button>
</c:if>
<%-- 취하종결 상세보기 --%>

View File

@ -43,6 +43,7 @@ function jstreeInit() {
"themes" : { "stripes" : true },
"data" : {
"url" : "<c:url value='/kccadr/adjReqMgOff/adjReqMgrOffAppReqPopAjax.do'/>",
//"url" : "<c:url value='/kccadr/adjReqMgOff/adjReqMgrOffAppReqPop502030Ajax.do'/>", //조정부장 포함시 사용할것.
"dataType" : "json",
"data" : function (node) {
console.log("node.id :: " + node.id);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -42,7 +42,8 @@ function jstreeInit() {
"check_callback" : true,
"themes" : { "stripes" : true },
"data" : {
"url" : "<c:url value='/kccadr/adjReqMgOff/adjReqMgrOffAppReqPopAjax.do'/>",
//"url" : "<c:url value='/kccadr/adjReqMgOff/adjReqMgrOffAppReqPopAjax.do'/>",
"url" : "<c:url value='/kccadr/adjReqMgOff/adjReqMgrOffAppReqPop502030Ajax.do'/>",
"dataType" : "json",
"data" : function (node) {
console.log("node.id :: " + node.id);
@ -900,8 +901,8 @@ function fn_save_menuInfo() {
dataType:'json',
success : function(returnData, status) {
if (returnData.status == "success") {
//alert("대결자가 지정되었습니다.");
alert("결투가 신청되었습니다.");
alert("대결자가 지정되었습니다.");
//alert("결투가 신청되었습니다.");
top.window.opener.parent.location.reload();
fncGoClose();

View File

@ -184,14 +184,14 @@
<table>
<colgroup>
<col style="width: 80px;">
<col style="width: 12%;">
<col style="width: 12%;">
<col style="width: 12%;">
<col style="width: 11%;">
<col style="width: 8%;">
<col style="width: auto;">
<col style="width: 12%;">
<col style="width: 12%;">
<col style="width: 12%;">
<col style="width: 140px;">
<col style="width: 8%;">
<col style="width: 10%;">
<col style="width: 10%;">
<col style="width: 10%;">
<col style="width: 214px;">
</colgroup>
<thead>
<tr>
@ -305,7 +305,21 @@
<button class="status_scrq" data-tooltip="sch_${list.adrSeq}_popup" onclick="fncRejectCnPop('${list.adrSeq}','${list.rejectCn}')" title="팝업 열림" style="cursor: pointer"><kc:code codeId="CC022" code="${list.statCd}"/></button>
</c:when>
<c:otherwise>
<p class="status_write"><kc:code codeId="CC022" code="${list.statCd}"/></p>
<p class="status_write">
<c:choose>
<c:when test="${not empty list.codeNm}">
${list.codeNm}
</c:when>
<c:otherwise>
<kc:code codeId="CC022" code="${list.statCd}"/>
</c:otherwise>
</c:choose>
</p>
</c:otherwise>
</c:choose>
</td>