Merge branch 'feature-1002359' into 'master'

群发记录合并

See merge request rays/pcloud-book!414

pcloud-service-book/src/main/java/com/pcloud/book/push/biz/impl/SelfPushBizImpl.java

@@ -481,6 +481,8 @@ public class SelfPushBizImpl implements SelfPushBiz {
             }else{
                 dto.setRealSendTime(DateUtils.formatDate(dto.getSendTime(),"yyyy-MM-dd HH:mm:ss"));
             }
+            List<SelfPushItem> selfPushItemList = selfPushItemDao.getByPushId(dto.getPushId());
+            dto.setSelfPushItemList(selfPushItemList);
 
         }
         if (null == pageBeanNew || ListUtils.isEmpty(pageBeanNew.getRecordList())) {

pcloud-service-book/src/main/java/com/pcloud/book/push/dto/SelfPushRecordDTO.java

 package com.pcloud.book.push.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pcloud.book.push.entity.SelfPushItem;
 import com.pcloud.common.dto.BaseDto;
 
 import java.util.Date;
+import java.util.List;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -111,6 +113,10 @@ public class SelfPushRecordDTO extends BaseDto{
     @ApiModelProperty("发送时间拼接")
     private String realSendTime;
 
+    @ApiModelProperty("发送内容列表")
+    private List<SelfPushItem> selfPushItemList;
+
+
 
 
 }

pcloud-service-book/src/main/resources/mapper/push/SelfPushItemMapper.xml

@@ -112,7 +112,7 @@
     i.product_url productUrl,
     i.push_status pushStatus,
     i.create_time createTime,
-    i.send_time sendTime,
+    min(i.send_time) sendTime,
     p.send_all sendAll,
     p.create_user createUser,
     p.start_time startTime,
@@ -139,6 +139,7 @@
         AND p.create_user = #{partyId}
       </otherwise>
     </choose>
+    group by push_id
     ORDER BY
     i.create_time DESC, i.id DESC
   </select>