Merge branch 'tolag3'
This commit is contained in:
LJH
commit
f4a3136eff
@ -281,11 +281,12 @@ public class ApmController {
|
||||
cmmVO.setLastIndex(paginationInfo.getLastRecordIndex());
|
||||
cmmVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
|
||||
|
||||
cmmVO.setReqOlCdPst("2");
|
||||
|
||||
paginationInfo.setTotalRecordCount(cmmService.selectPgrCmmListCnt(cmmVO));
|
||||
model.addAttribute("paginationInfo", paginationInfo);
|
||||
|
||||
// reqOlCdPst 값이 있으면 과거사건 조회하지 않음
|
||||
cmmVO.setReqOlCdPst("2");
|
||||
model.addAttribute("list", cmmService.selectPgrCmmList(cmmVO));
|
||||
|
||||
|
||||
|
||||
@ -131,6 +131,8 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable {
|
||||
private String assSeq0;
|
||||
private String assSeq1;
|
||||
private String assSeq2;
|
||||
|
||||
private String assSeq2SelectYn;
|
||||
|
||||
private String addUsrNm0;
|
||||
private String addUsrNm1;
|
||||
@ -1154,6 +1156,16 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable {
|
||||
public void setReqOlCdPst(String reqOlCdPst) {
|
||||
this.reqOlCdPst = reqOlCdPst;
|
||||
}
|
||||
|
||||
public String getAssSeq2SelectYn() {
|
||||
return assSeq2SelectYn;
|
||||
}
|
||||
|
||||
public void setAssSeq2SelectYn(String assSeq2SelectYn) {
|
||||
this.assSeq2SelectYn = assSeq2SelectYn;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -12,6 +12,7 @@ import org.json.simple.JSONArray;
|
||||
import org.json.simple.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
@ -37,6 +38,7 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
|
||||
import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService;
|
||||
import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO;
|
||||
import kcc.kccadr.adjPgrMgr.dnt.service.DntService;
|
||||
import kcc.kccadr.adjPgrMgr.dnt.service.DntVO;
|
||||
import kcc.kccadr.adjPgrMgr.drt.service.AgntVO;
|
||||
import kcc.kccadr.adjPgrMgr.drt.service.AssVO;
|
||||
import kcc.kccadr.adjPgrMgr.drt.service.DrtService;
|
||||
@ -112,6 +114,10 @@ public class DrtController {
|
||||
|
||||
@Resource(name = "egovCryptoUtil")
|
||||
private EgovCryptoUtil egovCryptoUtil;
|
||||
|
||||
//조정사건 이력관리 일련번호
|
||||
@Resource(name="adrHstryMgrSeqGnrService")
|
||||
private EgovIdGnrService adrHstryMgrSeqGnrService;
|
||||
|
||||
// 실서버 개발서버 구분
|
||||
private static String islocal; // /pdf/out/
|
||||
@ -129,6 +135,9 @@ public class DrtController {
|
||||
@RequestMapping(value = "drtReg.do")
|
||||
public String drtReg(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception {
|
||||
|
||||
//조정부장 ass_seq select 여부
|
||||
cmmVO.setAssSeq2SelectYn("Y");
|
||||
|
||||
// drtService.selectAssList(cmmVO); //수정용
|
||||
List<AssVO> assList = drtService.selectAssRegList(drtVO);
|
||||
model.addAttribute("assList", assList);
|
||||
@ -243,7 +252,6 @@ public class DrtController {
|
||||
drtVO.setFrstRegisterId(userId);
|
||||
drtVO.setLastUpdusrId(userId);
|
||||
|
||||
|
||||
/*
|
||||
String statCd = KccadrConstants.ADR_KJOSU_APPR_COMP; // = "302050"; // 기일조서 결재완료
|
||||
|
||||
@ -264,11 +272,21 @@ public class DrtController {
|
||||
, ""
|
||||
);
|
||||
|
||||
///이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1
|
||||
String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId();
|
||||
|
||||
DntVO dntVO = new DntVO();
|
||||
BeanUtils.copyProperties(drtVO, dntVO);
|
||||
|
||||
//대석 등록
|
||||
dntService.updateDistribution2(drtVO
|
||||
/*dntService.updateDistribution2(dntVO
|
||||
, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199
|
||||
, "A450" //String p_stat_cd
|
||||
, "A450" //String p_stat_cd
|
||||
);*/
|
||||
dntService.updateDistribution(dntVO
|
||||
, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199
|
||||
, "A450" //String p_stat_cd
|
||||
, s_adrHstryMgrSeq
|
||||
);
|
||||
|
||||
/*
|
||||
@ -300,6 +318,9 @@ public class DrtController {
|
||||
@RequestMapping(value = "drtDetail.do")
|
||||
public String drtDetail(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception {
|
||||
|
||||
//조정부장 ass_seq select 여부
|
||||
cmmVO.setAssSeq2SelectYn("Y");
|
||||
|
||||
List<AssVO> assList = drtService.selectAssList(drtVO);
|
||||
|
||||
PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
|
||||
@ -356,11 +377,30 @@ public class DrtController {
|
||||
, ""
|
||||
);
|
||||
|
||||
//대석 등록
|
||||
dntService.updateDistribution2(drtVO
|
||||
, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199
|
||||
, "A450" //String p_stat_cd
|
||||
);
|
||||
// //대석 등록
|
||||
// dntService.updateDistribution2(drtVO
|
||||
// , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199
|
||||
// , "A450" //String p_stat_cd
|
||||
// );
|
||||
|
||||
|
||||
///이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1
|
||||
String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId();
|
||||
|
||||
DntVO dntVO = new DntVO();
|
||||
BeanUtils.copyProperties(drtVO, dntVO);
|
||||
|
||||
//대석 등록
|
||||
/*dntService.updateDistribution2(dntVO
|
||||
, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199
|
||||
, "A450" //String p_stat_cd
|
||||
);*/
|
||||
dntService.updateDistribution(dntVO
|
||||
, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199
|
||||
, "A450" //String p_stat_cd
|
||||
, s_adrHstryMgrSeq
|
||||
);
|
||||
|
||||
|
||||
modelAndView.addObject("result", "success");
|
||||
|
||||
|
||||
@ -153,10 +153,24 @@
|
||||
|
||||
, D.MEM_DEPT_SEQ AS memDeptSeq /* 조정부 */
|
||||
, DM.MEM_DEPT_NM AS memDeptNm /* 조정부명 */
|
||||
, DMN.MEM_NAME AS memName /* 조정부장명 */
|
||||
, DMN.MEM_SEQ AS memSeq /* 조정부장 일련번호*/
|
||||
|
||||
|
||||
, ( SELECT AMM.MEM_NAME SEPARATOR
|
||||
FROM ADR_ASS_MGR S1
|
||||
LEFT JOIN ADR_MEM_MGR AMM
|
||||
ON S1.ADD_USR_ID = AMM.MEM_SEQ
|
||||
WHERE S1.ADR_SEQ = M.ADR_SEQ
|
||||
AND S1.ADR_SN = '1'
|
||||
AND S1.ASS_USR_TY = '01'
|
||||
LIMIT 1
|
||||
) AS memName /* 조정부장명 */
|
||||
, ( SELECT AMM.MEM_SEQ SEPARATOR
|
||||
FROM ADR_ASS_MGR S1
|
||||
LEFT JOIN ADR_MEM_MGR AMM
|
||||
ON S1.ADD_USR_ID = AMM.MEM_SEQ
|
||||
WHERE S1.ADR_SEQ = M.ADR_SEQ
|
||||
AND S1.ADR_SN = '1'
|
||||
AND S1.ASS_USR_TY = '01'
|
||||
LIMIT 1
|
||||
) AS memSeq /* 조정부장 일련번호*/
|
||||
, ( SELECT GROUP_CONCAT ( AMM.MEM_NAME SEPARATOR ', ' )
|
||||
FROM ADR_ASS_MGR S1
|
||||
LEFT JOIN ADR_MEM_MGR AMM ON S1.ADD_USR_ID = AMM.MEM_SEQ
|
||||
@ -183,9 +197,16 @@
|
||||
AND S1.ASS_USR_TY = '02'
|
||||
GROUP BY S1.ADR_SEQ, ADR_SN
|
||||
ORDER BY S1.ADD_USR_ID ) AS assSeqes /* 조정위원들배석일련벉호 */
|
||||
|
||||
|
||||
|
||||
, ( SELECT NVL(S1.ASS_SEQ, '')
|
||||
FROM ADR_ASS_MGR S1
|
||||
LEFT JOIN ADR_MEM_MGR AMM
|
||||
ON S1.ADD_USR_ID = AMM.MEM_SEQ
|
||||
WHERE S1.ADR_SEQ = M.ADR_SEQ
|
||||
AND S1.ADR_SN = '1'
|
||||
AND S1.ASS_USR_TY = '01'
|
||||
limit 1
|
||||
) AS assSeq2
|
||||
/* 조정부장일련번호 */
|
||||
, D.ADR_ADM_ID AS adrAdmId /* 조정조사관ID */
|
||||
, AU.USER_NM AS adrAdmNm /* 조정조사관명 */
|
||||
, AU.OFFM_TELNO AS adrAdmOffmTel /* 조정조사관 내선번호 */
|
||||
|
||||
@ -701,7 +701,11 @@
|
||||
<tr>
|
||||
<th>조정부장</th>
|
||||
<td colspan="3">
|
||||
<c:out value="${info.memName }" />
|
||||
<%-- <c:out value="${info.memName }" /> --%>
|
||||
<input type="text" size="30" id="addUsrNm2" value="${info.memName}" readonly="readonly" />
|
||||
<c:if test="${!empty info.memName}">
|
||||
<button type="button" class="btnType01 btn_overlap" onclick="srcAss(2)">대석</button>
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
<%-- <tr>
|
||||
|
||||
@ -507,7 +507,11 @@
|
||||
<tr>
|
||||
<th>조정부장</th>
|
||||
<td colspan="3">
|
||||
<c:out value="${info.memName }" />
|
||||
<%-- <c:out value="${info.memName }" /> --%>
|
||||
<input type="text" size="30" id="addUsrNm2" value="${info.memName}" readonly="readonly" />
|
||||
<c:if test="${!empty info.memName}">
|
||||
<button type="button" class="btnType01 btn_overlap" onclick="srcAss(2)">대석</button>
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
<%-- <tr>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user