From d2cebe01880ae0317005e1d5197b254234fb3933 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 1 Sep 2022 10:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E7=A7=AF=E5=88=86=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/PartyPointResultDTO.java |  1 +
 .../impl/UserPointActionLogServiceImpl.java   | 67 ++++++++++---------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java
index 13877d86bf..7449b9cc9d 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java
@@ -25,6 +25,7 @@ public class PartyPointResultDTO implements Serializable {
     private String time;
     private String point;
     private String actId;
+    private String actTopic;
     private String actType;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date actDate;
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
index ae22f32df9..d8717a5313 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
@@ -623,39 +623,43 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
     @Override
     public List<PartyPointRecordResultDTO> pagePartyPoint(PartyPointFormDTO formDTO) {
         List<PartyPointRecordResultDTO> result = new LinkedList<>();
-        if (StringUtils.isNotBlank(formDTO.getQuarter())) {
-            if (StringUtils.isNotBlank(formDTO.getMonth())) {
+        if (StringUtils.isNotBlank(formDTO.getYear())) {
+            if (StringUtils.isNotBlank(formDTO.getQuarter())) {
+                if (StringUtils.isNotBlank(formDTO.getMonth())) {
+                    formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth()));
+                    formDTO.setDateType(NumConstant.TWO_STR);
+                } else {
+                    switch (formDTO.getQuarter()) {
+                        case NumConstant.ONE_STR:
+                            formDTO.setStartDate(formDTO.getYear().concat("01"));
+                            formDTO.setEndDate(formDTO.getYear().concat("03"));
+                            break;
+                        case NumConstant.TWO_STR:
+                            formDTO.setStartDate(formDTO.getYear().concat("04"));
+                            formDTO.setEndDate(formDTO.getYear().concat("06"));
+                            break;
+                        case NumConstant.THREE_STR:
+                            formDTO.setStartDate(formDTO.getYear().concat("07"));
+                            formDTO.setEndDate(formDTO.getYear().concat("09"));
+                            break;
+                        case NumConstant.FOUR_STR:
+                            formDTO.setStartDate(formDTO.getYear().concat("10"));
+                            formDTO.setEndDate(formDTO.getYear().concat("12"));
+                            break;
+                        default:
+                            break;
+                    }
+                    formDTO.setDateType(NumConstant.THREE_STR);
+                }
+            } else if (StringUtils.isNotBlank(formDTO.getMonth())) {
                 formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth()));
                 formDTO.setDateType(NumConstant.TWO_STR);
             } else {
-                switch (formDTO.getQuarter()) {
-                    case NumConstant.ONE_STR:
-                        formDTO.setStartDate(formDTO.getYear().concat("01"));
-                        formDTO.setEndDate(formDTO.getYear().concat("03"));
-                        break;
-                    case NumConstant.TWO_STR:
-                        formDTO.setStartDate(formDTO.getYear().concat("04"));
-                        formDTO.setEndDate(formDTO.getYear().concat("06"));
-                        break;
-                    case NumConstant.THREE_STR:
-                        formDTO.setStartDate(formDTO.getYear().concat("07"));
-                        formDTO.setEndDate(formDTO.getYear().concat("09"));
-                        break;
-                    case NumConstant.FOUR_STR:
-                        formDTO.setStartDate(formDTO.getYear().concat("10"));
-                        formDTO.setEndDate(formDTO.getYear().concat("12"));
-                        break;
-                    default:
-                        break;
-                }
-                formDTO.setDateType(NumConstant.THREE_STR);
+                formDTO.setStartDate(formDTO.getYear());
+                formDTO.setDateType(NumConstant.ONE_STR);
             }
-        } else if (StringUtils.isNotBlank(formDTO.getMonth())){
-            formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth()));
-            formDTO.setDateType(NumConstant.TWO_STR);
         } else {
-            formDTO.setStartDate(formDTO.getYear());
-            formDTO.setDateType(NumConstant.ONE_STR);
+            formDTO.setDateType(NumConstant.FOUR_STR);
         }
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<PartyPointResultDTO> list =baseDao.getPagePartyPoint(formDTO);
@@ -666,6 +670,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
                     item.setActType(actInfo.getData().getActTypeName());
                     item.setActAddress(actInfo.getData().getAddress());
                     item.setActDate(actInfo.getData().getHoldTime());
+                    item.setActTopic(actInfo.getData().getTopic());
                 }
             });
 
@@ -675,10 +680,10 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             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 -> {
+            sortedMap.forEach((key, value) -> {
                 PartyPointRecordResultDTO o = new PartyPointRecordResultDTO();
-                o.setDate(e.getKey());
-                o.setDailyList(e.getValue());
+                o.setDate(key);
+                o.setDailyList(value);
                 result.add(o);
             });