Merge remote-tracking branch 'origin/dev_point_task' into dev_point_task

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;
 }

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

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -48,37 +49,46 @@ 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;
+
+    /**
+     * 一次性任务？1:是;0:不是
+     */
+    @JsonIgnore
+    private String disposable;
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleDefaultEntity.java

@@ -94,4 +94,19 @@ public class PointRuleDefaultEntity extends BaseEpmetEntity {
      * 是否启用 0-否，1-是
      */
 	private String enabledFlag;
+
+	/**
+	 * 规则显示顺序
+	 */
+	private Integer sort;
+
+	/**
+	 * 链接页面
+	 */
+	private String linkPage;
+
+	/**
+	 * 一次性任务？1:是;0:不是
+	 */
+	private String disposable;
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java

@@ -102,6 +102,21 @@ public class PointRuleEntity extends BaseEpmetEntity {
      */
 	private String enabledFlag;
 
+	/**
+	 * 规则显示顺序
+	 */
+	private Integer sort;
+
+	/**
+	 * 链接页面
+	 */
+	private String linkPage;
+
+	/**
+	 * 一次性任务？1:是;0:不是
+	 */
+	private String disposable;
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) return true;

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

@@ -28,7 +28,6 @@ import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dao.UserPointActionLogDao;
 import com.epmet.dto.BizPointTotalDetailDTO;
@@ -539,6 +538,10 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
                     dto.setFinishFlag("未完成");
                 }
             }
+            //一次性任务，已完成。
+            if("1".equals(dto.getDisposable())&&dto.getFinishedCount().equals(NumConstant.ONE)){
+                dto.setFinishFlag("已完成");
+            }
         });
         return list;
     }

epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql

@@ -0,0 +1,29 @@
+alter table point_rule_default add COLUMN SORT INT(11) COMMENT '规则显示顺序' AFTER ENABLED_FLAG ;
+alter table point_rule add COLUMN SORT INT(11) COMMENT '规则显示顺序' AFTER ENABLED_FLAG ;
+alter table point_rule_default add COLUMN LINK_PAGE VARCHAR(32) COMMENT '链接页面' AFTER SORT ;
+alter table point_rule add COLUMN LINK_PAGE VARCHAR(32) COMMENT '链接页面' AFTER SORT ;
+alter table point_rule_default add COLUMN DISPOSABLE varchar(1) not null default '0' comment '一次性任务？1:是;0:不是' AFTER LINK_PAGE;
+alter table point_rule add COLUMN DISPOSABLE varchar(1) not null default '0' comment '一次性任务？1:是;0:不是' AFTER LINK_PAGE;
+
+update point_rule_default set sort='1001',LINK_PAGE='group' where EVENT_CODE='participate_one_topic' and DEL_FLAG='0';
+update point_rule_default set sort='1002',LINK_PAGE='group' where EVENT_CODE='publish_one_topic' and DEL_FLAG='0';
+update point_rule_default set sort='1003',LINK_PAGE='group' where EVENT_CODE='invite_resi_into_group' and DEL_FLAG='0';
+update point_rule_default set sort='1004',LINK_PAGE='group' where EVENT_CODE='invite_new_into_group' and DEL_FLAG='0';
+update point_rule_default set sort='1005',LINK_PAGE='group' where EVENT_CODE='leader_resolve_topic' and DEL_FLAG='0';
+update point_rule_default set sort='1006',LINK_PAGE='group' where EVENT_CODE='shift_topic_to_issue' and DEL_FLAG='0';
+update point_rule_default set sort='1007',LINK_PAGE='group' where EVENT_CODE='topic_to_issue' and DEL_FLAG='0';
+update point_rule_default set sort='1008',LINK_PAGE='group' where EVENT_CODE='topic_to_project' and DEL_FLAG='0';
+update point_rule_default set sort='2001',LINK_PAGE='heart',DISPOSABLE='1' where EVENT_CODE='register_volunteer' and DEL_FLAG='0';
+update point_rule_default set sort='2002',LINK_PAGE='heart' where EVENT_CODE='active_insert_live' and DEL_FLAG='0';
+
+
+update point_rule set sort='1001',LINK_PAGE='group' where EVENT_CODE='participate_one_topic' and DEL_FLAG='0';
+update point_rule set sort='1002',LINK_PAGE='group' where EVENT_CODE='publish_one_topic' and DEL_FLAG='0';
+update point_rule set sort='1003',LINK_PAGE='group' where EVENT_CODE='invite_resi_into_group' and DEL_FLAG='0';
+update point_rule set sort='1004',LINK_PAGE='group' where EVENT_CODE='invite_new_into_group' and DEL_FLAG='0';
+update point_rule set sort='1005',LINK_PAGE='group' where EVENT_CODE='leader_resolve_topic' and DEL_FLAG='0';
+update point_rule set sort='1006',LINK_PAGE='group' where EVENT_CODE='shift_topic_to_issue' and DEL_FLAG='0';
+update point_rule set sort='1007',LINK_PAGE='group' where EVENT_CODE='topic_to_issue' and DEL_FLAG='0';
+update point_rule set sort='1008',LINK_PAGE='group' where EVENT_CODE='topic_to_project' and DEL_FLAG='0';
+update point_rule set sort='2001',LINK_PAGE='heart' ,DISPOSABLE='1' where EVENT_CODE='register_volunteer' and DEL_FLAG='0';
+update point_rule set sort='2002',LINK_PAGE='heart' where EVENT_CODE='active_insert_live' and DEL_FLAG='0';

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

@@ -113,7 +113,8 @@
                     else CEIL(pr.UP_LIMIT/pr.point)
                     end
                 )as upLimitCount,
-                pr.sort
+                pr.sort,
+                pr.DISPOSABLE as disposable
             FROM
             point_rule pr
             WHERE