Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementConfigDTO.java

@@ -1,96 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.epmet.resi.group.dto.group;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 小组成就配置表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2021-04-19
- */
-@Data
-public class ResiGroupAchievementConfigDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-	private String id;
-
-    /**
-     * 客户Id
-     */
-	private String customerId;
-
-    /**
-     * 里程名称
-     */
-	private String achievementName;
-
-    /**
-     * 前一个里程值
-     */
-	private Integer preValue;
-
-    /**
-     * 目标值
-     */
-	private Integer targetValue;
-
-    /**
-     * 里程类型：小组人数：member；topic：话题数；转议题数：toIssue；话题解决数：resloveTopic
-     */
-	private String achievementType;
-
-    /**
-     * 删除标记 0：未删除，1：已删除
-     */
-	private String delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementConfigEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.modules.group.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小组成就配置表
  *
@@ -48,11 +45,6 @@ public class ResiGroupAchievementConfigEntity extends BaseEpmetEntity {
      */
 	private String achievementName;
 
-    /**
-     * 前一个里程值
-     */
-	private Integer preValue;
-
     /**
      * 目标值
      */

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/AbstractStatsAchievementService.java

@@ -96,8 +96,6 @@ public abstract class AbstractStatsAchievementService {
             ResiGroupAchievementConfigEntity next = new ResiGroupAchievementConfigEntity();
             next.setCustomerId(lastOne.getCustomerId());
             next.setAchievementName(oldName.replace(StrConstant.UNDER_LINE, String.valueOf(nextTargetValue)));
-            //todo 把这个字段去掉
-            next.setPreValue(preValue);
             preValue = nextTargetValue;
             next.setTargetValue(nextTargetValue);
             next.setAchievementType(lastOne.getAchievementType());

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml

@@ -9,7 +9,7 @@
 
     <select id="selectMoreThanOneByValue" resultType="com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity">
         SELECT
-            id, customer_id, achievement_name, pre_value, target_value, achievement_type
+            id, customer_id, achievement_name, target_value, achievement_type
         FROM  resi_group_achievement_config
         WHERE
             ACHIEVEMENT_TYPE = #{achievementType}
@@ -19,7 +19,7 @@
     </select>
     <select id="getLastOne" resultType="com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity">
         SELECT
-            id, customer_id, achievement_name, pre_value, target_value, achievement_type
+            id, customer_id, achievement_name, target_value, achievement_type
         FROM  resi_group_achievement_config
         WHERE
             ACHIEVEMENT_TYPE = #{achievementType}