From ab816b5d08252917011115e8ee2b030bf2dc5f04 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 3 Sep 2021 15:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/volunteer/controller/VactInfoController.java    | 4 ++--
 .../epdc/modules/volunteer/service/VactInfoService.java     | 2 +-
 .../modules/volunteer/service/impl/VactInfoServiceImpl.java | 6 +++---
 pom.xml                                                     | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VactInfoController.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VactInfoController.java
index 4799169..be88c1f 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VactInfoController.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VactInfoController.java
@@ -142,8 +142,8 @@ public class VactInfoController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping("getActivityDetail")
-    public Result getActivityDetail(@RequestBody String vactId) {
-        return vactInfoService.getActivityDetail(vactId);
+    public Result getActivityDetail(@RequestBody AppVactApplyDTO formDto) {
+        return vactInfoService.getActivityDetail(formDto);
     }
 
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VactInfoService.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VactInfoService.java
index 8b5e4d6..d8fdc42 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VactInfoService.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VactInfoService.java
@@ -141,5 +141,5 @@ public interface VactInfoService extends BaseService<VactInfoEntity> {
      * @params [userDetail, vactId]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
-    Result getActivityDetail(String vactId);
+    Result getActivityDetail(AppVactApplyDTO formDto);
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactInfoServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactInfoServiceImpl.java
index 38a1929..65f1056 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactInfoServiceImpl.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactInfoServiceImpl.java
@@ -150,9 +150,9 @@ public class VactInfoServiceImpl extends BaseServiceImpl<VactInfoDao, VactInfoEn
     }
 
     @Override
-    public Result getActivityDetail(String vactId) {
-        log.info("vactId:"+vactId);
-        AppVactDetailDTO result = baseDao.getActivityDetail(vactId);
+    public Result getActivityDetail(AppVactApplyDTO formDto) {
+        log.info("formDto:"+formDto);
+        AppVactDetailDTO result = baseDao.getActivityDetail(formDto.getId());
         return new Result().ok(result);
     }
 
diff --git a/pom.xml b/pom.xml
index b952571..88ad116 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,6 @@
         <module>epdc-cloud-heart</module>
         <module>epdc-cloud-client-yushan</module>
         <module>epdc-cloud-commons-yushan</module>
-        <module>epdc-cloud-gateway-yushan</module>
         <module>epdc-cloud-parent-yushan</module>
     </modules>