From 0edd01a4d4cac9e7630ec480675aed3af2e0b933 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 20 Apr 2021 14:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=B0=B1=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E8=A1=A8=E8=A1=A8=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ava => ResiGroupAchievementConfigDTO.java} | 6 +-- ...java => ResiGroupAchievementStatsDTO.java} | 6 +-- ...ava => ResiGroupAchievementConfigDao.java} | 4 +- ...java => ResiGroupAchievementStatsDao.java} | 8 +-- ... => ResiGroupAchievementConfigEntity.java} | 8 +-- ...a => ResiGroupAchievementStatsEntity.java} | 8 +-- ...=> ResiGroupAchievementConfigService.java} | 16 +++--- ... => ResiGroupAchievementStatsService.java} | 20 ++++---- ...esiGroupAchievementConfigServiceImpl.java} | 41 ++++++++------- ...ResiGroupAchievementStatsServiceImpl.java} | 51 +++++++++---------- .../service/impl/ResiGroupServiceImpl.java | 10 ++-- ....xml => ResiGroupAchievementConfigDao.xml} | 8 +-- ...o.xml => ResiGroupAchievementStatsDao.xml} | 16 +++--- 13 files changed, 100 insertions(+), 102 deletions(-) rename epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/{ResiGroupMilestoneConfigDTO.java => ResiGroupAchievementConfigDTO.java} (93%) rename epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/{ResiGroupMilestoneStatsDTO.java => ResiGroupAchievementStatsDTO.java} (93%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/{ResiGroupMilestoneConfigDao.java => ResiGroupAchievementConfigDao.java} (84%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/{ResiGroupMilestoneStatsDao.java => ResiGroupAchievementStatsDao.java} (79%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/{ResiGroupMilestoneConfigEntity.java => ResiGroupAchievementConfigEntity.java} (89%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/{ResiGroupMilestoneStatsEntity.java => ResiGroupAchievementStatsEntity.java} (90%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/{ResiGroupMilestoneConfigService.java => ResiGroupAchievementConfigService.java} (77%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/{ResiGroupMilestoneStatsService.java => ResiGroupAchievementStatsService.java} (77%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/{ResiGroupMilestoneConfigServiceImpl.java => ResiGroupAchievementConfigServiceImpl.java} (57%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/{ResiGroupMilestoneStatsServiceImpl.java => ResiGroupAchievementStatsServiceImpl.java} (59%) rename epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/{ResiGroupMilestoneConfigDao.xml => ResiGroupAchievementConfigDao.xml} (68%) rename epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/{ResiGroupMilestoneStatsDao.xml => ResiGroupAchievementStatsDao.xml} (71%) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupMilestoneConfigDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementConfigDTO.java similarity index 93% rename from epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupMilestoneConfigDTO.java rename to epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementConfigDTO.java index 5e7ea7a3f8..26b9567bd5 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupMilestoneConfigDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementConfigDTO.java @@ -29,7 +29,7 @@ import lombok.Data; * @since v1.0.0 2021-04-19 */ @Data -public class ResiGroupMilestoneConfigDTO implements Serializable { +public class ResiGroupAchievementConfigDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -46,7 +46,7 @@ public class ResiGroupMilestoneConfigDTO implements Serializable { /** * 里程名称 */ - private String mileageName; + private String achievementName; /** * 前一个里程值 @@ -61,7 +61,7 @@ public class ResiGroupMilestoneConfigDTO implements Serializable { /** * 里程类型：小组人数：member；topic：话题数；转议题数：toIssue；话题解决数：resloveTopic */ - private String mileageType; + private String achievementType; /** * 删除标记 0：未删除，1：已删除 diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupMilestoneStatsDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementStatsDTO.java similarity index 93% rename from epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupMilestoneStatsDTO.java rename to epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementStatsDTO.java index 43883314d1..81d83e18af 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupMilestoneStatsDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementStatsDTO.java @@ -29,7 +29,7 @@ import lombok.Data; * @since v1.0.0 2021-04-19 */ @Data -public class ResiGroupMilestoneStatsDTO implements Serializable { +public class ResiGroupAchievementStatsDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -51,12 +51,12 @@ public class ResiGroupMilestoneStatsDTO implements Serializable { /** * 里程ID */ - private String mileageId; + private String achievementId; /** * 里程名称 */ - private String mileageName; + private String achievementName; /** * 实现时间 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupMilestoneConfigDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupAchievementConfigDao.java similarity index 84% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupMilestoneConfigDao.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupAchievementConfigDao.java index 95a922301c..24d35a5edd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupMilestoneConfigDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupAchievementConfigDao.java @@ -18,7 +18,7 @@ package com.epmet.modules.group.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.modules.group.entity.ResiGroupMilestoneConfigEntity; +import com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2021-04-19 */ @Mapper -public interface ResiGroupMilestoneConfigDao extends BaseDao { +public interface ResiGroupAchievementConfigDao extends BaseDao { } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupMilestoneStatsDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupAchievementStatsDao.java similarity index 79% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupMilestoneStatsDao.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupAchievementStatsDao.java index 6bc60c045e..0de55fe72e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupMilestoneStatsDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupAchievementStatsDao.java @@ -18,8 +18,8 @@ package com.epmet.modules.group.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.modules.group.entity.ResiGroupMilestoneStatsEntity; -import com.epmet.resi.group.dto.group.ResiGroupMilestoneStatsDTO; +import com.epmet.modules.group.entity.ResiGroupAchievementStatsEntity; +import com.epmet.resi.group.dto.group.ResiGroupAchievementStatsDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,7 +32,7 @@ import java.util.List; * @since v1.0.0 2021-04-19 */ @Mapper -public interface ResiGroupMilestoneStatsDao extends BaseDao { +public interface ResiGroupAchievementStatsDao extends BaseDao { /** * 获取未完成的成就 * @author zhaoqifeng @@ -40,5 +40,5 @@ public interface ResiGroupMilestoneStatsDao extends BaseDao */ - List selectUnAchieved(@Param("groupId") String groupId); + List selectUnAchieved(@Param("groupId") String groupId); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupMilestoneConfigEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementConfigEntity.java similarity index 89% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupMilestoneConfigEntity.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementConfigEntity.java index f0e2a9f078..be6fc3a745 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupMilestoneConfigEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementConfigEntity.java @@ -33,8 +33,8 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("resi_group_milestone_config") -public class ResiGroupMilestoneConfigEntity extends BaseEpmetEntity { +@TableName("resi_group_achievement_config") +public class ResiGroupAchievementConfigEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; @@ -46,7 +46,7 @@ public class ResiGroupMilestoneConfigEntity extends BaseEpmetEntity { /** * 里程名称 */ - private String mileageName; + private String achievementName; /** * 前一个里程值 @@ -61,6 +61,6 @@ public class ResiGroupMilestoneConfigEntity extends BaseEpmetEntity { /** * 里程类型：小组人数：member；topic：话题数；转议题数：toIssue；话题解决数：resloveTopic */ - private String mileageType; + private String achievementType; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupMilestoneStatsEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementStatsEntity.java similarity index 90% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupMilestoneStatsEntity.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementStatsEntity.java index a1bfc86c7e..8710dc43d9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupMilestoneStatsEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementStatsEntity.java @@ -33,8 +33,8 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("resi_group_milestone_stats") -public class ResiGroupMilestoneStatsEntity extends BaseEpmetEntity { +@TableName("resi_group_achievement_stats") +public class ResiGroupAchievementStatsEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; @@ -51,12 +51,12 @@ public class ResiGroupMilestoneStatsEntity extends BaseEpmetEntity { /** * 里程ID */ - private String mileageId; + private String achievementId; /** * 里程名称 */ - private String mileageName; + private String achievementName; /** * 实现时间 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupMilestoneConfigService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupAchievementConfigService.java similarity index 77% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupMilestoneConfigService.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupAchievementConfigService.java index e10cb0bd2a..cb45a821ef 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupMilestoneConfigService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupAchievementConfigService.java @@ -19,8 +19,8 @@ package com.epmet.modules.group.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.modules.group.entity.ResiGroupMilestoneConfigEntity; -import com.epmet.resi.group.dto.group.ResiGroupMilestoneConfigDTO; +import com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity; +import com.epmet.resi.group.dto.group.ResiGroupAchievementConfigDTO; import java.util.List; import java.util.Map; @@ -31,7 +31,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-04-19 */ -public interface ResiGroupMilestoneConfigService extends BaseService { +public interface ResiGroupAchievementConfigService extends BaseService { /** * 默认分页 @@ -41,7 +41,7 @@ public interface ResiGroupMilestoneConfigService extends BaseService page(Map params); + PageData page(Map params); /** * 默认查询 @@ -51,7 +51,7 @@ public interface ResiGroupMilestoneConfigService extends BaseService list(Map params); + List list(Map params); /** * 单条查询 @@ -61,7 +61,7 @@ public interface ResiGroupMilestoneConfigService extends BaseService { +public interface ResiGroupAchievementStatsService extends BaseService { /** * 默认分页 @@ -41,7 +41,7 @@ public interface ResiGroupMilestoneStatsService extends BaseService page(Map params); + PageData page(Map params); /** * 默认查询 @@ -51,7 +51,7 @@ public interface ResiGroupMilestoneStatsService extends BaseService list(Map params); + List list(Map params); /** * 单条查询 @@ -61,7 +61,7 @@ public interface ResiGroupMilestoneStatsService extends BaseService */ - List getAchieved(String groupId); + List getAchieved(String groupId); /** * 未达成的成就 @@ -109,5 +109,5 @@ public interface ResiGroupMilestoneStatsService extends BaseService */ - List getUnAchieved(String groupId); + List getUnAchieved(String groupId); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupMilestoneConfigServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupAchievementConfigServiceImpl.java similarity index 57% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupMilestoneConfigServiceImpl.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupAchievementConfigServiceImpl.java index 85735fa5ff..42ff9f7288 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupMilestoneConfigServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupAchievementConfigServiceImpl.java @@ -23,12 +23,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.modules.group.dao.ResiGroupMilestoneConfigDao; -import com.epmet.modules.group.entity.ResiGroupMilestoneConfigEntity; -import com.epmet.modules.group.service.ResiGroupMilestoneConfigService; -import com.epmet.resi.group.dto.group.ResiGroupMilestoneConfigDTO; +import com.epmet.modules.group.dao.ResiGroupAchievementConfigDao; +import com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity; +import com.epmet.modules.group.service.ResiGroupAchievementConfigService; +import com.epmet.resi.group.dto.group.ResiGroupAchievementConfigDTO; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,51 +42,51 @@ import java.util.Map; * @since v1.0.0 2021-04-19 */ @Service -public class ResiGroupMilestoneConfigServiceImpl extends BaseServiceImpl implements ResiGroupMilestoneConfigService { +public class ResiGroupAchievementConfigServiceImpl extends BaseServiceImpl implements ResiGroupAchievementConfigService { @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, ResiGroupMilestoneConfigDTO.class); + return getPageData(page, ResiGroupAchievementConfigDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, ResiGroupMilestoneConfigDTO.class); + return ConvertUtils.sourceToTarget(entityList, ResiGroupAchievementConfigDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public ResiGroupMilestoneConfigDTO get(String id) { - ResiGroupMilestoneConfigEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ResiGroupMilestoneConfigDTO.class); + public ResiGroupAchievementConfigDTO get(String id) { + ResiGroupAchievementConfigEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, ResiGroupAchievementConfigDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(ResiGroupMilestoneConfigDTO dto) { - ResiGroupMilestoneConfigEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupMilestoneConfigEntity.class); + public void save(ResiGroupAchievementConfigDTO dto) { + ResiGroupAchievementConfigEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupAchievementConfigEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(ResiGroupMilestoneConfigDTO dto) { - ResiGroupMilestoneConfigEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupMilestoneConfigEntity.class); + public void update(ResiGroupAchievementConfigDTO dto) { + ResiGroupAchievementConfigEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupAchievementConfigEntity.class); updateById(entity); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupMilestoneStatsServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupAchievementStatsServiceImpl.java similarity index 59% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupMilestoneStatsServiceImpl.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupAchievementStatsServiceImpl.java index 57dd5f1fbb..be9f4c8431 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupMilestoneStatsServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupAchievementStatsServiceImpl.java @@ -24,12 +24,11 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.modules.group.dao.ResiGroupMilestoneStatsDao; -import com.epmet.modules.group.entity.ResiGroupMilestoneStatsEntity; -import com.epmet.modules.group.service.ResiGroupMilestoneStatsService; -import com.epmet.resi.group.dto.group.ResiGroupMilestoneStatsDTO; +import com.epmet.modules.group.dao.ResiGroupAchievementStatsDao; +import com.epmet.modules.group.entity.ResiGroupAchievementStatsEntity; +import com.epmet.modules.group.service.ResiGroupAchievementStatsService; +import com.epmet.resi.group.dto.group.ResiGroupAchievementStatsDTO; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,51 +43,51 @@ import java.util.Map; * @since v1.0.0 2021-04-19 */ @Service -public class ResiGroupMilestoneStatsServiceImpl extends BaseServiceImpl implements ResiGroupMilestoneStatsService { +public class ResiGroupAchievementStatsServiceImpl extends BaseServiceImpl implements ResiGroupAchievementStatsService { @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, ResiGroupMilestoneStatsDTO.class); + return getPageData(page, ResiGroupAchievementStatsDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, ResiGroupMilestoneStatsDTO.class); + return ConvertUtils.sourceToTarget(entityList, ResiGroupAchievementStatsDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public ResiGroupMilestoneStatsDTO get(String id) { - ResiGroupMilestoneStatsEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ResiGroupMilestoneStatsDTO.class); + public ResiGroupAchievementStatsDTO get(String id) { + ResiGroupAchievementStatsEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, ResiGroupAchievementStatsDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(ResiGroupMilestoneStatsDTO dto) { - ResiGroupMilestoneStatsEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupMilestoneStatsEntity.class); + public void save(ResiGroupAchievementStatsDTO dto) { + ResiGroupAchievementStatsEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupAchievementStatsEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(ResiGroupMilestoneStatsDTO dto) { - ResiGroupMilestoneStatsEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupMilestoneStatsEntity.class); + public void update(ResiGroupAchievementStatsDTO dto) { + ResiGroupAchievementStatsEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupAchievementStatsEntity.class); updateById(entity); } @@ -108,14 +107,14 @@ public class ResiGroupMilestoneStatsServiceImpl extends BaseServiceImpl getAchieved(String groupId) { - QueryWrapper wrapper = new QueryWrapper<>(); + public List getAchieved(String groupId) { + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("GROUP_ID", groupId); wrapper.eq("IS_ARRIVE", NumConstant.ONE); wrapper.eq("DEL_FLAG", NumConstant.ZERO); wrapper.orderByDesc("ARRIVE_TIME"); - List list = baseDao.selectList(wrapper); - return ConvertUtils.sourceToTarget(list, ResiGroupMilestoneStatsDTO.class); + List list = baseDao.selectList(wrapper); + return ConvertUtils.sourceToTarget(list, ResiGroupAchievementStatsDTO.class); } /** @@ -127,7 +126,7 @@ public class ResiGroupMilestoneStatsServiceImpl extends BaseServiceImpl getUnAchieved(String groupId) { + public List getUnAchieved(String groupId) { return baseDao.selectUnAchieved(groupId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 54846ac828..7ea4720a69 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -157,7 +157,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl page(Map params) { @@ -1186,21 +1186,21 @@ public class ResiGroupServiceImpl extends BaseServiceImpl unAchievedList = resiGroupMilestoneStatsService.getUnAchieved(formDTO.getGroupId()); + List unAchievedList = resiGroupAchievementStatsService.getUnAchieved(formDTO.getGroupId()); if (CollectionUtils.isNotEmpty(unAchievedList)) { unAchievedList.forEach(item -> { AchievementDetailResultDTO.AchievementBean bean = new AchievementDetailResultDTO.AchievementBean(); - String describe = item.getMileageName() + "(" + item.getCurrentValue().toString() + "/" + item.getTargetValue().toString() + ")"; + String describe = item.getAchievementName() + "(" + item.getCurrentValue().toString() + "/" + item.getTargetValue().toString() + ")"; bean.setDescribe(describe); achievementList.add(bean); }); } //3.已完成的成就 - List achievedList = resiGroupMilestoneStatsService.getAchieved(formDTO.getGroupId()); + List achievedList = resiGroupAchievementStatsService.getAchieved(formDTO.getGroupId()); if (CollectionUtils.isNotEmpty(achievedList)) { achievedList.forEach(item -> { AchievementDetailResultDTO.AchievementBean bean = new AchievementDetailResultDTO.AchievementBean(); - bean.setDescribe(item.getMileageName()); + bean.setDescribe(item.getAchievementName()); bean.setCompletionDate(DateUtils.dateToTimestamp(item.getArriveTime())); achievementList.add(bean); }); diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupMilestoneConfigDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml similarity index 68% rename from epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupMilestoneConfigDao.xml rename to epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml index 7340b2f1d9..5531c7228e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupMilestoneConfigDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml @@ -1,15 +1,15 @@ - + - + - + - + diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupMilestoneStatsDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml similarity index 71% rename from epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupMilestoneStatsDao.xml rename to epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml index 1c854f0bc4..7705832ba7 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupMilestoneStatsDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml @@ -1,14 +1,14 @@ - + - + - - + + @@ -20,14 +20,14 @@ - SELECT - MILEAGE_ID, - MILEAGE_NAME, + ACHIEVEMENT_ID, + ACHIEVEMENT_NAME, CURRENT_VALUE, TARGET_VALUE FROM - resi_group_milestone_stats + resi_group_achievement_stats WHERE DEL_FLAG = '0' AND GROUP_ID = #{groupId} AND IS_ARRIVE = 0