feat: 관리자 - 위원회관리 - 진행현황 관리에서 목록 구현 건 - backEnd

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) {
 
                     <div className="contents " id="contents">
                         {/* <!-- 본문 --> */}
-                        <div className="top_tit">
-                            <h1 className="tit_1">진행현황 관리</h1>
-                        </div>
+                        <StyledDiv>
+                            <div className="top_tit">
+                                <h1 className="tit_1">진행현황 관리</h1>
+                            </div>
 
-                        {/* <!-- 게시판목록 --> */}
-                        <div className="board_list BRD008">
+                            {/* <!-- 게시판목록 --> */}
+                            <div className="board_list BRD008">
                                 <div className="head">
-                                    <span>번호</span>
-                                    <span>제목</span>
-                                    <span>기간</span>
-                                    <span>사용여부</span>
+                                    <span>#</span>
+                                    <span>구분</span>
+                                    <span>제목 / 코드명</span>
+                                    <span>진행위원회</span>
+                                    <span>진행단계</span>
+                                    <span>등록일</span>
+                                    <span>수정</span>
+                                    <span>삭제</span>
                                 </div>
                                 <div className="result">                                    
                                     {/* <!-- case : 데이터 없을때 --> */}
@@ -83,6 +189,13 @@ function ProgressStatus(props) {
                                     {listItem.map((it)=>(
                                         <div className='list_item' key={it.seq}>
                                             <div>{it.number}</div>
+                                            <div>{it.drftTypeNm}</div>
+                                            <div>{it.categoryNm}<br /><Link to={URL.MAIN} className="home">{it.title}</Link></div>
+                                            <div>{it.orgNm}</div>
+                                            <div>진행단계표시</div>
+                                            <div>{it.regDate}</div>
+                                            <div><button type='button' className='btn btn_blue_h31 px-1'>수정</button></div>
+                                            <div><button type='button' className='btn btn_red_h31 px-1'>삭제</button></div>
                                         </div>
                                     ))}
                                 </div>
@@ -105,6 +218,7 @@ function ProgressStatus(props) {
                                 
                             </div>
                             {/* <!--/ Paging --> */}
+                        </StyledDiv>                        
                         {/* <!--// 본문 --> */}
                     </div>
                 </div>

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;
+  }
+
+
+}

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;
+
+
+}

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;
+
+}

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;
+
+}

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;
+
+
+}

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<String, Object> 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<String, Object> dto = new HashMap<String, Object>();
+        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<Map<String, Object>> list = new ArrayList<>();
+        long totalRecordCount = tnCmtDraftRepository.findByUseYnOrderByDrftSeqDesc("Y").size();
+        List<Map<String, Object>> itemList = tnCmtDraftRepository.getCommitteeProgressStatus(pageable.getPageSize(),pageable.getPageNumber());
+        AtomicInteger index = new AtomicInteger();
+        for (Map<String, Object> item : itemList) {
+
+            Map<String, Object> item2 = new HashMap<>();
+            for (String key : item.keySet()) {
+                item2.put(key, item.get(key));
+            }
+            item2.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement());
+            list.add(item2);
+        }
+
+        PaginationInfo paginationInfo = new PaginationInfo();
+        paginationInfo.setCurrentPageNo(pageable.getPageNumber()+1);
+        paginationInfo.setRecordCountPerPage(pageable.getPageSize());
+        paginationInfo.setPageSize(5);//hard coded
+        paginationInfo.setTotalRecordCount((int) totalRecordCount);
+
+        Map<String, Object> dto = new HashMap<String, Object>();
+
+        dto.put("list", list);
+        dto.put("paginationInfo", paginationInfo);
+        resultVO.setResult(dto);
+        resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
+        resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
+
+        return resultVO;
+    }
+
+    @Override
+    public ResultVO setCommitteeProgressStatus(ResultVO resultVO, HttpServletRequest request, LoginVO user, SetCommitteeCodeManagementVO setCommitteeCodeManagementVO, Long cmtSeq) throws Exception {
+        System.out.println(
+            "\n--------------------------------------------------------------\n" +
+            request.getRequestURI() + " IN:" +
+            "\n--------------------------------------------------------------\n" +
+            "setCommitteeCodeManagementVO:" + "\n" +
+            setCommitteeCodeManagementVO.toString() + "\n" +
+            "cmtSeq:" + "\n" +
+            cmtSeq + "\n" +
+            "\n--------------------------------------------------------------\n"
+        );
+
+        // 유효성 검사 실시
+        int isValid = tnCmtDraftRepository.spIsValidTnCmtDraftId(cmtSeq.intValue());
+
+        if( isValid == 0 ) {
+            throw new Exception("대상이 존재하지 않습니다.");
+        }
+
+        //TnCmtDraft tnCmtDraft = tnCmtDraftRepository.findByDrftSeq(cmtSeq);
+
+        Map<String, Object> response = tnCmtDraftRepository.spUpdateTnCmtDraft(
+            cmtSeq.intValue(),
+            setCommitteeCodeManagementVO.getParamOrgNm(),
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                user.getId(),
+                null,
+                null,
+                null
+        );
+
+
+        Map<String, Object> dto = new HashMap<String, Object>();
+        dto.put("errorMessage", response.get("_error_message") );
+        dto.put("orgId",  cmtSeq);
+
+        resultVO.setResult(dto);
+        resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
+        resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
+
+        return resultVO;
+    }
+
+    @Override
+    public ResultVO deleteCommitteeProgressStatus(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long cmtSeq) throws Exception {
+        System.out.println(
+                "\n--------------------------------------------------------------\n" +
+                        request.getRequestURI() + " IN:" +
+                        "\n--------------------------------------------------------------\n" +
+                        "cmtSeq:" + "\n" +
+                        cmtSeq + "\n" +
+                        "\n--------------------------------------------------------------\n"
+        );
+
+
+        Map<String, Object> response = tnCmtDraftRepository.spDeleteTnCmtDraft(
+                cmtSeq.intValue(),
+                user.getId(),
+                null,
+                null,
+                null
+        );
+
+
+        Map<String, Object> dto = new HashMap<String, Object>();
+        dto.put("errorMessage", response.get("_error_message") );
+        dto.put("orgId", cmtSeq );
+
+        resultVO.setResult(dto);
+        resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
+        resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
+
+        return resultVO;
+    }
+
+}

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtDraftAttendRepository.java

@@ -0,0 +1,101 @@
+package com.dbnt.kcscbackend.commonCode.repository;
+
+import com.dbnt.kcscbackend.admin.committee.entity.TnCmtDraftAttend;
+import com.dbnt.kcscbackend.commonCode.entity.TnPopupMng;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.jpa.repository.query.Procedure;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Map;
+
+/** 작성 중 ...*/
+public interface TnCmtDraftAttendRepository extends JpaRepository<TnCmtDraftAttend, Long> {
+
+    @Query(value = "CALL sp_add_tn_popup_mng (" +
+            ":_popup_title, " +
+            "TO_TIMESTAMP(" +
+            "    :_popup_start_date," +
+            "    'YYYYMMDDHH24MISS'" +
+            ")::::timestamptz AT TIME ZONE 'UTC', " +
+            "TO_TIMESTAMP(" +
+            "    :_popup_end_date," +
+            "    'YYYYMMDDHH24MISS'" +
+            ")::::timestamptz AT TIME ZONE 'UTC', " +
+            ":_file_grp_id, " +
+            ":_popup_contents, " +
+            ":_modi_id, " +
+            ":_popup_seq, " +
+            ":_result_count, " +
+            ":_result_code, " +
+            ":_error_message)",
+            nativeQuery = true)
+    Map<String, Object> spAddTnPopupMng(
+            @Param("_popup_title")          String          popupTitle,
+            @Param("_popup_start_date")     String          popupStartDate,
+            @Param("_popup_end_date")       String          popupEndDate,
+            @Param("_file_grp_id")          String          fileGrpId,
+            @Param("_popup_contents")       String          popupContents,
+            @Param("_modi_id")              String          modiId,
+            @Param("_popup_seq")            Integer         popupSeq,
+            @Param("_result_count")         Integer         resultCount,
+            @Param("_result_code")          String          resultCode,
+            @Param("_error_message")        String          errorMessage
+    );
+
+
+    @Query(value = "CALL sp_update_tn_popup_mng (" +
+            ":_popup_seq, " +
+            ":_popup_title, " +
+            "TO_TIMESTAMP(" +
+            "    :_popup_start_date," +
+            "    'YYYYMMDDHH24MISS'" +
+            ")::::timestamptz AT TIME ZONE 'UTC', " +
+            "TO_TIMESTAMP(" +
+            "    :_popup_end_date," +
+            "    'YYYYMMDDHH24MISS'" +
+            ")::::timestamptz AT TIME ZONE 'UTC', " +
+            ":_file_grp_id, " +
+            ":_popup_contents, " +
+            ":_modi_id, " +
+            ":_result_count, " +
+            ":_result_code, " +
+            ":_error_message)",
+            nativeQuery = true)
+    Map<String, Object> spUpdateTnPopupMng(
+            @Param("_popup_seq")            Integer         popupSeq,
+            @Param("_popup_title")          String          popupTitle,
+            @Param("_popup_start_date")     String          popupStartDate,
+            @Param("_popup_end_date")       String          popupEndDate,
+            @Param("_file_grp_id")          String          fileGrpId,
+            @Param("_popup_contents")       String          popupContents,
+            @Param("_modi_id")              String          modiId,
+            @Param("_result_count")         Integer         resultCount,
+            @Param("_result_code")          String          resultCode,
+            @Param("_error_message")        String          errorMessage
+    );
+
+
+    @Query(value = "CALL sp_delete_tn_popup_mng (" +
+            ":_popup_seq, " +
+            ":_modi_id, " +
+            ":_result_count, " +
+            ":_result_code, " +
+            ":_error_message)",
+            nativeQuery = true)
+    Map<String, Object> spDeleteTnPopupMng(
+            @Param("_popup_seq")        Integer       popupSeq,
+            @Param("_modi_id")          String        modiId,
+            @Param("_result_count")     Integer       resultCount,
+            @Param("_result_code")      String        resultCode,
+            @Param("_error_message")    String        errorMessage
+    );
+
+
+    @Procedure("sp_is_valid_tn_popup_mng_id")
+    int spIsValidTnPopupMngId( Integer        popupSeq );
+
+    TnCmtDraftAttend findByDrftAtdSeq(Long drftAtdSeq);
+
+
+}

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtDraftDetailRepository.java

@@ -0,0 +1,101 @@
+package com.dbnt.kcscbackend.commonCode.repository;
+
+import com.dbnt.kcscbackend.admin.committee.entity.TnCmtDraftDetail;
+import com.dbnt.kcscbackend.commonCode.entity.TnPopupMng;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.jpa.repository.query.Procedure;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Map;
+
+/** 작성 중 ...*/
+public interface TnCmtDraftDetailRepository extends JpaRepository<TnCmtDraftDetail, Long> {
+
+    @Query(value = "CALL sp_add_tn_popup_mng (" +
+            ":_popup_title, " +
+            "TO_TIMESTAMP(" +
+            "    :_popup_start_date," +
+            "    'YYYYMMDDHH24MISS'" +
+            ")::::timestamptz AT TIME ZONE 'UTC', " +
+            "TO_TIMESTAMP(" +
+            "    :_popup_end_date," +
+            "    'YYYYMMDDHH24MISS'" +
+            ")::::timestamptz AT TIME ZONE 'UTC', " +
+            ":_file_grp_id, " +
+            ":_popup_contents, " +
+            ":_modi_id, " +
+            ":_popup_seq, " +
+            ":_result_count, " +
+            ":_result_code, " +
+            ":_error_message)",
+            nativeQuery = true)
+    Map<String, Object> spAddTnPopupMng(
+            @Param("_popup_title")          String          popupTitle,
+            @Param("_popup_start_date")     String          popupStartDate,
+            @Param("_popup_end_date")       String          popupEndDate,
+            @Param("_file_grp_id")          String          fileGrpId,
+            @Param("_popup_contents")       String          popupContents,
+            @Param("_modi_id")              String          modiId,
+            @Param("_popup_seq")            Integer         popupSeq,
+            @Param("_result_count")         Integer         resultCount,
+            @Param("_result_code")          String          resultCode,
+            @Param("_error_message")        String          errorMessage
+    );
+
+
+    @Query(value = "CALL sp_update_tn_popup_mng (" +
+            ":_popup_seq, " +
+            ":_popup_title, " +
+            "TO_TIMESTAMP(" +
+            "    :_popup_start_date," +
+            "    'YYYYMMDDHH24MISS'" +
+            ")::::timestamptz AT TIME ZONE 'UTC', " +
+            "TO_TIMESTAMP(" +
+            "    :_popup_end_date," +
+            "    'YYYYMMDDHH24MISS'" +
+            ")::::timestamptz AT TIME ZONE 'UTC', " +
+            ":_file_grp_id, " +
+            ":_popup_contents, " +
+            ":_modi_id, " +
+            ":_result_count, " +
+            ":_result_code, " +
+            ":_error_message)",
+            nativeQuery = true)
+    Map<String, Object> spUpdateTnPopupMng(
+            @Param("_popup_seq")            Integer         popupSeq,
+            @Param("_popup_title")          String          popupTitle,
+            @Param("_popup_start_date")     String          popupStartDate,
+            @Param("_popup_end_date")       String          popupEndDate,
+            @Param("_file_grp_id")          String          fileGrpId,
+            @Param("_popup_contents")       String          popupContents,
+            @Param("_modi_id")              String          modiId,
+            @Param("_result_count")         Integer         resultCount,
+            @Param("_result_code")          String          resultCode,
+            @Param("_error_message")        String          errorMessage
+    );
+
+
+    @Query(value = "CALL sp_delete_tn_popup_mng (" +
+            ":_popup_seq, " +
+            ":_modi_id, " +
+            ":_result_count, " +
+            ":_result_code, " +
+            ":_error_message)",
+            nativeQuery = true)
+    Map<String, Object> spDeleteTnPopupMng(
+            @Param("_popup_seq")        Integer       popupSeq,
+            @Param("_modi_id")          String        modiId,
+            @Param("_result_count")     Integer       resultCount,
+            @Param("_result_code")      String        resultCode,
+            @Param("_error_message")    String        errorMessage
+    );
+
+
+    @Procedure("sp_is_valid_tn_popup_mng_id")
+    int spIsValidTnPopupMngId( Integer        popupSeq );
+
+    TnCmtDraftDetail findByDrftDtSeq(Long drftDtSeq);
+
+
+}

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtDraftRepository.java

@@ -0,0 +1,212 @@
+package com.dbnt.kcscbackend.commonCode.repository;
+
+import com.dbnt.kcscbackend.admin.committee.entity.TnCmtDraft;
+import com.dbnt.kcscbackend.commonCode.entity.TnPopupMng;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.jpa.repository.query.Procedure;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface TnCmtDraftRepository extends JpaRepository<TnCmtDraft, Long> {
+
+    @Query(value = "CALL sp_add_tn_cmt_draft (" +
+            ":_drft_title, " +
+            ":_drft_type_cd, " +
+            ":_drft_dt, " +
+            ":_cmt_seq, " +
+            ":_measure_pre_data_file_grp_id, " +
+            ":_measure_pre_form_file_grp_id, " +
+            ":_measure_partner_file_grp_id, " +
+            ":_drft_confe_charger, " +
+            ":_drft_confe_pw, " +
+            ":_drft_confe_room, " +
+            ":_drft_stat_cd, " +
+            ":_drft_summery, " +
+            ":_measure_plan_file_grp_id, " +
+            ":_measure_result_file_grp_id, " +
+            ":_start_dt, " +
+            ":_end_dt, " +
+            ":_modi_id, " +
+            ":_drft_seq, " +
+            ":_result_count, " +
+            ":_result_code, " +
+            ":_error_message)",
+            nativeQuery = true)
+    Map<String, Object> spAddTnCmtDraft(
+            @Param("_drft_title")                       String          drftTitle,
+            @Param("_drft_type_cd")                     Integer         drftTypeCd,
+            @Param("_drft_dt")                          String          drftDt,
+            @Param("_cmt_seq")                          Integer         cmtSeq,
+            @Param("_measure_pre_data_file_grp_id")     String          measurePreDataFileGrpId,
+            @Param("_measure_pre_form_file_grp_id")     String          measurePreFormFileGrpId,
+            @Param("_measure_partner_file_grp_id")      String          measurePartnerFileGrpId,
+            @Param("_drft_confe_charger")               String          drftConfeCharger,
+            @Param("_drft_confe_pw")                    String          drftConfePw,
+            @Param("_drft_confe_room")                  String          drftConfeRoom,
+            @Param("_drft_stat_cd")                     String          drftStatCd,
+            @Param("_drft_summery")                     String          drftSummery,
+            @Param("_measure_plan_file_grp_id")         String          measurePlanFileGrpId,
+            @Param("_measure_result_file_grp_id")       String          measureResultFileGrpId,
+            @Param("_start_dt")                         String          startDt,
+            @Param("_end_dt")                           String          endDt,
+            @Param("_modi_id")                          String          modiId,
+            @Param("_drft_seq")                         Integer         drftSeq,
+            @Param("_result_count")                     Integer         resultCount,
+            @Param("_result_code")                      String          resultCode,
+            @Param("_error_message")                    String          errorMessage
+    );
+
+
+    @Query(value = "CALL sp_update_tn_cmt_draft (" +
+            ":_drft_seq, " +
+            ":_drft_title, " +
+            ":_doc_info_seq, " +
+            ":_drft_type_cd, " +
+            ":_drft_dt, " +
+            ":_cmt_seq, " +
+            ":_measure_pre_data_file_grp_id, " +
+            ":_measure_pre_form_file_grp_id, " +
+            ":_measure_partner_file_grp_id, " +
+            ":_drft_confe_charger, " +
+            ":_drft_confe_pw, " +
+            ":_drft_confe_room, " +
+            ":_drft_stat_cd, " +
+            ":_drft_summery, " +
+            ":_measure_plan_file_grp_id, " +
+            ":_measure_result_file_grp_id, " +
+            ":_start_dt, " +
+            ":_end_dt, " +
+            ":_modi_id, " +
+            ":_result_count, " +
+            ":_result_code, " +
+            ":_error_message)",
+            nativeQuery = true)
+    Map<String, Object> spUpdateTnCmtDraft(
+            @Param("_drft_seq")			                        Integer     drftSeq,
+            @Param("_drft_title")			                    String      drftTitle,
+            @Param("_doc_info_seq")		                        Integer     docInfoSeq,
+            @Param("_drft_type_cd")		                        String      drftTypeCd,
+            @Param("_drft_dt")			                        String      drftDt,
+            @Param("_cmt_seq")			                        Integer     cmtSeq,
+            @Param("_measure_pre_data_file_grp_id")	            String      measurePreDataFileGrpId,
+            @Param("_measure_pre_form_file_grp_id")	            String      measurePreFormFileGrpId,
+            @Param("_measure_partner_file_grp_id")	            String      measurePartnerFileGrpId,
+            @Param("_drft_confe_charger")				        String      drftConfeCharger,
+            @Param("_drft_confe_pw")					        String      drftConfePw,
+            @Param("_drft_confe_room")				            String      drftConfeRoom,
+            @Param("_drft_stat_cd")					            String      drftStatCd,
+            @Param("_drft_summery")					            String      drftSummery,
+            @Param("_measure_plan_file_grp_id")		            String      measurePlanFileGrpId,
+            @Param("_measure_result_file_grp_id")		        String      measureResultFileGrpId,
+            @Param("_start_dt")						            String      startDt,
+            @Param("_end_dt")							        String      endDt,
+            @Param("_modi_id")                                  String      modiId,
+            @Param("_result_count")                             Integer     resultCount,
+            @Param("_result_code")                              String      resultCode,
+            @Param("_error_message")                            String      errorMessage
+    );
+
+
+    @Query(value = "CALL sp_delete_tn_cmt_draft (" +
+            ":_drft_seq, " +
+            ":_modi_id, " +
+            ":_result_count, " +
+            ":_result_code, " +
+            ":_error_message)",
+            nativeQuery = true)
+    Map<String, Object> spDeleteTnCmtDraft(
+            @Param("_drft_seq")         Integer       drftSeq,
+            @Param("_modi_id")          String        modiId,
+            @Param("_result_count")     Integer       resultCount,
+            @Param("_result_code")      String        resultCode,
+            @Param("_error_message")    String        errorMessage
+    );
+
+
+    @Procedure("sp_is_valid_tn_cmt_draft_id")
+    int spIsValidTnCmtDraftId( Integer        drftSeq );
+
+    TnCmtDraft findByDrftSeq(Long drftSeq);
+    List<TnCmtDraft> findByUseYnOrderByDrftSeqDesc(String useYn);
+
+
+    @Query(value =
+            "select " +
+                "	tcd.drft_seq as \"seq\", " +
+                "	tcd.doc_info_seq as \"categoryId\", " +
+                "	tcd.drft_dt as \"drftDatetime\", " +
+                "	tcd.drft_title as \"title\", " +
+                "	null as \"drftCharger\", " +
+                "	null as \"drftChargerEmail\", " +
+                "	null as \"drftChargerPhone\", " +
+                "	null as \"drftStatCode\", " +
+                "	tcd.drft_type_cd as \"drftTypeCode\", " +
+                "	tcd.cmt_seq as \"orgId\", " +
+                "	null as \"startDatetime\", " +
+                "	null as \"endDatetime\", " +
+                "	null as \"closeDatetime\", " +
+                "	tcd.frst_crt_dt as \"createDate\", " +
+                "	tcd.last_chg_dt as \"updateDate\", " +
+                "	null as \"createUserId\", " +
+                "	null as \"updateUserId\", " +
+                "	case when UPPER(tcd.use_yn) = 'Y' then 'N' else 'Y'	end as \"delYn\", " +
+                "	tcd.drft_summery as \"drftSummery\", " +
+                "	tcd.drft_confe_charger as \"drftConfeCharger\", " +
+                "	tcd.drft_confe_pw as \"drftConfePw\", " +
+                "	tcd.drft_confe_room as \"drftConfeRoom\", " +
+                "	null as \"drftMeasurePlanFileSeq\", " +
+                "	null as \"drftMeasureResultFileSeq\", " +
+                "	null as \"drftMeasurePlanFileName\", " +
+                "	null as \"drftMeasureResultFileName\", " +
+                "	null as \"drftMeasurePreDataFileName\", " +
+                "	null as \"drftMeasurePreDataFileSeq\", " +
+                "	null as \"drftMeasurePreFormFileName\", " +
+                "	null as \"drftMeasurePreFormFileSeq\", " +
+                "	null as \"drftMeasurePartnerFileName\", " +
+                "	null as \"drftMeasurePartnerFileSeq\", " +
+                "	null as \"drftProcess\", " +
+                "	( " +
+                "		select tci.item_nm " +
+                "		from tc_code_item tci " +
+                "		where tci.item_cd = tcd.drft_type_cd  " +
+                "		limit 1 offset 0 " +
+                "	) as \"drftTypeNm\", " +
+                "	concat(tdi.kcsc_cd, ' ', tdi.doc_nm) as \"categoryNm\", " +
+                "	tco.cmt_nm  as \"orgNm\", " +
+                "	( " +
+                "		select tci.item_nm " +
+                "		from tc_code_item tci " +
+                "		where tci.item_cd = tcd.drft_stat_cd " +
+                "		limit 1 offset 0 " +
+                "	) as \"drftStatNm\", " +
+                "	null as \"categoryInfo\", " +
+                "	null as \"orgType\", " +
+                "	null as \"upOrgId\", " +
+                "	null as \"orgList\", " +
+                "	null as \"orgList1\", " +
+                "	null as \"orgList2\", " +
+                "	null as \"orgList3\", " +
+                "	null as \"depthOrgId\", " +
+                "	null as \"depthOrgId1\", " +
+                "	null as \"depthOrgId2\", " +
+                "	null as \"depthOrgId3\", " +
+                "	to_char(tcd.frst_crt_dt, 'yyyy-mm-dd') as \"regDate\" " +
+            "from tn_cmt_draft tcd   " +
+                "left join tn_document_info tdi on tcd.doc_info_seq = tdi.doc_info_seq  " +
+                "left join tn_document_group tdg on tdi.group_seq = tdg.group_seq " +
+                "left join tn_cmt_org tco on tcd.cmt_seq = tco.cmt_seq  " +
+            "where tcd.use_yn = 'Y' " +
+            "order by tcd.drft_seq desc " +
+            "limit :limit offset :limit * :offset",
+            nativeQuery = true)
+    List<Map<String, Object>> getCommitteeProgressStatus(
+            @Param("limit")             Integer         limit,
+            @Param("offset")            Integer         offset
+    );
+
+
+}