diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus.jsx
index 40ad06d..94ff4e8 100644
--- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus.jsx
+++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus.jsx
@@ -8,6 +8,102 @@ import URL from 'constants/url';
import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin';
import EgovPagingPaginationInfo from 'components/EgovPagingPaginationInfo';
+import styled from "styled-components";
+
+const StyledDiv = styled.div`
+.BRD008 {
+ .head {
+ span {
+ text-align: left;
+ &:nth-child(1) {
+ width: 32px;
+ text-align: center;
+ }
+ &:nth-child(2) {
+ width: 60px;
+ text-align: center;
+ }
+ &:nth-child(3) {
+ width: 300px;
+ }
+ &:nth-child(4) {
+ width: 120px;
+ }
+ &:nth-child(5) {
+ width: 80px;
+ }
+ &:nth-child(6) {
+ width: 70px;
+ }
+ &:nth-child(7) {
+ width: 50px;
+ text-align: center;
+ }
+ &:nth-child(8) {
+ width: 50px;
+ text-align: center;
+ }
+ }
+ }
+ .result .list_item {
+ & > div {
+ text-align: left;
+ &:nth-child(1) {
+ width: 32px;
+ text-align: center;
+ }
+ &:nth-child(2) {
+ width: 60px;
+ text-align: center;
+ }
+ &:nth-child(3) {
+ width: 300px;
+ }
+ &:nth-child(4) {
+ width: 120px;
+ }
+ &:nth-child(5) {
+ width: 80px;
+ }
+ &:nth-child(6) {
+ width: 70px;
+ }
+ &:nth-child(7) {
+ width: 50px;
+ text-align: center;
+ }
+ &:nth-child(8) {
+ width: 50px;
+ text-align: center;
+ }
+ }
+ }
+}
+
+.board-bot {
+ margin-top: 20px;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ justify-content: flex-start;
+ align-items: stretch;
+ justify-content: center;
+
+ & > *:nth-child(1) {
+ width: 16%;
+ justify-content: left;
+ }
+ & > *:nth-child(2) {
+ width: 68%;
+ justify-content: center;
+ }
+ & > *:nth-child(3) {
+ width: 16%;
+ justify-content: right;
+ }
+}
+`;
+
function ProgressStatus(props) {
const location = useLocation();
@@ -16,6 +112,11 @@ function ProgressStatus(props) {
const [paginationInfo, setPaginationInfo] = useState({});
const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || { pageIndex: 1, searchCnd: '0', searchWrd: '' });
+ useEffect(function () {
+ getList(searchCondition);
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
+
const requestOptions = {
method: "GET",
headers: {
@@ -25,11 +126,11 @@ function ProgressStatus(props) {
const getList = (searchCondition) => {
- EgovNet.requestFetch(`/contents/api/popup-manage/list?page=${searchCondition.pageIndex-1}&size=10&sort=popupSeq,desc`,
+ EgovNet.requestFetch(`/admin/committee/progress-status/list?page=${searchCondition.pageIndex-1}&size=10&sort=popupSeq,desc`,
requestOptions,
function (resp) {
console.log('%o', resp);
- setListItem(resp.result.listPopup);
+ setListItem(resp.result.list);
setPaginationInfo({...resp.result.paginationInfo});
}
);
@@ -63,17 +164,22 @@ function ProgressStatus(props) {
diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/config/AboutSiteMgt.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/config/AboutSiteMgt.jsx
index 0003462..3bf6bab 100644
--- a/egovframe-template-simple-react-contribution/src/pages/admin/config/AboutSiteMgt.jsx
+++ b/egovframe-template-simple-react-contribution/src/pages/admin/config/AboutSiteMgt.jsx
@@ -50,13 +50,13 @@ function StandardCodeMgt(props) {
mutListTag.push(
);
});
@@ -76,7 +76,7 @@ function StandardCodeMgt(props) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
- function editBoard(item){
+ function editPartnerSite(item){
handleShow();
if(item != undefined) {
item.mode = CODE.MODE_MODIFY;
@@ -147,13 +147,13 @@ function StandardCodeMgt(props) {
{/* */}
- 번호
+
사이트명
URL
배너이미지
정렬순서
사용여부
-
+
{listTag}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/AdminBoardsController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/AdminBoardsController.java
index 9215a7b..1a2ec86 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/AdminBoardsController.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/AdminBoardsController.java
@@ -4,6 +4,8 @@ import com.dbnt.kcscbackend.admin.boards.entity.TnBbs;
import com.dbnt.kcscbackend.admin.boards.service.AdminBoardsService;
import com.dbnt.kcscbackend.admin.config.entity.TcMenu;
import com.dbnt.kcscbackend.auth.entity.LoginVO;
+import com.dbnt.kcscbackend.commonCode.CommonCodeController;
+import com.dbnt.kcscbackend.commonCode.service.CommonCodeService;
import com.dbnt.kcscbackend.config.common.BaseController;
import com.dbnt.kcscbackend.config.common.ResponseCode;
import com.dbnt.kcscbackend.config.common.ResultVO;
@@ -32,6 +34,7 @@ import java.util.Map;
public class AdminBoardsController extends BaseController {
private final AdminBoardsService adminBoardsService;
+ private final CommonCodeService commonCodeService;
/* ---- 게시판관리 ----- */
@Operation(
@@ -53,6 +56,26 @@ public class AdminBoardsController extends BaseController {
return resultVO;
}
+ @Operation(
+ summary = "게시판 셀렉트박스 옵션 조회",
+ description = "게시판 셀렉트박스 옵션 조회",
+ tags = {"AdminBoardsController"}
+ )
+ @ApiResponses(value = {
+ @ApiResponse(responseCode = "200", description = "조회 성공"),
+ @ApiResponse(responseCode = "403", description = "인가된 사용자가 아님")
+ })
+ @RequestMapping(method = RequestMethod.GET, value = "/get-option-list", consumes = MediaType.APPLICATION_JSON_VALUE)
+ public ResultVO getOptionList() throws Exception {
+ ResultVO resultVO = new ResultVO();
+ Map resultMap = new HashMap<>();
+
+ resultMap.put("bbsTypeList", commonCodeService.selectCodeItemList("BBS_TYPE"));
+ resultMap.put("roleList", commonCodeService.selectCodeItemList("ROLE"));
+ resultVO.setResult(resultMap);
+ return resultVO;
+ }
+
@Operation(
summary = "게시판 저장",
description = "게시판 저장",
@@ -126,7 +149,7 @@ public class AdminBoardsController extends BaseController {
ResultVO resultVO = new ResultVO();
Map resultMap = new HashMap<>();
- resultMap.put("boardList", adminBoardsService.selectBoardList());
+ resultMap.put("postList", adminBoardsService.selectPostList());
resultVO.setResult(resultMap);
return resultVO;
}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/entity/TnBbs.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/entity/TnBbs.java
index f91277a..1226a05 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/entity/TnBbs.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/entity/TnBbs.java
@@ -70,4 +70,10 @@ public class TnBbs {
@Column(name = "oldd_seq")
private Long olddSeq;
+ @Column(name = "read_role")
+ private Long readRole;
+
+ @Column(name = "write_role")
+ private Long writeRole;
+
}
\ No newline at end of file
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/repository/TnBbsRepository.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/repository/TnBbsRepository.java
index 5291413..874c5f0 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/repository/TnBbsRepository.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/repository/TnBbsRepository.java
@@ -8,7 +8,7 @@ import java.util.List;
public interface TnBbsRepository extends JpaRepository {
- @Query(value = "SELECT * FROM tn_bbs WHERE use_yn = 'Y' ORDER BY bbs_seq DESC", nativeQuery = true)
+ @Query(value = "SELECT * FROM tn_bbs ORDER BY bbs_seq DESC", nativeQuery = true)
List findAllByOrderByBbsSeqDesc();
}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/service/AdminBoardsService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/service/AdminBoardsService.java
index 48a4bca..796d21f 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/service/AdminBoardsService.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/service/AdminBoardsService.java
@@ -34,16 +34,18 @@ public class AdminBoardsService extends EgovAbstractServiceImpl {
if (bbs.getBbsSeq() == null) {
bbs.setFrstCrtDt(LocalDateTime.now());
bbs.setFrstCrtId(userId);
- bbs.setBbsAnsYn("N");
- bbs.setBbsReplYn("N");
- bbs.setUseYn("Y");
tnBbsRepository.save(bbs);
} else {
TnBbs savedBoard = tnBbsRepository.findById(bbs.getBbsSeq()).orElse(null);
savedBoard.setBbsId(bbs.getBbsId());
savedBoard.setBbsTitle(bbs.getBbsTitle());
savedBoard.setBbsDesc(bbs.getBbsDesc());
- //savedBoard.setUseYn("Y");
+ savedBoard.setBbsType(bbs.getBbsType());
+ savedBoard.setBbsAnsYn(bbs.getBbsAnsYn());
+ savedBoard.setBbsReplYn(bbs.getBbsReplYn());
+ savedBoard.setUseYn(bbs.getUseYn());
+ savedBoard.setReadRole(bbs.getReadRole());
+ savedBoard.setWriteRole(bbs.getWriteRole());
savedBoard.setLastChgId(userId);
savedBoard.setLastChgDt(LocalDateTime.now());
tnBbsRepository.save(savedBoard);
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/AdminCommitteeController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/AdminCommitteeController.java
new file mode 100644
index 0000000..c57b67a
--- /dev/null
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/AdminCommitteeController.java
@@ -0,0 +1,92 @@
+package com.dbnt.kcscbackend.admin.committee;
+
+import com.dbnt.kcscbackend.admin.committee.service.AdminCommitteeProgressStatusService;
+import com.dbnt.kcscbackend.admin.config.entity.TcMenu;
+import com.dbnt.kcscbackend.admin.config.entity.TnPartnerSite;
+import com.dbnt.kcscbackend.admin.config.model.CreateCommitteeCodeManagementVO;
+import com.dbnt.kcscbackend.admin.config.model.SetCommitteeCodeManagementVO;
+import com.dbnt.kcscbackend.admin.config.service.AdminCommitteeCodeManagementService;
+import com.dbnt.kcscbackend.admin.config.service.AdminConfigService;
+import com.dbnt.kcscbackend.auth.entity.LoginVO;
+import com.dbnt.kcscbackend.commonCode.entity.TcCodeGrp;
+import com.dbnt.kcscbackend.commonCode.entity.TcCodeItem;
+import com.dbnt.kcscbackend.commonCode.service.CommonCodeService;
+import com.dbnt.kcscbackend.config.common.BaseController;
+import com.dbnt.kcscbackend.config.common.ResponseCode;
+import com.dbnt.kcscbackend.config.common.ResultVO;
+import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.MediaType;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.validation.Errors;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/admin/committee")
+@Tag(name="AdminCommitteeController", description = "사이트관리 위원회관리 메뉴 컨트롤러")
+public class AdminCommitteeController extends BaseController {
+
+ private final AdminConfigService adminConfigService;
+ private final CommonCodeService commonCodeService;
+
+ @Resource(name = "adminCommitteeProgressStatusService")
+ private AdminCommitteeProgressStatusService adminCommitteeProgressStatusService;
+
+
+ @Operation(
+ summary = "'진행현황 관리' 페이지에서 목록 불러오는 API",
+ description = "관리자 단에서 '위원회관리' > '진행현황 관리' 페이지에서 목록 불러오는 API",
+ tags = {"AdminCommitteeController"}
+ )
+ @ApiResponses(value = {
+ @ApiResponse(responseCode = "200", description = "조 회 성공"),
+ @ApiResponse(responseCode = "303", description = "만료된 토큰"),
+ @ApiResponse(responseCode = "403", description = "인가된 사용자가 아님")
+ })
+ @GetMapping(value = "/progress-status/list")
+ public ResultVO getCommitteeProgressStatus(
+ @AuthenticationPrincipal LoginVO user,
+ HttpServletRequest request,
+ Pageable pageable
+ ) throws Exception {
+
+ ResultVO resultVO = new ResultVO();
+ if(user == null) {
+ resultVO.setResultCode(ResponseCode.TOKEN_EXPIRED.getCode());
+ } else {
+ try {
+ resultVO = adminCommitteeProgressStatusService.getCommitteeProgressStatus(resultVO, request, user, pageable);
+ } catch (Exception e) {
+ resultVO.setResultCode(ResponseCode.FAILED.getCode());
+ resultVO.setResultMessage(e.getMessage());
+ }
+ }
+
+ System.out.println(
+ "\n--------------------------------------------------------------\n" +
+ request.getRequestURI() + " OUT:" +
+ "\n--------------------------------------------------------------\n" +
+ "resultVO.toString():" + "\n" +
+ resultVO.toString() + "\n" +
+ "\n--------------------------------------------------------------\n"
+ );
+
+ return resultVO;
+ }
+
+
+}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/entity/TnCmtDraft.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/entity/TnCmtDraft.java
new file mode 100644
index 0000000..981b507
--- /dev/null
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/entity/TnCmtDraft.java
@@ -0,0 +1,93 @@
+package com.dbnt.kcscbackend.admin.committee.entity;
+
+import lombok.*;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "tn_cmt_draft")
+public class TnCmtDraft {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "drft_seq")
+ private Long drftSeq;
+
+ @Column(name = "drft_title")
+ private String drftTitle;
+
+ @Column(name = "doc_info_seq")
+ private Long docInfoSeq;
+
+ @Column(name = "drft_type_cd")
+ private String drftTypeCd;
+
+ @Column(name = "drft_dt")
+ private String drftDt;
+
+ @Column(name = "cmt_seq")
+ private Long cmtSeq;
+
+ @Column(name = "measure_pre_data_file_grp_id")
+ private String measurePreDataFileGrpId;
+
+ @Column(name = "measure_pre_form_file_grp_id")
+ private String measurePreFormFileGrpId;
+
+ @Column(name = "measure_partner_file_grp_id")
+ private String measurePartnerFileGrpId;
+
+ @Column(name = "drft_confe_charger")
+ private String drftConfeCharger;
+
+ @Column(name = "drft_confe_pw")
+ private String drftConfePw;
+
+ @Column(name = "drft_confe_room")
+ private String drftConfeRoom;
+
+ @Column(name = "drft_stat_cd")
+ private String drftStatCd;
+
+ @Column(name = "drft_summery")
+ private String drftSummery;
+
+ @Column(name = "measure_plan_file_grp_id")
+ private String measurePlanFileGrpId;
+
+ @Column(name = "measure_result_file_grp_id")
+ private String measureResultFileGrpId;
+
+ @Column(name = "start_dt")
+ private String startDt;
+
+ @Column(name = "end_dt")
+ private String endDt;
+
+ @Column(name = "frst_crt_id")
+ private String frstCrtId;
+
+ @Column(name = "frst_crt_dt")
+ private String frstCrtDt;
+
+ @Column(name = "last_chg_id")
+ private String lastChgId;
+
+ @Column(name = "last_chg_dt")
+ private String lastChgDt;
+
+ @Column(name = "use_yn")
+ private String useYn;
+
+ @Column(name = "old_seq")
+ private Long oldSeq;
+
+
+}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/entity/TnCmtDraftAttend.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/entity/TnCmtDraftAttend.java
new file mode 100644
index 0000000..e34f4ef
--- /dev/null
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/entity/TnCmtDraftAttend.java
@@ -0,0 +1,46 @@
+package com.dbnt.kcscbackend.admin.committee.entity;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "tn_cmt_draft_attend")
+public class TnCmtDraftAttend {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "drft_atd_seq")
+ private Long drftAtdSeq;
+
+ @Column(name = "drft_seq")
+ private Long drftSeq;
+
+ @Column(name = "drft_final_type")
+ private String drftFinalType;
+
+ @Column(name = "drft_final_comment")
+ private String drftFinalComment;
+
+ @Column(name = "user_id")
+ private String userId;
+
+ @Column(name = "nick_name")
+ private String nickName;
+
+ @Column(name = "write_dt")
+ private String writeDt;
+
+ @Column(name = "drft_file_grp_id")
+ private String drftFileGrpId;
+
+}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/entity/TnCmtDraftDetail.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/entity/TnCmtDraftDetail.java
new file mode 100644
index 0000000..b3865c6
--- /dev/null
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/entity/TnCmtDraftDetail.java
@@ -0,0 +1,46 @@
+package com.dbnt.kcscbackend.admin.committee.entity;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "tn_cmt_draft_detail")
+public class TnCmtDraftDetail {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "drft_dt_seq")
+ private Long drftDtSeq;
+
+ @Column(name = "drft_seq")
+ private Long drftSeq;
+
+ @Column(name = "drft_dt_type")
+ private String drftDtType;
+
+ @Column(name = "drft_dt_value")
+ private String drftDtValue;
+
+ @Column(name = "user_id")
+ private String userId;
+
+ @Column(name = "nick_name")
+ private String nickName;
+
+ @Column(name = "write_dt")
+ private String writeDt;
+
+ @Column(name = "drft_file_grp_id")
+ private String drftFileGrpId;
+
+}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/service/AdminCommitteeProgressStatusService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/service/AdminCommitteeProgressStatusService.java
new file mode 100644
index 0000000..be7a069
--- /dev/null
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/service/AdminCommitteeProgressStatusService.java
@@ -0,0 +1,18 @@
+package com.dbnt.kcscbackend.admin.committee.service;
+
+import com.dbnt.kcscbackend.admin.config.model.CreateCommitteeCodeManagementVO;
+import com.dbnt.kcscbackend.admin.config.model.SetCommitteeCodeManagementVO;
+import com.dbnt.kcscbackend.auth.entity.LoginVO;
+import com.dbnt.kcscbackend.config.common.ResultVO;
+import org.springframework.data.domain.Pageable;
+
+import javax.servlet.http.HttpServletRequest;
+
+public interface AdminCommitteeProgressStatusService {
+ public ResultVO createCommitteeProgressStatus(ResultVO resultVO, HttpServletRequest request, LoginVO user, CreateCommitteeCodeManagementVO createCommitteeCodeManagementVO) throws Exception;
+ public ResultVO getCommitteeProgressStatus(ResultVO resultVO, HttpServletRequest request, LoginVO user, Pageable pageable) throws Exception;
+ public ResultVO setCommitteeProgressStatus(ResultVO resultVO, HttpServletRequest request, LoginVO user, SetCommitteeCodeManagementVO setCommitteeCodeManagementVO, Long cmtSeq) throws Exception;
+ public ResultVO deleteCommitteeProgressStatus(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long cmtSeq) throws Exception;
+
+
+}
\ No newline at end of file
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/service/impl/AdminCommitteeProgressStatusServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/service/impl/AdminCommitteeProgressStatusServiceImpl.java
new file mode 100644
index 0000000..d90dce0
--- /dev/null
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/service/impl/AdminCommitteeProgressStatusServiceImpl.java
@@ -0,0 +1,224 @@
+package com.dbnt.kcscbackend.admin.committee.service.impl;
+
+import com.dbnt.kcscbackend.admin.committee.entity.TnCmtDraft;
+import com.dbnt.kcscbackend.admin.committee.entity.TnCmtDraftAttend;
+import com.dbnt.kcscbackend.admin.committee.service.AdminCommitteeProgressStatusService;
+import com.dbnt.kcscbackend.admin.config.model.CreateCommitteeCodeManagementVO;
+import com.dbnt.kcscbackend.admin.config.model.SetCommitteeCodeManagementVO;
+import com.dbnt.kcscbackend.admin.contents.popUp.model.FileVO;
+import com.dbnt.kcscbackend.auth.entity.LoginVO;
+import com.dbnt.kcscbackend.commonCode.repository.TnCmtDraftAttendRepository;
+import com.dbnt.kcscbackend.commonCode.repository.TnCmtDraftDetailRepository;
+import com.dbnt.kcscbackend.commonCode.repository.TnCmtDraftRepository;
+import com.dbnt.kcscbackend.config.common.ResponseCode;
+import com.dbnt.kcscbackend.config.common.ResultVO;
+import lombok.RequiredArgsConstructor;
+import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
+import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+@Service("adminCommitteeProgressStatusService")
+@RequiredArgsConstructor
+public class AdminCommitteeProgressStatusServiceImpl extends EgovAbstractServiceImpl implements AdminCommitteeProgressStatusService {
+
+ private final TnCmtDraftRepository tnCmtDraftRepository;
+ private final TnCmtDraftAttendRepository tnCmtDraftAttendRepository;
+ private final TnCmtDraftDetailRepository tnCmtDraftDetailRepository;
+
+ @Override
+ public ResultVO createCommitteeProgressStatus(ResultVO resultVO, HttpServletRequest request, LoginVO user, CreateCommitteeCodeManagementVO createCommitteeCodeManagementVO) throws Exception {
+ System.out.println(
+ "\n--------------------------------------------------------------\n" +
+ request.getRequestURI() + " IN:" +
+ "\n--------------------------------------------------------------\n" +
+ "user.getEmail():" + "\n" +
+ user.getEmail() + "\n" +
+ "\n--------------------------------------------------------------\n"
+ );
+
+ // 아래 null로 전달 되는 부분 확인하기.
+ // 유효성 검사 실시
+ if(createCommitteeCodeManagementVO.getParamCodeLevel().trim().isEmpty()) {
+ throw new Exception("오류가 발생했습니다. 시스템 담당자에게 문의 바랍니다. paramCodeLevel is empty.");
+ }
+
+ Map response = tnCmtDraftRepository.spAddTnCmtDraft(
+ createCommitteeCodeManagementVO.getParamOrgNm(), // 위원회 이름
+ null, // 위원회 등급
+ createCommitteeCodeManagementVO.getParamOrgDesc(), // 위원회 설명
+ null, // 상위 위원회 sequence
+ null, // 정렬 순서
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ user.getId(),
+ null,
+ null,
+ null,
+ null
+ );
+
+ Map dto = new HashMap();
+ dto.put("id", response.get("_cmt_seq") );
+
+ resultVO.setResult(dto);
+ resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
+ resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
+
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO getCommitteeProgressStatus(ResultVO resultVO, HttpServletRequest request, LoginVO user, Pageable pageable) throws Exception {
+
+ System.out.println(
+ "\n--------------------------------------------------------------\n" +
+ request.getRequestURI() + " IN:" +
+ "\n--------------------------------------------------------------\n" +
+ "user.getEmail():" + "\n" +
+ user.getEmail() + "\n" +
+ "pageable.getPageSize():" + "\n" +
+ pageable.getPageSize() + "\n" +
+ "pageable.getPageNumber():" + "\n" +
+ pageable.getPageNumber() + "\n" +
+ "\n--------------------------------------------------------------\n"
+ );
+
+
+ List