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

Merge branch 'hylee'

Browse Source
This commit is contained in:
hylee 2022-09-23 17:30:47 +09:00
commit f1cc46d7ab
9 changed files with 807 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java
View File

@ -65,8 +65,6 @@ public class PgrCmmServiceImpl implements PgrCmmService {
decpyptVo(result);
System.out.println("result.getAppPlace() : "+ result.getAppPlace());
if (!StringUtil.isEmpty(result.getAppPlace())) {
String app[] = (result.getAppPlace()).split("\\|");
if (app.length > 0) {

6
src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java
View File

@ -17,12 +17,18 @@ public interface AdjReqMgrPastService {
ResponseEntity<RestResponse> checkNInsertAprvlPastAjax(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception;
ResponseEntity<RestResponse> checkNUpdateAprvlPastAjax(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception;
List<AdjReqMgrPastVO> selectAdrPrtclMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO);
AdjReqMgrPastVO selectMemAss(AdjReqMgrPastVO adjReqMgrPastVO);
List<AdjReqMgrPastVO> findAllAssPstInfo(AdjReqMgrPastVO adjReqMgrPastVO);
AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO);
List<AdjReqMgrPastVO> selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO);
AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO);
}

40
src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java
View File

@ -36,6 +36,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
private String nextAppDeDay; /* 다음조정기일일시 */
private String appPlaceTx; /* 조정기일장소 */
private String addUsrNm; /* 조정부장 */
private String addUsrNm0; /* 조정부장 */
private String addUsrNm1; /* 조정위원1 */
private String addUsrNm2; /* 조정위원2 */
@ -106,6 +107,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
private String rpplRelation = ""; //신청인과의 관계()
private String rpplRelationEtc = ""; //신청인과의 관계 기타 입력
private String assUsrTy = ""; //신청인과의 관계 기타 입력
private String addUsrIdList[]; /* ass.addUsrId | ass.assUsrTy | add_yn " */
private String addUsrId; /* ass.addUsrId | ass.assUsrTy | add_yn " */
private String addAgntList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */
@ -182,9 +184,9 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
private String assPstUsrTy;
private String addYn;
private String addChgYn;
private String ccTyTx;
private String appPlaceDetailTx;
public AdjReqMgrVO getAdrVO() {
return adrVO;
@ -306,6 +308,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
this.appPlaceTx = appPlaceTx;
}
public String getAddUsrNm() {
return addUsrNm;
}
public void setAddUsrNm(String addUsrNm) {
this.addUsrNm = addUsrNm;
}
public String getAddUsrNm0() {
return addUsrNm0;
}
@ -802,6 +812,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
this.rpplRelationEtc = rpplRelationEtc;
}
public String getAssUsrTy() {
return assUsrTy;
}
public void setAssUsrTy(String assUsrTy) {
this.assUsrTy = assUsrTy;
}
public String[] getAddUsrIdList() {
return addUsrIdList;
}
@ -1186,6 +1204,24 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable {
this.addChgYn = addChgYn;
}
public String getCcTyTx() {
return ccTyTx;
}
public void setCcTyTx(String ccTyTx) {
this.ccTyTx = ccTyTx;
}
public String getAppPlaceDetailTx() {
return appPlaceDetailTx;
}
public void setAppPlaceDetailTx(String appPlaceDetailTx) {
this.appPlaceDetailTx = appPlaceDetailTx;
}
// =============================================

12
src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java
View File

@ -61,6 +61,10 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO {
insert("adjReqMgrPastDAO.insertAdjAssList", adjAssMgrPastList );
}
public void updateAdjAss(AdjAssMgrPastVO adjAssMgrPastList) {
update("adjReqMgrPastDAO.updateAdjAss", adjAssMgrPastList );
}
public void updateAdrPrtclMgr(AdjReqMgrPastVO adjPastVO) {
update("adjReqMgrPastDAO.updateAdrPrtclMgr", adjPastVO );
}
@ -74,4 +78,12 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO {
return (List<AdjReqMgrPastVO>) list("adjReqMgrPastDAO.selectAdrRpplPastList", adjReqMgrPastVO);
}
public List<AdjReqMgrPastVO> findAllAssPstInfo(AdjReqMgrPastVO adjReqMgrPastVO) {
return (List<AdjReqMgrPastVO>) list("adjReqMgrPastDAO.findAllAssPstInfo", adjReqMgrPastVO);
}
public AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO) {
return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByIdAdrMgrMaster", adjPastVO);
}
}

129
src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java
View File

@ -4,6 +4,7 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@ -12,6 +13,8 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import com.mchange.v2.sql.filter.SynchronizedFilterCallableStatement;
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.cmmn.exception.FdlException;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
@ -542,13 +545,37 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn());
// this.insertAdjAssAndDataCleansing(adjPastVO);
this.insertAdrPrtclMgrAndDataCleansing(adjPastVO);
this.insertAdjAssAndDataCleansing(adjPastVO);
this.updateAdrPrtclMgrAndDataCleansing(adjPastVO);
return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "기일조서 등록이 완료되었습니다.", LocalDateTime.now()));
}
@Override
public ResponseEntity<RestResponse> checkNUpdateAprvlPastAjax(AdjReqMgrPastVO adjPastVO) throws Exception {
System.out.println(" 조정기일일 :: "+adjPastVO.getAppDeDay());
System.out.println(" 조정기일시 :: "+adjPastVO.getAppDeTime());
System.out.println(" 다음조정기일일 :: "+adjPastVO.getNextAppDeDay());
System.out.println(" 다음조정기일시 :: "+adjPastVO.getNextAppDeTime());
System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx());
System.out.println(" 기일조서내용 :: "+adjPastVO.getPrtclCn());
System.out.println(" 장소 Type :: "+adjPastVO.getAppPlaceTy());
System.out.println(" 장소 :: "+adjPastVO.getAppPlaceTx());
System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn());
try {
this.updateAdjAssAndDataCleansing(adjPastVO);
} catch (Exception e) {
e.printStackTrace();
}
// this.updateAdrPrtclMgrAndDataCleansing(adjPastVO);
return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "기일조서 등록이 완료되었습니다.", LocalDateTime.now()));
}
private void insertAdrPrtclMgrAndDataCleansing(AdjReqMgrPastVO adjPastVO) {
private void updateAdrPrtclMgrAndDataCleansing(AdjReqMgrPastVO adjPastVO) {
String addDe = adjPastVO.getAppDeDay()+" "+adjPastVO.getAppDeTime();
@ -567,7 +594,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
adjReqMgrPastDAO.updateAdrPrtclMgr(adjPastVO);
}
public void insertAdjAssAndDataCleansing(AdjReqMgrPastVO adjPastVO) throws FdlException {
List<AdjAssMgrPastVO> adjAssMgrPastList = new ArrayList<AdjAssMgrPastVO>();
@ -648,10 +674,87 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
}
// 과거사건 기일조서 수정
public void updateAdjAssAndDataCleansing(AdjReqMgrPastVO adjPastVO) throws FdlException {
/* 신청인 */
AdjAssMgrPastVO adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
String addUsrIdS = adjPastVO.getAddUsrIdList()[0];
adjAssMgrPastVO.setAssPstSeq(addUsrIdS.split("\\|")[0]);
adjAssMgrPastVO.setAddYn(addUsrIdS.split("\\|")[1]);
// adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
/* 피신청인 */
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
String addUsrIdP = adjPastVO.getAddUsrIdList()[1];
adjAssMgrPastVO.setAssPstSeq(addUsrIdP.split("\\|")[0]);
adjAssMgrPastVO.setAddYn(addUsrIdP.split("\\|")[1]);
// adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
String assPstUsrNmS = adjPastVO.getAddAgntList()[0];
String assPstUsrNmP = adjPastVO.getAddAgntList()[1];
/* 신청 참관 대리인 */
if(StringUtils.isNotEmpty(assPstUsrNmS))
{
System.out.println("assPstUsrNmS : "+ assPstUsrNmS);
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
adjAssMgrPastVO.setAssPstSeq(assPstUsrNmS.split("\\|")[0]);
adjAssMgrPastVO.setAssPstUsrNm(assPstUsrNmS.split("\\|")[1]);
adjAssMgrPastVO.setAddYn("Y");
// adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
}
/* 피신청 참관 대리인 */
if(StringUtils.isNotEmpty(assPstUsrNmP))
{
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
adjAssMgrPastVO.setAssPstSeq(assPstUsrNmP.split("\\|")[0]);
adjAssMgrPastVO.setAssPstUsrNm(assPstUsrNmP.split("\\|")[1]);
adjAssMgrPastVO.setAddYn("Y");
}
/* 조정부장 필수 값*/
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
adjAssMgrPastVO.setAssPstUsrTy("01");
adjAssMgrPastVO.setAssPstUsrNm(adjPastVO.getAddUsrNm0());
adjAssMgrPastVO.setAddYn("Y");
/* 조정위원 1*/
if(StringUtils.isNotEmpty(adjPastVO.getAddUsrNm1()))
{
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
adjAssMgrPastVO.setAssPstUsrTy("02");
adjAssMgrPastVO.setAssPstUsrNm(adjPastVO.getAddUsrNm1());
adjAssMgrPastVO.setAddYn("Y");
}
/* 조정위원 2*/
if(StringUtils.isNotEmpty(adjPastVO.getAddUsrNm2()))
{
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
adjAssMgrPastVO.setAssPstUsrTy("02");
adjAssMgrPastVO.setAssPstUsrNm(adjPastVO.getAddUsrNm2());
adjAssMgrPastVO.setAddYn("Y");
}
}
@Override
public AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO) {
return adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO);
AdjReqMgrPastVO adjPastVO = adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO);
adjPastVO.setAppDeDay(adjPastVO.getAppDe().split(" ")[0]);
String appTime = adjPastVO.getAppDe().split(" ")[1];
adjPastVO.setAppDeTime(appTime.substring(0, appTime.lastIndexOf(":")));
adjPastVO.setNextAppDeDay(adjPastVO.getNextAppDe().split(" ")[0]);
String appNextTime = adjPastVO.getNextAppDe().split(" ")[1];
adjPastVO.setNextAppDeTime(appNextTime.substring(0, appTime.lastIndexOf(":")));
return adjPastVO;
}
@ -662,5 +765,21 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
}
@Override
public List<AdjReqMgrPastVO> findAllAssPstInfo(AdjReqMgrPastVO adjReqMgrPastVO) {
// List<AdjReqMgrPastVO> adjReqMgrPastListVO = adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO);
// List<String> usrTyList = adjReqMgrPastListVO.stream().map(AdjReqMgrPastVO::getAssPstUsrTy).collect(Collectors.toList());
return adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO);
}
@Override
public AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO) {
return adjReqMgrPastDAO.findByIdAdrMgrMaster(adjPastVO);
}
}

67
src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java
View File

@ -241,16 +241,6 @@ public class AdjReqMgrPastController {
model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqVO));
// 등록된 값이 있으면 select
if(StringUtils.isNotEmpty(cmmVO.getPrtclCn()))
{
List<PgrCmmVO> apmChgInfo = apmService.selectApmChgDateInfo(cmmVO);
model.addAttribute("apmChgInfo", apmChgInfo.get(0));
//조정위원 정보 불러오기
PgrCmmVO dntVO = this.getDntInfo(cmmVO);
model.addAttribute("uiwonInfo", dntVO);
}
model.addAttribute("newAdrSn", cmmVO.getNowAdrSn());
@ -274,32 +264,27 @@ public class AdjReqMgrPastController {
AdjReqMgrPastVO adjPastVO = adjReqMgrPastService.findByIdPrtclMgr(adjReqMgrPastVO);
System.out.println(" adjPastVO.getPrtclCn() :: " + adjPastVO.getPrtclCn());
model.addAttribute("adjPastVO", adjPastVO);
// DrtVO drtVO = new DrtVO();
// drtVO.setAdrSeq(adjReqMgrPastVO.);
// drtVO.setAdrSn(adrSeq);
DrtVO drtVO = new DrtVO();
drtVO.setAdrSeq(adjPastVO.getAdrSeq());
drtVO.setAdrSn(adjPastVO.getAdrSn());
model.addAttribute("assList", drtService.selectAssRegList(drtVO));
// model.addAttribute("assList", drtService.selectAssRegList(drtVO));
//사건 정보 불러오기
// PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
model.addAttribute("info", adjReqMgrPastService.findByIdAdrMgrMaster(adjPastVO));
/* 조정부 / 조정조사관 select */
// AdjReqMgrPastVO adjReqVO = new AdjReqMgrPastVO();
// adjReqVO.setAdrSeq(cmmVO.getAdrSeq());
// model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqVO));
model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjPastVO));
List<AdjReqMgrPastVO> list = adjReqMgrPastService.findAllAssPstInfo(adjPastVO);
list.stream().forEach(System.out::println);
/* 참석 인원 select */
model.addAttribute("assInfoList", adjReqMgrPastService.findAllAssPstInfo(adjPastVO));
// 등록된 값이 있으면 select
// if(StringUtils.isNotEmpty(cmmVO.getPrtclCn()))
// {
// }
// model.addAttribute("newAdrSn", cmmVO.getNowAdrSn());
return "/kccadr/adjReqMgrPast/drtRegPop";
return "/kccadr/adjReqMgrPast/drtUpdtPop";
}
@ -366,6 +351,30 @@ public class AdjReqMgrPastController {
@RequestMapping(value = {"/kccadr/adjReqMgOff/checkNUpdateAprvlPastAjax.do"})
public ResponseEntity<RestResponse> checkNUpdateAprvlPastAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO
, RedirectAttributes redirectAttributes
, HttpServletRequest request) throws Exception {
//로그인 권한정보 불러오기
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
if(userId.equals("")) {
// Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized)
return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
}
//사용자 유니크 아이디 받아오기
adjReqMgrPastVO.setLastUpdusrId(userId);
//조정신청, 대리인, 신청인 등록 처리
return adjReqMgrPastService.checkNUpdateAprvlPastAjax(adjReqMgrPastVO);
}

102
src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml
View File

@ -417,6 +417,20 @@
</iterate>
</insert>
<!-- 과거사건등록 - 기일조서 등록 출석인 관리-->
<update id="adjReqMgrPastDAO.updateAdjAss" parameterClass="AdjReqPastVO">
UPDATE ADR_ASS_MGR_PST SET
ADD_YN = #addYn#
, ASS_PST_USR_NM = #assPstUsrNm#
, LAST_UPDUSR_ID = #lastUpdusrId#
, LAST_UPDT_PNTTM = NOW()
WHERE
ASS_PST_SEQ = #assPstSeq#
</update>
<!-- 과거사건등록 - 기일조서 등록 - 기일조서정보 -->
<update id="adjReqMgrPastDAO.updateAdrPrtclMgr" parameterClass="AdjReqPastVO">
@ -430,8 +444,10 @@
, prtcl_cn = #prtclCn#
, sbmt_yn = #sbmtYn#
, appr_yn = #apprYn#
<isNotEmpty property="frstRegisterId" >
, frst_regist_pnttm = NOW()
, frst_register_id = #frstRegisterId#
</isNotEmpty>
, last_updt_pnttm = NOW()
, last_updusr_id = #lastUpdusrId#
, app_result_ty = #appResultTy#
@ -449,7 +465,7 @@
FROM adr_ass_mgr_pst a
WHERE a.ass_pst_usr_ty IN ('10', '20', '50')
AND a.adr_seq = #adrSeq#
GROUP BY a.ass_pst_usr_ty;
GROUP BY a.ass_pst_usr_ty
</select>
@ -459,28 +475,74 @@
<select id="adjReqMgrPastDAO.findByIdPrtclMgr" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
SELECT
ADR_SEQ
, ADR_SN
, PRTCL_SEQ
, OPEN_YN
, APP_DE
, APP_PLACE_TY
, APP_PLACE
, NEXT_APP_DE_YN
, NEXT_APP_DE
, PRTCL_CN
, SBMT_YN
, SBMT_DE
, APPR_YN
, APPR_DE
, FRST_REGIST_PNTTM
, FRST_REGISTER_ID
, LAST_UPDT_PNTTM
, LAST_UPDUSR_ID
, APP_RESULT_TY
ADR_SEQ as adrSeq
, ADR_SN as adrSn
, PRTCL_SEQ as prtclSeq
, OPEN_YN as openYn
, APP_DE as appDe
, APP_PLACE_TY as appPlaceTy
, APP_PLACE as appPlace
, NEXT_APP_DE_YN as nextAppDeYn
, NEXT_APP_DE as nextAppDe
, PRTCL_CN as prtclCn
, SBMT_YN as sbmtYn
, SBMT_DE as sbmtDe
, APPR_YN as apprYn
, APPR_DE as apprDe
, FRST_REGIST_PNTTM as frstRegistPnttm
, FRST_REGISTER_ID as frstRegisterId
, LAST_UPDT_PNTTM as lastUpdtPnttm
, LAST_UPDUSR_ID as lastUpdusrId
, APP_RESULT_TY as appResultTy
FROM ADR_PRTCL_MGR
WHERE PRTCL_SEQ = #prtclSeq#
</select>
<!-- 오프라인 조정사건정보 수정 : 조정사건 정보 불러오기 -->
<select id="adjReqMgrPastDAO.findByIdAdrMgrMaster" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
SELECT
amm.ADR_SEQ as adrSeq
, amm.ADR_NO as adrNo
, amm.REQ_CN1 as reqCn1
, amm.REQ_CN2 as reqCn2
, amm.REQ_TY as reqTy
, (
SELECT
CODE_NM
FROM
LETTCCMMNDETAILCODE
WHERE CODE_ID = 'CC002' AND CODE = amm.CC_TY
) as ccTyTx /* 저작물 종류 */
FROM ADR_MGR_MASTER amm
where amm.ADR_SEQ = #adrSeq#
</select>
<!-- 해당 회차의 출석인원들 select -->
<select id="adjReqMgrPastDAO.findAllAssPstInfo" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
SELECT
ADR_SEQ as adrSeq
, ADR_SN as adrSn
, ASS_PST_SEQ as assPstSeq
, ASS_PST_USR_TY as assPstUsrTy
, ASS_PST_USR_NM as assPstUsrNm
, ADD_YN as addYn
, ADD_CHG_YN as addChgYn
, FRST_REGIST_PNTTM as frstRegistPnttm
, FRST_REGISTER_ID as frstRegisterId
, LAST_UPDT_PNTTM as lastUpdtPnttm
, LAST_UPDUSR_ID as lastUpdusrId
FROM
ADR_ASS_MGR_PST
WHERE
ADR_SEQ = #adrSeq#
AND ADR_SN = #adrSn#
</select>
</sqlMap>

12
src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovRankManageTree.jsp
View File

@ -46,12 +46,13 @@
// 초기 데이터 만드는 function
function fn_makeList(data){
console.log(' makeList data : ', data);
var resultList = data['dataList'];
var dataList = [];
var data = {};
data.id = 'C0050';
data.id = 'CC041';
data.text = '직급관리';
data.parent = '#';
data.state = {opened : true};
@ -74,7 +75,7 @@
// jsTree function
function fn_jsTree(resultData){
console.log('resultData : ', resultData);
$("#rank_organization").jstree({
"core" : {
@ -208,17 +209,18 @@
type : "POST"
, url : "<c:url value='/uss/rnt/EgovRankDataLoad.do'/>"
, data : JSON.stringify({
codeId : "C0050"
codeId : "CC041"
})
, dataType : 'json'
, async : false
, processData : false
, contentType : "application/json"
, cache : false
, success : function(returnData) {
, success : function(data) {
console.log('returnData : ', data);
if (data.status == "OK") {
// 초기데이터 생성 후 jsTree 만듬
var resultData = fn_makeList(returnData);
var resultData = fn_makeList(data);
fn_jsTree(resultData);
} else {
alert(returnData.data);

492
src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp Normal file
View File

@ -0,0 +1,492 @@
<%@ page contentType="text/html; charset=utf-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
<un:useConstants var="KccadrConstants" className="kcc.kccadr.cmm.KccadrConstants" />
<!DOCTYPE html>
<html lang="ko">
<head>
<title>기일조서 수정</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<script src="/kccadrPb/usr/script/popup.js"></script>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/timepicker/1.3.5/jquery.timepicker.min.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/timepicker/1.3.5/jquery.timepicker.min.js"></script>
<script type="text/javaScript" language="javascript">
$(document).ready(function() {
fncShow();
fncNextApp();
//시간 선택시 실행
$('input[name=appDeTime]').timepicker({
'timeFormat': 'HH:mm',
});
$('input[name=nextAppDeTime]').timepicker({
'timeFormat': 'HH:mm',
});
// $('#appResultTy').val('50').trigger('change');
});
function fncCheckNextYn() {
var value = $('input[name="nextAppDeYn"]:checked').val();
if (value == 'Y') {
$('#nextAppDeRow').show();
} else {
$('#nextAppDeRow').hide();
$('#nextAppDeDay').val('');
$('#nextAppDeTime').val('');
}
}
function fncNextApp(){
if ($('#appResultTy').val() == "50") {
$('#nextApp').show();
$("input:radio[id='nextAppDeY']").prop("checked", true);
} else {
$('#nextApp').hide();
$("input:radio[id='nextAppDeN']").prop("checked", true);
}
fncCheckNextYn();
}
function fncShow() {
if ($('#appPlaceTy').val() == "99") {
$('#appPlaceTyDiv').show();
} else {
$('#appPlaceTyDiv').hide();
$('#appPlaceTx').val('');
$('#appPlaceDetailTx').val('');
}
if ($('#appPlaceAddrTy').val() == "99") {
$('#appPlaceAddrTyDiv').show();
} else {
$('#appPlaceAddrTyDiv').hide();
$('#appPlaceAddrTx').val('');
$('#appPlaceAddrDetailTx').val('');
}
}
function fncUpdt(p_param) {
if (!isEmptyObj('addAgntListSTemp')) {
var val = $('#addAgntListSSeqTemp').val()+'|'+$('#addAgntListSTemp').val();
$('#addAgntListS').val(val);
}
if (!isEmptyObj('addAgntListPTemp')) {
$('#addAgntListP').val($('#addAgntListPSeqTemp').val()+'|'+$('#addAgntListPTemp').val());
}
if(isValid()){
var f = document.getElementById("listForm");
var data = new FormData(f);
if (confirm('작성된 내용을 수정하시겠습니까?')) {
$.ajax({
type : "POST",
url : "/kccadr/adjReqMgOff/checkNUpdateAprvlPastAjax.do",
data : data,
dataType : 'json',
async : false,
processData : false,
contentType : false,
cache : false,
success : function(returnData) {
if (returnData.result == 'success') {
alert(returnData);
} else {
alert(returnData.message);
}
},
error : function(e) {
alert("기일조서에 실패하였습니다.");
console.log("ERROR : ", e);
}
});
}
}
}
function isValid() {
var isValidDate = Date.parse($('#appDeDay').val());
if (isNaN(isValidDate)) {
alert("조정기일을 입력해 주세요");
return false;
}
if (!isDatetime($('#appDeTime').val())) {
alert("유효한 조정기일 시간을 'hh:mm'형식으로 입력해 주세요"); //
return false;
}
if ($('#appPlaceTy').val() == "99") {
if (isEmptyObj('appPlaceTx')) {
alert('장소를 입력해 주세요.');
return false;
}
}
if ($('#appPlaceAddrTy').val() == "99") {
if (isEmptyObj('appPlaceAddrTx')) {
alert('주소를 입력해 주세요.');
return false;
}
}
if ($('input[name="nextAppDeYn"]:checked').val() == "Y") {
isValidDate = Date.parse($('#nextAppDeDay').val());
if (isNaN(isValidDate)) {
alert("유효한 다음 조정기일을 입력해 주세요");
return false;
}
if (!isDatetime($('#nextAppDeTime').val())) {
alert("유효한 다음 조정기일 시간을 'hh:mm'형식으로 입력해 주세요"); // nextAppDeTime
return false;
}
}
if (isEmptyObj('prtclCn')) {
alert('조서내용을 입력해 주세요');
return false;
}
if (isEmptyObj('addUsrNm0')) {
alert('조정부장 이름을 입력해 주세요');
return false;
}
// if (isEmptyObj('addUsrNm1')) {
// alert('조정위원1 이름을 입력해 주세요');
// return false;
// }
// if (isEmptyObj('addUsrNm2')) {
// alert('조정위원2 이름을 입력해 주세요');
// return false;
// }
return true;
}
</script>
</head>
<body>
<form:form id="listForm" onsubmit="return false;" 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="${adjPastVO.adrSn}"/>" />
<input type="hidden" id="addAgntListS" name="addAgntList" value=""/>
<input type="hidden" id="addAgntListP" name="addAgntList" value=""/>
<div class="cont_wrap">
<div class="box">
<!-- cont_tit -->
<div class="cont_tit">
<h2>기일조서 수정</h2>
<ul class="cont_nav">
<li class="home">
<a href="/"><i></i></a>
</li>
<li>
<span>과거사건등록</span>
</li>
<li>
<span class="cur_nav">기일조서 수정</span>
</li>
</ul>
</div>
<!-- //cont_tit -->
<div class="cont">
<!-- list_상세 -->
<div class="tbType02">
<table>
<colgroup>
<col style="width: 20%;">
<col style="width: 35%;">
<col style="width: 15%;">
<col style="width: 30%;">
</colgroup>
<tbody class="border_0">
<tr>
<th>조 정 부</th>
<td colspan="3">
<c:out value='${memAss.memDeptNm }' />
</td>
</tr>
<tr>
<th>차 수</th>
<td colspan="3">
<c:out value="${adjPastVO.adrSn}"></c:out>
</td>
</tr>
<tr>
<th>사 건</th>
<td>
<c:out value="${info.adrNo }"></c:out>
</td>
<th>사건내용</th>
<td>
<c:out value="${info.ccTyTx }"></c:out>
</td>
</tr>
<tr>
<th rowspan="2">신청인</th>
<td rowspan="2">
<c:forEach var="ass" items="${assInfoList}">
<c:if test="${ass.assPstUsrTy eq '10'}">
<p>
<c:out value="${ass.assPstUsrNm }"></c:out>
</p>
<select name="addUsrIdList" id="addUsrIdList" class="wid_120">
<option <c:if test="${ass.addYn eq 'Y' }"> selected="selected" </c:if> value="<c:out value="${ass.assPstSeq }|Y"></c:out>">출석</option>
<option <c:if test="${ass.addYn eq 'N' }"> selected="selected" </c:if> value="<c:out value="${ass.assPstSeq }|N"></c:out>">불출석</option>
</select>
</c:if>
</c:forEach>
</td>
<th>대리인</th>
<td>
<c:forEach var="ass" items="${assInfoList}">
<c:if test="${ass.assPstUsrTy eq '30'}">
<p>
<c:out value="${ass.assPstUsrNm }"></c:out>
</p>
<select name="addUsrIdList" id="addUsrIdList" class="wid_120">
<option <c:if test="${ass.addYn eq 'Y' }"> selected="selected" </c:if> value="<c:out value="${ass.assPstSeq }|Y"></c:out>">출석</option>
<option <c:if test="${ass.addYn eq 'N' }"> selected="selected" </c:if> value="<c:out value="${ass.assPstSeq }|N"></c:out>">불출석</option>
</select>
</c:if>
</c:forEach>
</td>
</tr>
<tr>
<th>참관대리인</th>
<td>
<c:forEach var="assInfo" items="${assInfoList }">
<c:if test="${assInfo.assPstUsrTy eq 35}">
<c:set var="assPstSeq" value="${assInfo.assPstSeq }" />
<c:set var="assPstUsrNm" value="${assInfo.assPstUsrNm }" />
</c:if>
</c:forEach>
<input type="hidden" id="addAgntListSSeqTemp" value="${assPstSeq }"/>
<input type="text" id="addAgntListSTemp" value="${assPstUsrNm }"/>
</td>
</tr>
<tr>
<th rowspan="2">피신청인</th>
<td rowspan="2">
<c:forEach var="ass" items="${assInfoList}">
<c:if test="${ass.assPstUsrTy eq '20'}">
<p>
<c:out value="${ass.assPstUsrNm }"></c:out>
</p>
<select name="addUsrIdList" id="addUsrIdList" class="wid_120">
<option <c:if test="${ass.addYn eq 'Y' }"> selected="selected" </c:if> value="<c:out value="${ass.assPstSeq }|Y"></c:out>">출석</option>
<option <c:if test="${ass.addYn eq 'N' }"> selected="selected" </c:if> value="<c:out value="${ass.assPstSeq }|N"></c:out>">불출석</option>
</select>
</c:if>
</c:forEach>
</td>
<th>대리인</th>
<td>
<c:forEach var="ass" items="${assInfoList}">
<c:if test="${ass.assPstUsrTy eq '40'}">
<p>
<c:out value="${ass.assPstUsrNm }"></c:out>
</p>
<select name="addUsrIdList" id="addUsrIdList" class="wid_120">
<option <c:if test="${ass.addYn eq 'Y' }"> selected="selected" </c:if> value="<c:out value="${ass.assPstSeq }|Y"></c:out>">출석</option>
<option <c:if test="${ass.addYn eq 'N' }"> selected="selected" </c:if> value="<c:out value="${ass.assPstSeq }|N"></c:out>">불출석</option>
</select>
</c:if>
</c:forEach>
</td>
</tr>
<tr>
<th>참관대리인</th>
<td>
<c:forEach var="assInfo" items="${assInfoList }">
<c:if test="${assInfo.assPstUsrTy eq 45}">
<c:set var="assPstSeq" value="${assInfo.assPstSeq }" />
<c:set var="assPstUsrNm" value="${assInfo.assPstUsrNm }" />
</c:if>
</c:forEach>
<input type="hidden" id="addAgntListPSeqTemp" value="${assPstSeq }"/>
<input type="text" id="addAgntListPTemp" value="${assPstUsrNm }"/>
</td>
</tr>
<tr>
<th>조정기일</th>
<td>
<div class="sel_date">
<input type="text" class="appDeDay inp" title="검색시작일" id="appDeDay" name="appDeDay" onclick="return calendarOpen('appDeDay-lry','',this)" value="<c:out value="${adjPastVO.appDeDay }"></c:out>" data-datecontrol="true" onkeyup="setFormat('day',this)" maxlength="10" readonly>
<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('appDeDay-lry','',this)" class="btn_cal"></button>
<div id="appDeDay-lry" class="calendarPop" style="display: none;">
<iframe id="appDeDay-ifrm" name="appDeDay-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
</div>
</div>
</div>
<input type="text" class="time_input" placeholder="11:00" id="appDeTime" name="appDeTime" value="<c:out value="${adjPastVO.appDeTime }"></c:out>" onkeyup="setFormat('time',this)" maxlength="8">
</td>
<th>공개여부</th>
<td>
<select name="openYn" id="openYn" class="wid_120">
<option value="N" <c:if test="${adjPastVO.openYn eq 'N' }"> selected="selected" </c:if>>비공개</option>
<option value="Y" <c:if test="${adjPastVO.openYn eq 'Y' }"> selected="selected" </c:if>>공개</option>
</select>
</td>
</tr>
<tr>
<th>장소</th>
<td colspan="3">
<kc:select codeId="CC020" id="appPlaceTy" name="appPlaceTy" selectedValue="${adjPastVO.appPlaceTy }" script="onchange='fncShow()'" />
<div id="appPlaceTyDiv" style="display: none;">
<button type="button" class="btnType01" onclick="fn_postCode(this);">주소검색</button>
<input type="hidden" id="appPlaceZipTx" name="appPlaceZipTx" class="adr_input">
<input type="text" id="appPlaceTx" name="appPlaceTx" class="searchResultAddr" size="40" value="<c:out value="${adjPastVO.appPlaceTx }"></c:out>">
<input type="text" class="dir_input" id="appPlaceDetailTx" name="appPlaceDetailTx" value="<c:out value="${adjPastVO.appPlaceDetailTx }"></c:out>">
</div>
</td>
</tr>
<tr>
<th>기일결과</th>
<td colspan="3">
<kc:select codeId="CC023" id="appResultTy" name="appResultTy" selectedValue="${adjPastVO.appResultTy }" onChange="fncNextApp()" />
</td>
</tr>
<tr id="nextApp">
<th>다음 기일 지정 여부</th>
<td>
<div class="radio_wrap">
<span>
<input type="radio" id="nextAppDeY" name="nextAppDeYn" value="Y" <c:if test="${adjPastVO.nextAppDeYn eq 'Y' }"> checked </c:if> onclick="fncCheckNextYn()">
<label for="nextAppDeY">필요</label>
</span>
<span>
<input type="radio" id="nextAppDeN" name="nextAppDeYn" value="N" <c:if test="${adjPastVO.nextAppDeYn eq 'N' }"> checked </c:if> onclick="fncCheckNextYn()">
<label for="nextAppDeN">필요없음</label>
</span>
</div>
</td>
</tr>
<tr id="nextAppDeRow">
<th>고지된 다음기일</th>
<td colspan="3">
<div class="sel_date">
<input type="text" class="nextAppDeDay inp" title="검색시작일" id="nextAppDeDay" name="nextAppDeDay" value="${adjPastVO.nextAppDeDay }" data-datecontrol="true" onkeyup="setFormat('day',this)" maxlength="10">
<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('nextAppDeDay-lry','',this)" class="btn_cal"></button>
<div id="nextAppDeDay-lry" class="calendarPop" style="display: none;">
<iframe id="nextAppDeDay-ifrm" name="nextAppDeDay-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
</div>
</div>
</div>
<input type="text" class="time_input" placeholder="11:00" id="nextAppDeTime" name="nextAppDeTime" value="${adjPastVO.nextAppDeTime }" onkeyup="setFormat('time',this)" maxlength="8">
</td>
</tr>
<tr>
<th>조서내용</th>
<td colspan="3">
<textarea name="prtclCn" id="prtclCn" value="${adjPastVO.prtclCn }" cols="30" rows="2" style="height: 200px;"><c:out value="${adjPastVO.prtclCn }" /></textarea>
</td>
</tr>
<tr>
<th>조정부장</th>
<td colspan="3">
<c:forEach var="assInfo" items="${assInfoList }">
<c:if test="${assInfo.assPstUsrTy eq 01}">
<c:set var="assPstUsrNm" value="${assInfo.assPstUsrNm }" />
<c:set var="assPstUsrNm" value="${assInfo.assPstUsrNm }" />
</c:if>
</c:forEach>
<input type="text" size="30" id="addUsrNm0" name="addUsrNm0" name="addUsrNm0" value="${assPstUsrNm }" />
</td>
</tr>
<tr>
<th>조정위원1</th>
<td colspan="3">
<c:forEach var="assInfo" items="${assInfoList }">
<c:if test="${assInfo.assPstUsrTy eq 02}">
<c:set var="assPstSeq" value="${assInfo.assPstSeq }" />
<c:set var="assPstUsrNm" value="${assInfo.assPstUsrNm }" />
</c:if>
</c:forEach>
<input type="hidden" id="addUsrNm1" value="${assPstUsrNm }" />
<input type="text" size="30" id="addUsrNm1" name="addUsrNm1" value="${assPstUsrNm }" />&nbsp;
</td>
</tr>
<tr>
<th>조정위원2</th>
<td colspan="3">
<c:forEach var="assInfo" items="${assInfoList }">
<c:if test="${assInfo.assPstUsrTy eq 02}">
<c:if test="${assInfo.assPstUsrNm != assPstUsrNm}" >
<c:set var="assPstUsrNm2" value="${assInfo.assPstUsrNm }" />
</c:if>
</c:if>
</c:forEach>
<input type="text" size="30" id="addUsrNm2" name="addUsrNm2" value="${assPstUsrNm2 }" />&nbsp;
</td>
</tr>
<tr>
<th>조정조사관</th>
<td colspan="3">
<c:out value='${memAss.assPstUsrNm }' />
</td>
</tr>
</tbody>
</table>
</div>
<!-- //list_상세 -->
<div class="btn_wrap btn_layout01">
<div class="area_left"></div>
<div class="area_right">
<button type="button" class="btnType06" onclick="fncUpdt()">수정</button>
<button type="button" class="btnType04" onclick="fncGoList()">취소</button>
</div>
</div>
</div>
</div>
</div>
</form:form>
</body>
</html>