From 4b7dfef8f612febcdfa6ce2dbc0b997b35811eba Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 16 Apr 2021 16:41:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/controller/ApiActUserRelationController.java    | 2 +-
 .../elink/esua/epdc/feign/AppActUserRelationFeignClient.java  | 2 +-
 .../activity/controller/AppActUserRelationController.java     | 2 +-
 .../activity/service/impl/ActUserRelationServiceImpl.java     | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
index 7bf98b24..e11cfeda 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
@@ -160,7 +160,7 @@ public class ApiActUserRelationController {
      * @author syp
      * @date 2020/4/16 14:41
      */
-    @GetMapping(Constant.VERSION_CONTROL+"clockList")
+    @GetMapping(Constant.VERSION_CONTROL+"/clockList")
     public Result<EpdcAppClockListDTO> getV2ClockList(EpdcClockListV2FormDTO epdcClockListV2FormDTO) {
         Result<AppClockListDTO> result = actUserRelationService.getV2ClockList(epdcClockListV2FormDTO);
         EpdcAppClockListDTO epdcAppClockListDTO = ConvertUtils.sourceToTarget(result.getData(), EpdcAppClockListDTO.class);
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java
index 6727aebc..6bfa1a43 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java
@@ -70,6 +70,6 @@ public interface AppActUserRelationFeignClient {
      * @Param [epdcClockListV2FormDTO]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.activity.AppClockListDTO>
      **/
-    @GetMapping(value = "heart/appactuserclocklog/selectListV2ActUserRelation",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @GetMapping(value = "heart/appactuserrelation/selectListV2ActUserRelation",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<AppClockListDTO> selectListV2ActUserRelation(EpdcClockListV2FormDTO epdcClockListV2FormDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java
index a6c0fc0c..56369dd3 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java
@@ -76,7 +76,7 @@ public class AppActUserRelationController {
      * @param formDTO
      * @return
      */
-    @GetMapping("selectListV2ActUserRelation/{actId}")
+    @GetMapping("selectListV2ActUserRelation")
     public Result<AppClockListDTO> selectListV2ActUserRelation(@RequestBody EpdcClockListV2FormDTO formDTO){
         return actUserRelationService.selectListV2ActUserRelation(formDTO);
     }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
index 4449bb56..01be80a9 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
@@ -528,6 +528,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
         formDTO.setPageIndex(pageIndex);
         List<ActClockListDTO> list = baseDao.selectListV2ActUserRelation(formDTO);
+        List<ActClockListDTO> allList = baseDao.selectListActUserRelation(formDTO.getActId());
+
         if (null == list || list.size() == 0) {
             return new Result<AppClockListDTO>();
         }
@@ -559,7 +561,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             mm.remove("clockId");
         }
         AppClockListDTO appClockListDTO = new AppClockListDTO();
-        appClockListDTO.setClockNum(resultList.size());
+        appClockListDTO.setClockNum(allList.size());
         appClockListDTO.setClocks(resultList);
         return new Result<AppClockListDTO>().ok(appClockListDTO);    }