feat: 관리자 단에서 '위원회 관리' > '위원회 일정 관리'에 '등록' 버튼을 누른 후 '위원회 일정 등록' 페이지에서 항목 입력 후 '저장'을 버튼 누른 후 상세 정보 가져오기 중간 저장
parent
d00696c73e
commit
c3258630dc
|
|
@ -111,7 +111,8 @@ function SchedulesDetail(props) {
|
||||||
<ul>
|
<ul>
|
||||||
<li><Link to={URL.MAIN} className="home">Home</Link></li>
|
<li><Link to={URL.MAIN} className="home">Home</Link></li>
|
||||||
<li><Link to={URL.ADMIN}>사이트관리</Link></li>
|
<li><Link to={URL.ADMIN}>사이트관리</Link></li>
|
||||||
<li>일정관리</li>
|
<li>위원회관리</li>
|
||||||
|
<li>일정관리 상세보기</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{/* <!--// Location --> */}
|
{/* <!--// Location --> */}
|
||||||
|
|
@ -125,11 +126,9 @@ function SchedulesDetail(props) {
|
||||||
{/* <!-- 본문 --> */}
|
{/* <!-- 본문 --> */}
|
||||||
|
|
||||||
<div className="top_tit">
|
<div className="top_tit">
|
||||||
<h1 className="tit_1">사이트관리</h1>
|
<h1 className="tit_1">일정관리 상세보기</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h2 className="tit_2">일정관리 상세보기</h2>
|
|
||||||
|
|
||||||
{/* <!-- 게시판 상세보기 --> */}
|
{/* <!-- 게시판 상세보기 --> */}
|
||||||
<div className="board_view2">
|
<div className="board_view2">
|
||||||
<dl>
|
<dl>
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,8 @@ function SchedulesEdit(props) {
|
||||||
requestOptions,
|
requestOptions,
|
||||||
(resp) => {
|
(resp) => {
|
||||||
if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
|
if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
|
||||||
navigate({ pathname: URL.ADMIN_SCHEDULE });
|
alert('일정이 등록되었습니다.');
|
||||||
|
navigate({ pathname: URL.ADMIN__COMMITTEE__SCHEDULES__DETAIL }, {state: {schdulId : resp.result?.schdulId}});
|
||||||
} else {
|
} else {
|
||||||
navigate({pathname: URL.ERROR}, {state: {msg : resp.resultMessage}});
|
navigate({pathname: URL.ERROR}, {state: {msg : resp.resultMessage}});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@ package com.dbnt.kcscbackend.admin.committee.schedules.controller;
|
||||||
|
|
||||||
import com.dbnt.kcscbackend.admin.committee.schedules.model.CreateScheduleVO;
|
import com.dbnt.kcscbackend.admin.committee.schedules.model.CreateScheduleVO;
|
||||||
import com.dbnt.kcscbackend.admin.committee.schedules.service.EgovIndvdlSchdulManageService;
|
import com.dbnt.kcscbackend.admin.committee.schedules.service.EgovIndvdlSchdulManageService;
|
||||||
|
import com.dbnt.kcscbackend.auth.entity.LoginVO;
|
||||||
|
import com.dbnt.kcscbackend.config.common.ResponseCode;
|
||||||
import com.dbnt.kcscbackend.config.common.ResultVO;
|
import com.dbnt.kcscbackend.config.common.ResultVO;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
|
|
@ -11,6 +13,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||||
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
|
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
|
@ -93,6 +96,45 @@ public class SchedulesApiController {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Operation(
|
||||||
|
summary = "일정 상세조회",
|
||||||
|
description = "일정 목록을 상세조회",
|
||||||
|
tags = {"SchedulesApiController"}
|
||||||
|
)
|
||||||
|
@ApiResponses(value = {
|
||||||
|
@ApiResponse(responseCode = "200", description = "조회 성공")
|
||||||
|
})
|
||||||
|
@GetMapping(value = "/schedule/{scheduleId}")
|
||||||
|
public ResultVO scheduleDetail(
|
||||||
|
HttpServletRequest request,
|
||||||
|
@AuthenticationPrincipal LoginVO user,
|
||||||
|
@PathVariable("scheduleId") Long scheduleId
|
||||||
|
)
|
||||||
|
throws Exception {
|
||||||
|
|
||||||
|
ResultVO resultVO = new ResultVO();
|
||||||
|
|
||||||
|
try {
|
||||||
|
resultVO = egovIndvdlSchdulManageService.scheduleDetail(resultVO, request, user, scheduleId);
|
||||||
|
} catch (Exception e) {
|
||||||
|
resultVO.setResultCode(-1);
|
||||||
|
resultVO.setResultMessage(e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
System.out.println(
|
||||||
|
"\n--------------------------------------------------------------\n" +
|
||||||
|
request.getRequestURI() + " OUT:" +
|
||||||
|
"\n--------------------------------------------------------------\n" +
|
||||||
|
"resultVO.toString():" + "\n" +
|
||||||
|
resultVO.toString() + "\n" +
|
||||||
|
"\n--------------------------------------------------------------\n"
|
||||||
|
);
|
||||||
|
|
||||||
|
return resultVO;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -2,7 +2,9 @@ package com.dbnt.kcscbackend.admin.committee.schedules.service;
|
||||||
|
|
||||||
|
|
||||||
import com.dbnt.kcscbackend.admin.committee.schedules.model.CreateScheduleVO;
|
import com.dbnt.kcscbackend.admin.committee.schedules.model.CreateScheduleVO;
|
||||||
|
import com.dbnt.kcscbackend.auth.entity.LoginVO;
|
||||||
import com.dbnt.kcscbackend.config.common.ResultVO;
|
import com.dbnt.kcscbackend.config.common.ResultVO;
|
||||||
|
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
import springfox.documentation.annotations.ApiIgnore;
|
import springfox.documentation.annotations.ApiIgnore;
|
||||||
|
|
||||||
|
|
@ -26,11 +28,13 @@ import javax.servlet.http.HttpServletRequest;
|
||||||
public interface EgovIndvdlSchdulManageService {
|
public interface EgovIndvdlSchdulManageService {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public ResultVO scheduleInit(ResultVO resultVO) throws Exception;
|
public ResultVO scheduleInit(ResultVO resultVO) throws Exception;
|
||||||
|
|
||||||
public ResultVO scheduleApiOrgApiDepthList(ResultVO resultVO, Long paramCodeGroup) throws Exception;
|
public ResultVO scheduleApiOrgApiDepthList(ResultVO resultVO, Long paramCodeGroup) throws Exception;
|
||||||
|
|
||||||
public ResultVO createSchedule(ResultVO resultVO, HttpServletRequest request, CreateScheduleVO createScheduleVO) throws Exception;
|
public ResultVO createSchedule(ResultVO resultVO, HttpServletRequest request, CreateScheduleVO createScheduleVO) throws Exception;
|
||||||
|
|
||||||
|
public ResultVO scheduleDetail(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long scheduleId) throws Exception;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -6,6 +6,8 @@ import com.dbnt.kcscbackend.admin.committee.schedules.service.EgovIndvdlSchdulMa
|
||||||
import com.dbnt.kcscbackend.admin.config.repository.TcCodeItemRepository;
|
import com.dbnt.kcscbackend.admin.config.repository.TcCodeItemRepository;
|
||||||
import com.dbnt.kcscbackend.admin.config.repository.TnCmtEventRepository;
|
import com.dbnt.kcscbackend.admin.config.repository.TnCmtEventRepository;
|
||||||
import com.dbnt.kcscbackend.admin.config.repository.TnCmtOrgRepository;
|
import com.dbnt.kcscbackend.admin.config.repository.TnCmtOrgRepository;
|
||||||
|
import com.dbnt.kcscbackend.auth.entity.LoginVO;
|
||||||
|
import com.dbnt.kcscbackend.config.common.ResponseCode;
|
||||||
import com.dbnt.kcscbackend.config.common.ResultVO;
|
import com.dbnt.kcscbackend.config.common.ResultVO;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.apache.tomcat.util.json.JSONParser;
|
import org.apache.tomcat.util.json.JSONParser;
|
||||||
|
|
@ -86,6 +88,8 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i
|
||||||
resultMap.put("listSubOrg", listSubOrg);
|
resultMap.put("listSubOrg", listSubOrg);
|
||||||
resultMap.put("listTopOrg", listTopOrg);
|
resultMap.put("listTopOrg", listTopOrg);
|
||||||
resultVO.setResult(resultMap);
|
resultVO.setResult(resultMap);
|
||||||
|
resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
|
||||||
|
resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
|
||||||
|
|
||||||
return resultVO;
|
return resultVO;
|
||||||
}
|
}
|
||||||
|
|
@ -140,12 +144,45 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i
|
||||||
null
|
null
|
||||||
);
|
);
|
||||||
|
|
||||||
//resultVO.setResult();
|
Map<String, Object> dto = new HashMap<String, Object>();
|
||||||
resultVO.setResultMessage("OK");
|
dto.put("schdulId", response.get("_evt_seq") );
|
||||||
resultVO.setResultCode(0);
|
|
||||||
|
resultVO.setResult(dto);
|
||||||
|
resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
|
||||||
|
resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
|
||||||
|
|
||||||
return resultVO;
|
return resultVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ResultVO scheduleDetail(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long scheduleId) throws Exception {
|
||||||
|
|
||||||
|
System.out.println(
|
||||||
|
"\n--------------------------------------------------------------\n" +
|
||||||
|
request.getRequestURI() + " IN:" +
|
||||||
|
"\n--------------------------------------------------------------\n" +
|
||||||
|
"scheduleId:" + "\n" +
|
||||||
|
scheduleId + "\n" +
|
||||||
|
"\n--------------------------------------------------------------\n"
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
int isValid = tnCmtEventRepository.sp_is_valid_tn_cmt_event_id( scheduleId );
|
||||||
|
|
||||||
|
Map<String, Object> dto = new HashMap<String, Object>();
|
||||||
|
//dto.put("schdulId", response.get("_evt_seq") );
|
||||||
|
|
||||||
|
resultVO.setResult(dto);
|
||||||
|
resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
|
||||||
|
resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
|
||||||
|
|
||||||
|
return resultVO;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -80,20 +80,20 @@ public interface TnCmtEventRepository extends JpaRepository<TnCmtEvent, TnCmtEve
|
||||||
@Param("_error_message") String errorMessage
|
@Param("_error_message") String errorMessage
|
||||||
);
|
);
|
||||||
|
|
||||||
/*
|
|
||||||
|
//@Procedure
|
||||||
|
//Map<String, Object> sp_is_valid_tn_cmt_event_id( @Param("_evt_seq") Long evtSeq );
|
||||||
|
|
||||||
@Procedure
|
@Procedure
|
||||||
int sp_add_tn_cmt_event(
|
int sp_is_valid_tn_cmt_event_id( Long evtSeq );
|
||||||
String _evt_type,
|
|
||||||
Integer _up_cmt_seq,
|
@Query(value = "CALL sp_is_valid_tn_cmt_event_id ( :_evt_seq )",
|
||||||
Integer _cmt_seq,
|
nativeQuery = true)
|
||||||
String _evt_title,
|
int spIsValidTnCmtEventId(
|
||||||
String _evt_location,
|
@Param("_evt_seq") Long evtSeq
|
||||||
String _evt_contents,
|
|
||||||
String _evt_start_dt,
|
|
||||||
String _evt_end_dt,
|
|
||||||
String _modi_id
|
|
||||||
);
|
);
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,8 @@ spring.datasource.hikari.maximum-pool-size=4
|
||||||
#spring.datasource.username=kcsc
|
#spring.datasource.username=kcsc
|
||||||
#spring.datasource.password=dbnt0928!
|
#spring.datasource.password=dbnt0928!
|
||||||
spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
|
spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
|
||||||
#spring.datasource.url=jdbc:log4jdbc:postgresql://127.0.0.1:5432/kcsc
|
spring.datasource.url=jdbc:log4jdbc:postgresql://127.0.0.1:5432/kcsc
|
||||||
spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/kcsc
|
#spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/kcsc
|
||||||
spring.datasource.username=dbnt0031
|
spring.datasource.username=dbnt0031
|
||||||
spring.datasource.password=dbnt0928!
|
spring.datasource.password=dbnt0928!
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue