From 9c7651f2cd2ddff7da344a1cf141c4ae7fbcc348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EB=AF=BC=ED=98=95?= Date: Fri, 29 Mar 2024 15:38:36 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=B6=9C=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/admin/config/AboutSiteMgt.jsx | 2 +- .../admin/config/AdminConfigController.java | 13 +++++++++++-- .../admin/config/entity/TnPartnerSite.java | 3 +++ 3 files changed, 15 insertions(+), 3 deletions(-) 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 3bf6bab..bf4c533 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 @@ -53,7 +53,7 @@ function StandardCodeMgt(props) {
{item.siteTitle}
{item.siteUrl}
-
{item.fileGrpId}
+
{item.filePath}
{item.siteOrder}
{item.useYn}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/AdminConfigController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/AdminConfigController.java index 5ff7f7f..56ce9a0 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/AdminConfigController.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/AdminConfigController.java @@ -13,6 +13,8 @@ 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 com.dbnt.kcscbackend.file.entity.TnAttachFile; +import com.dbnt.kcscbackend.file.service.FileService; import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -31,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.time.LocalDateTime; import java.util.HashMap; +import java.util.List; import java.util.Map; @RestController @@ -41,6 +44,7 @@ public class AdminConfigController extends BaseController { private final AdminConfigService adminConfigService; private final CommonCodeService commonCodeService; + private final FileService fileService; @Resource(name = "adminCommitteeCodeManagementService") private AdminCommitteeCodeManagementService adminCommitteeCodeManagementService; @@ -501,8 +505,13 @@ public class AdminConfigController extends BaseController { public ResultVO getPartnerSiteList() throws Exception { ResultVO resultVO = new ResultVO(); Map resultMap = new HashMap<>(); - - resultMap.put("partnerSiteList", adminConfigService.selectPartnerSiteList()); + List tnPartnerSite = adminConfigService.selectPartnerSiteList(); + for (TnPartnerSite partnerSite : tnPartnerSite) { + String fileGrpId = partnerSite.getFileGrpId(); + String filePath = fileService.findByFileGrpId(fileGrpId).get(0).getFilePath(); + partnerSite.setFilePath(filePath); + } + resultMap.put("partnerSiteList", tnPartnerSite); resultVO.setResult(resultMap); return resultVO; } diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TnPartnerSite.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TnPartnerSite.java index 3f5b1a8..aecd812 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TnPartnerSite.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TnPartnerSite.java @@ -35,4 +35,7 @@ public class TnPartnerSite { @Column(name = "use_yn", nullable = false, length = 1) private String useYn; + + @Transient + private String filePath; }