From fa353933bf9ebd4f3bd55c908e19ae7e4060a4ff Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 31 Jul 2020 15:05:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=A1=BE=E7=A8=BF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/ResiActListController.java | 4 ++-- .../src/main/java/com/epmet/dao/ActSummaryDao.java | 8 +++++--- .../main/java/com/epmet/service/ActSummaryService.java | 4 ++-- .../com/epmet/service/impl/ActSummaryServiceImpl.java | 4 ++-- .../src/main/resources/mapper/ActInfoDao.xml | 9 +++++---- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java index 046a2c6854..9310d818b4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java @@ -192,12 +192,12 @@ public class ResiActListController { * 活动详情-已结束-回顾稿 * * @param formDto - * @return com.epmet.commons.tools.utils.Result + * @return com.epmet.commons.tools.utils.Result> * @Author zhangyong * @Date 13:39 2020-07-21 **/ @PostMapping("summary/list") - public Result summaryList(@RequestBody ResiActContentFormDTO formDto) { + public Result> summaryList(@RequestBody ResiActContentFormDTO formDto) { ValidatorUtils.validateEntity(formDto, ResiActContentFormDTO.AddUserInternalGroup.class); return actSummaryService.summaryList(formDto); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSummaryDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSummaryDao.java index cb4993d0b0..b9115a88d4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSummaryDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSummaryDao.java @@ -23,6 +23,8 @@ import com.epmet.dto.result.resi.ResiActSummaryResultDTO; import com.epmet.entity.ActSummaryEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 活动回顾表 * @@ -36,9 +38,9 @@ public interface ActSummaryDao extends BaseDao { * 活动详情-已结束-回顾稿 * * @param formDto - * @return com.epmet.dto.result.resi.ResiActSummaryResultDTO + * @return java.util.List * @Author zhangyong - * @Date 15:11 2020-07-22 + * @Date 15:03 2020-07-31 **/ - ResiActSummaryResultDTO selectListSummary(ResiActContentFormDTO formDto); + List selectListSummary(ResiActContentFormDTO formDto); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActSummaryService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActSummaryService.java index 863626d44f..e32d66533b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActSummaryService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActSummaryService.java @@ -100,9 +100,9 @@ public interface ActSummaryService extends BaseService { * 活动详情-已结束-回顾稿 * * @param formDto - * @return com.epmet.commons.tools.utils.Result + * @return com.epmet.commons.tools.utils.Result> * @Author zhangyong * @Date 13:39 2020-07-21 **/ - Result summaryList(ResiActContentFormDTO formDto); + Result> summaryList(ResiActContentFormDTO formDto); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java index e3331cf7a1..9681011fd0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java @@ -106,8 +106,8 @@ public class ActSummaryServiceImpl extends BaseServiceImpl summaryList(ResiActContentFormDTO formDto) { - return new Result().ok(baseDao.selectListSummary(formDto)); + public Result> summaryList(ResiActContentFormDTO formDto) { + return new Result>().ok(baseDao.selectListSummary(formDto)); } } 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 7d8638836d..28b8d0c064 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 @@ -205,7 +205,7 @@ AND u.DEL_FLAG = '0' AND u.USER_ID = #{userId} AND u.`STATUS` = 'auditing' - AND ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束 + AND i.ACT_STATUS = 'published' ORDER BY i.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} @@ -230,7 +230,7 @@ AND u.DEL_FLAG = '0' AND u.USER_ID = #{userId} AND u.`STATUS` = 'passed' - AND ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束 + AND i.ACT_STATUS = 'published' ORDER BY i.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} @@ -255,7 +255,7 @@ AND u.DEL_FLAG = '0' AND u.USER_ID = #{userId} AND u.`STATUS` = 'refused' - AND ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束 + AND i.ACT_STATUS = 'published' ORDER BY i.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} @@ -279,7 +279,8 @@ WHERE i.DEL_FLAG = '0' AND u.DEL_FLAG = '0' AND u.USER_ID = #{userId} - AND NOW() -- 活动结束时间 < 当前时间, 活动已结束 + AND u.`STATUS` = 'passed' + AND i.ACT_STATUS = 'finished' ORDER BY i.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize}