From bcaf14dfc3f0062f8df2a1a0502c44c32eac5482 Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 26 Jan 2024 13:18:12 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?= =?UTF-8?q?=EC=BB=A8=ED=85=90=EC=B8=A0=EA=B4=80=EB=A6=AC=20-=20=EA=B1=B4?= =?UTF-8?q?=EC=84=A4=EA=B8=B0=EC=A4=80=EC=97=B0=EA=B5=AC=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=97=90=EC=84=9C=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84=20back-end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminStandardResearchController.java | 4 ++-- .../TnResearchRepositoryLightweight.java | 10 ++++++++ .../AdminStandardResearchServiceImpl.java | 23 +++++++------------ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/AdminStandardResearchController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/AdminStandardResearchController.java index f2ecfd9..b56428e 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/AdminStandardResearchController.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/AdminStandardResearchController.java @@ -172,11 +172,11 @@ public class AdminStandardResearchController { ( @AuthenticationPrincipal LoginVO user, HttpServletRequest request, - @PathVariable("rsId") String strPopupId + @PathVariable("rsId") String strRsId ) throws Exception { ResultVO resultVO = new ResultVO(); - Long rsId = Long.valueOf(strPopupId); + Long rsId = Long.valueOf(strRsId); try { resultVO = adminStandardResearchService.contentsStandardResearchDelete(resultVO, request, user, rsId); } catch (Exception e) { diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/repository/TnResearchRepositoryLightweight.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/repository/TnResearchRepositoryLightweight.java index d8db62c..e5ae1fa 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/repository/TnResearchRepositoryLightweight.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/repository/TnResearchRepositoryLightweight.java @@ -1,8 +1,18 @@ package com.dbnt.kcscbackend.admin.standardResearch.repository; import com.dbnt.kcscbackend.admin.standardResearch.model.TnResearchLightweight; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; public interface TnResearchRepositoryLightweight extends JpaRepository { + @Query(value = "SELECT COUNT(1) FROM tn_research tr WHERE tr.use_yn = :use_yn", nativeQuery = true) + Long countByUseYn(@Param("use_yn") String useYn); + + List findByUseYn( String useYn, Pageable pageable); + } diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java index 1ba4b3a..6547cbc 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java @@ -54,8 +54,8 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im ); - long totalRecordCount = tnResearchRepositoryLightweight.count(); - List> list = tnResearchRepositoryLightweight.findAll(pageable) + long totalRecordCount = tnResearchRepositoryLightweight.countByUseYn("Y"); + List> list = tnResearchRepositoryLightweight.findByUseYn("Y", pageable) .stream() .map(item -> { Map codeMap = new HashMap<>(); @@ -64,11 +64,11 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im codeMap.put("researchStartDate", item.getRsStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); codeMap.put("researchEndDate", item.getRsEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); codeMap.put("director", item.getRsDirector()); - codeMap.put("createDate", item.getFrstCrtDt()); - codeMap.put("createUserId", item.getFrstCrtId()); - codeMap.put("updateDate", item.getLastChgDt()); - codeMap.put("updateUserId", item.getLastChgId()); - codeMap.put("useYn", item.getUseYn()); + //codeMap.put("createDate", item.getFrstCrtDt()); + //codeMap.put("createUserId", item.getFrstCrtId()); + //codeMap.put("updateDate", item.getLastChgDt()); + //codeMap.put("updateUserId", item.getLastChgId()); + //codeMap.put("useYn", item.getUseYn()); return codeMap; }) .collect(Collectors.toList()); @@ -165,10 +165,6 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im dto.put("updateUserId", tnResearch.getLastChgId()); dto.put("useYn", tnResearch.getUseYn()); - - - - resultVO.setResult(dto); resultVO.setResultCode(ResponseCode.SUCCESS.getCode()); resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage()); @@ -222,6 +218,7 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im @Override public ResultVO contentsStandardResearchDelete(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long rsId) throws Exception { + System.out.println( "\n--------------------------------------------------------------\n" + request.getRequestURI() + " IN:" + @@ -231,10 +228,6 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im "\n--------------------------------------------------------------\n" ); - - - - Map dto = new HashMap(); Map response = tnResearchRepository.spDeleteTnResearch(