我的积分

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointRecordResultDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/8/25 9:20
+ */
+@Data
+public class PartyPointRecordResultDTO implements Serializable {
+    private static final long serialVersionUID = -1480768520576719171L;
+    /**
+     * 日期 yyyy-MM-dd 字符串
+     * */
+    private String date;
+    private List<PartyPointResultDTO> dailyList;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java

@@ -15,8 +15,14 @@ import java.util.Date;
 public class PartyPointResultDTO implements Serializable {
     private static final long serialVersionUID = -3208641116926725011L;
     private String title;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    /**
-    private Date dateTime;
+     * 日期yyyy-MM-dd
+     */
+    private String date;
+    /**
+     * 时间hh:mm
+     */
+    private String time;
     private String point;
     private String actId;
     private String actType;

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java

@@ -265,9 +265,9 @@ public class ResiPointController {
      * @Date 2022/8/23 14:12
      */
     @PostMapping("pagePartyPoint")
-    public Result<PageData<PartyPointResultDTO>> pagePartyPoint(@LoginUser TokenDto tokenDto, @RequestBody PartyPointFormDTO formDTO ){
+    public Result<List<PartyPointRecordResultDTO>> pagePartyPoint(@LoginUser TokenDto tokenDto, @RequestBody PartyPointFormDTO formDTO ){
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        return new Result<PageData<PartyPointResultDTO>>().ok(pointActionLogService.pagePartyPoint(formDTO));
+        return new Result<List<PartyPointRecordResultDTO>>().ok(pointActionLogService.pagePartyPoint(formDTO));
     }
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java

@@ -25,10 +25,7 @@ import com.epmet.dto.form.CommonPageUserFormDTO;
 import com.epmet.dto.form.IcResiPointPageFormDTO;
 import com.epmet.dto.form.MyPointTaskFormDTO;
 import com.epmet.dto.form.PartyPointFormDTO;
-import com.epmet.dto.result.MyPointTaskResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.PartyPointResultDTO;
-import com.epmet.dto.result.ResiPointLogListResultDTO;
-import com.epmet.dto.result.ResiPointPageResDTO;
 import com.epmet.entity.UserPointActionLogEntity;
 import dto.form.SendPointFormDTO;
 
@@ -170,5 +167,5 @@ public interface UserPointActionLogService extends BaseService<UserPointActionLo
      * @Author zhaoqifeng
      * @Date 2022/8/22 16:04
      */
-    PageData<PartyPointResultDTO> pagePartyPoint(PartyPointFormDTO formDTO);
+    List<PartyPointRecordResultDTO> pagePartyPoint(PartyPointFormDTO formDTO);
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

@@ -616,12 +616,13 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
      *
      * @param formDTO
      * @Param formDTO
-     * @Return {@link PageData<  PartyPointResultDTO >}
+     * @Return {@link List<  PartyPointRecordResultDTO >}
      * @Author zhaoqifeng
      * @Date 2022/8/22 16:04
      */
     @Override
-    public PageData<PartyPointResultDTO> pagePartyPoint(PartyPointFormDTO formDTO) {
+    public List<PartyPointRecordResultDTO> pagePartyPoint(PartyPointFormDTO formDTO) {
+        List<PartyPointRecordResultDTO> result = new LinkedList<>();
         if (StringUtils.isNotBlank(formDTO.getQuarter())) {
             if (StringUtils.isNotBlank(formDTO.getMonth())) {
                 formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth()));
@@ -667,9 +668,22 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
                     item.setActDate(actInfo.getData().getHoldTime());
                 }
             });
+
+            Map<String,List<PartyPointResultDTO>> map =
+                    list.stream().collect(Collectors.groupingBy(PartyPointResultDTO::getDate));
+
+            Map<String, List<PartyPointResultDTO>> sortedMap = Maps.newLinkedHashMap();
+            map.entrySet().stream().sorted(Map.Entry.<String, List<PartyPointResultDTO>>comparingByKey().reversed())
+                    .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue()));
+            sortedMap.entrySet().forEach(e -> {
+                PartyPointRecordResultDTO o = new PartyPointRecordResultDTO();
+                o.setDate(e.getKey());
+                o.setDailyList(e.getValue());
+                result.add(o);
+            });
+
         }
-        PageInfo<PartyPointResultDTO> pageInfo = new PageInfo<>(list);
+        return result;
-        return new PageData<>(list, pageInfo.getTotal());
     }
 
     /**

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml

@@ -166,7 +166,8 @@
                 WHEN 'plus' THEN
                 concat( '+', POINT ) ELSE POINT
             END AS point,
-            CREATED_TIME AS dateTime
+            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS date,
+            DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS time
         FROM
             USER_POINT_ACTION_LOG
         WHERE