diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 9a5febfbdd..8d89ba7406 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -286,7 +286,7 @@ i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 case - when i.ACT_STATUS = 'published' + when = ]]> NOW() then case when = ACT_QUOTA ]]> and i.ACT_QUOTA_CATEGORY = 1 @@ -304,6 +304,7 @@ WHERE i.DEL_FLAG = '0' AND i.CUSTOMER_ID = #{customerId} AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled' + AND ]]> NOW() ORDER BY i.CREATED_TIME DESC LIMIT 0, #{num} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java index 5598ff8732..09dfbd3e3d 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java @@ -25,6 +25,6 @@ public interface EpmetPointOpenFeignClient { * @author wangc * @date 2020.07.22 15:58 **/ - @GetMapping("mypoint") + @GetMapping("/point/resi/point/mypoint") Result myPoint(TokenDto dto); }