回顾稿接口修改

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<com.epmet.dto.result.resi.ResiActSummaryResultDTO>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.resi.ResiActSummaryResultDTO>>
      * @Author zhangyong
      * @Date 13:39 2020-07-21
      **/
     @PostMapping("summary/list")
-    public Result<ResiActSummaryResultDTO> summaryList(@RequestBody ResiActContentFormDTO formDto) {
+    public Result<List<ResiActSummaryResultDTO>> summaryList(@RequestBody ResiActContentFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto, ResiActContentFormDTO.AddUserInternalGroup.class);
         return actSummaryService.summaryList(formDto);
     }

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<ActSummaryEntity> {
      * 活动详情-已结束-回顾稿
      *
      * @param formDto
-     * @return com.epmet.dto.result.resi.ResiActSummaryResultDTO
+     * @return java.util.List<com.epmet.dto.result.resi.ResiActSummaryResultDTO>
      * @Author zhangyong
-     * @Date 15:11 2020-07-22
+     * @Date 15:03 2020-07-31
      **/
-    ResiActSummaryResultDTO selectListSummary(ResiActContentFormDTO formDto);
+    List<ResiActSummaryResultDTO> selectListSummary(ResiActContentFormDTO formDto);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActSummaryService.java

@@ -100,9 +100,9 @@ public interface ActSummaryService extends BaseService<ActSummaryEntity> {
      * 活动详情-已结束-回顾稿
      *
      * @param formDto
-     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resi.ResiActSummaryResultDTO>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.resi.ResiActSummaryResultDTO>>
      * @Author zhangyong
      * @Date 13:39 2020-07-21
      **/
-    Result<ResiActSummaryResultDTO> summaryList(ResiActContentFormDTO formDto);
+    Result<List<ResiActSummaryResultDTO>> summaryList(ResiActContentFormDTO formDto);
 }

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<ActSummaryDao, ActSum
     }
 
     @Override
-    public Result<ResiActSummaryResultDTO> summaryList(ResiActContentFormDTO formDto) {
+    public Result<List<ResiActSummaryResultDTO>> summaryList(ResiActContentFormDTO formDto) {
-        return new Result<ResiActSummaryResultDTO>().ok(baseDao.selectListSummary(formDto));
+        return new Result<List<ResiActSummaryResultDTO>>().ok(baseDao.selectListSummary(formDto));
     }
 
 }

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 <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束
+        AND i.ACT_STATUS = 'published'
         ORDER BY i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
@@ -230,7 +230,7 @@
         AND u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'passed'
-        AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束
+        AND i.ACT_STATUS = 'published'
         ORDER BY i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
@@ -255,7 +255,7 @@
         AND u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'refused'
-        AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束
+        AND i.ACT_STATUS = 'published'
         ORDER BY i.CREATED_TIME DESC
         LIMIT  #{pageNo}, #{pageSize}
     </select>
@@ -279,7 +279,8 @@
         WHERE i.DEL_FLAG = '0'
         AND u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
-        AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW() -- 活动结束时间 &lt; 当前时间, 活动已结束
+        AND u.`STATUS` = 'passed'
+        AND i.ACT_STATUS = 'finished'
         ORDER BY i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>