From 5db438fe5d6b7c92b74131f9d24b3fe2b57896fa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 21 Jun 2021 10:26:43 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/MyPointTaskFormDTO.java   |  4 ++++
 .../com/epmet/dto/result/MyPointTaskResultDTO.java    | 11 +++++++----
 .../service/impl/UserPointActionLogServiceImpl.java   |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/MyPointTaskFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/MyPointTaskFormDTO.java
index d8177cda61..b66f5937b8 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/MyPointTaskFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/MyPointTaskFormDTO.java
@@ -28,5 +28,9 @@ public class MyPointTaskFormDTO implements Serializable {
      * */
     @NotBlank(message = "未完成：unfinished；已完成：finished；全部：all")
     private String type;
+
+    /**
+     * yyyyMMdd，现在默认是当天，后端代码写死
+     * */
     private String dateId;
 }
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java
index d096373307..49e72aee25 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java
@@ -49,38 +49,41 @@ public class MyPointTaskResultDTO implements Serializable {
     /**
      * 事件CODE 来自事件表
      */
-    // @JsonIgnore
+    @JsonIgnore
     private String eventCode;
 
     /**
      * 操作类型 加积分:add;减积分:subtract
      */
-    // @JsonIgnore
+    @JsonIgnore
     private String operateType;
 
     /**
      * 积分上限 0表示不涉及积分上限；
      */
-    // @JsonIgnore
+    @JsonIgnore
     private Integer upLimit;
 
     /**
      * 获得积分值
      */
-    // @JsonIgnore
+    @JsonIgnore
     private Integer point;
     /**
      * 已完成次数
      */
+    @JsonIgnore
     private Integer finishedCount;
 
     /**
      * 上限次数,0代表没有上限次数
      */
+    @JsonIgnore
     private Integer upLimitCount;
     /**
      * 排序
      */
+    @JsonIgnore
     private Integer sort;
 
     /**
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 740ec82f8f..8abbdaf26e 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
@@ -538,6 +538,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
                     dto.setFinishFlag("未完成");
                 }
             }
+            //一次性任务，已完成。
             if("1".equals(dto.getDisposable())&&dto.getFinishedCount().equals(NumConstant.ONE)){
                 dto.setFinishFlag("已完成");
             }