From 0da1add5cfcb6f747492477835b8f47cc4a8f7d6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 25 Apr 2021 13:01:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/ResiGroupAchievementConfigDTO.java | 96 ------------------- .../ResiGroupAchievementConfigEntity.java | 8 -- .../AbstractStatsAchievementService.java | 2 - .../group/ResiGroupAchievementConfigDao.xml | 4 +- 4 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementConfigDTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementConfigDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementConfigDTO.java deleted file mode 100644 index 26b9567bd5..0000000000 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementConfigDTO.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementConfigEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementConfigEntity.java index be6fc3a745..8749ef16a0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementConfigEntity.java +++ b/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; - /** * 目标值 */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/AbstractStatsAchievementService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/AbstractStatsAchievementService.java index 077466eb1c..1b201ee168 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/AbstractStatsAchievementService.java +++ b/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()); diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml index 1728c69e11..cce26029ed 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml @@ -9,7 +9,7 @@