From 33ed87a6d855bf902f373c4e3d8a2267c2be6969 Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 5 Jan 2024 17:32:38 +0900 Subject: [PATCH] =?UTF-8?q?feat:'=EC=9C=84=EC=9B=90=ED=9A=8C=20=EC=9D=BC?= =?UTF-8?q?=EC=A0=95=20=EB=93=B1=EB=A1=9D'=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=20=EB=A1=9C=EB=94=A9=20=EC=8B=9C,=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B6=88=EB=9F=AC=20?= =?UTF-8?q?=EC=98=A4=EB=8A=94=20API=20listTopOrg=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80\=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=8B=A8?= =?UTF-8?q?=EC=97=90=EC=84=9C=20'=EC=9C=84=EC=9B=90=ED=9A=8C=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC'=20>=20'=EC=9C=84=EC=9B=90=ED=9A=8C=20=EC=9D=BC?= =?UTF-8?q?=EC=A0=95=20=EA=B4=80=EB=A6=AC'=EC=97=90=20'=EB=93=B1=EB=A1=9D'?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=EC=9D=84=20=EB=88=84=EB=A5=B8=20=ED=9B=84?= =?UTF-8?q?=20'=EC=9C=84=EC=9B=90=ED=9A=8C=20=EC=9D=BC=EC=A0=95=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D'=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A1=9C?= =?UTF-8?q?=EB=94=A9=20=EC=8B=9C,=20=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B6=88=EB=9F=AC=20=EC=98=A4?= =?UTF-8?q?=EB=8A=94=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EgovIndvdlSchdulManageServiceImpl.java | 10 +++- .../admin/config/entity/TnCmtOrg.java | 52 ++++++++++++++----- .../config/repository/TnCmtOrgRepository.java | 5 +- 3 files changed, 51 insertions(+), 16 deletions(-) diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java index bd34236..adf340d 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java @@ -7,6 +7,7 @@ import com.dbnt.kcscbackend.admin.committee.schedules.repository.IndvdlSchdulMan import com.dbnt.kcscbackend.admin.committee.schedules.service.EgovIndvdlSchdulManageService; import com.dbnt.kcscbackend.admin.config.entity.TcCodeItem; import com.dbnt.kcscbackend.admin.config.repository.TcCodeItemRepository; +import com.dbnt.kcscbackend.admin.config.repository.TnCmtOrgRepository; import com.dbnt.kcscbackend.config.common.ResultVO; import lombok.RequiredArgsConstructor; import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; @@ -41,6 +42,9 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i private final TcCodeItemRepository tcCodeItemRepository; + private final TnCmtOrgRepository tnCmtOrgRepository; + + /** * 메인페이지/일정관리조회 @@ -150,11 +154,13 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i List listCodes = tcCodeItemRepository.findByGrpCdAndUseYnOrderByGrpOrder("EVT_TYPE", "Y").stream() .map(lc -> lc.getItemNm()) .collect(Collectors.toList()); - + List listTopOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 2).stream() + .map(lc -> lc.getCmtNm()) + .collect(Collectors.toList()); resultMap.put("listCodes", listCodes); resultMap.put("listSubOrg", ""); - resultMap.put("listTopOrg", ""); + resultMap.put("listTopOrg", listTopOrg); resultVO.setResult(resultMap); return resultVO; diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TnCmtOrg.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TnCmtOrg.java index b3255b3..d2eff65 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TnCmtOrg.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TnCmtOrg.java @@ -1,13 +1,12 @@ package com.dbnt.kcscbackend.admin.config.entity; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; +import java.io.Serializable; import java.time.LocalDateTime; @Getter @@ -16,25 +15,54 @@ import java.time.LocalDateTime; @NoArgsConstructor @DynamicInsert @DynamicUpdate -@Table(name = "tc_code_grp") -public class TcCodeGrp { +@Table(name = "tn_cmt_org") +public class TnCmtOrg { + @Id - @Column(name = "grp_cd") - private String grpCd; - @Column(name = "grp_cd_nm") - private String grpCdNm; - @Column(name = "grp_cd_desc") - private String grpCdDesc; + @Column(name = "cmt_seq") + private Integer cmtSeq; + + @Column(name = "cmt_nm") + private String cmtNm; + + @Column(name = "cmt_type") + private String cmtType; + + @Column(name = "cmt_desc") + private String cmtDesc; + + @Column(name = "up_cmt_seq") + private Integer upCmtSeq; + + @Column(name = "cmt_order") + private Integer cmtOrder; + @Column(name = "frst_crt_id") private String frstCrtId; + @Column(name = "frst_crt_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime frstCrtDt; + @Column(name = "last_chg_id") private String lastChgId; + @Column(name = "last_chg_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime lastChgDt; + @Column(name = "use_yn") private String useYn; -} + + @Column(name = "old_seq") + private Integer oldSeq; + + @Embeddable + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class TnCmtOrgId implements Serializable { + private String cmtSeq; + } + +} \ No newline at end of file diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TnCmtOrgRepository.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TnCmtOrgRepository.java index 5852f71..1963219 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TnCmtOrgRepository.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TnCmtOrgRepository.java @@ -1,10 +1,11 @@ package com.dbnt.kcscbackend.admin.config.repository; import com.dbnt.kcscbackend.admin.config.entity.TcCodeItem; +import com.dbnt.kcscbackend.admin.config.entity.TnCmtOrg; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface TcCodeItemRepository extends JpaRepository { - List findByGrpCdAndUseYnOrderByGrpOrder(String grpCd, String useYn); +public interface TnCmtOrgRepository extends JpaRepository { + List findByUseYnAndUpCmtSeqOrderByCmtOrder(String useYn, Integer upCmtSeq); }