luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

小组成就相关表表名修改

master
zhaoqifeng 5 years ago
parent
c49b7a8c46
commit
0edd01a4d4
13 changed files with 100 additions and 102 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementConfigDTO.java
  2. 6
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementStatsDTO.java
  3. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupAchievementConfigDao.java
  4. 8
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupAchievementStatsDao.java
  5. 8
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementConfigEntity.java
  6. 8
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementStatsEntity.java
  7. 16
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupAchievementConfigService.java
  8. 20
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupAchievementStatsService.java
  9. 41
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupAchievementConfigServiceImpl.java
  10. 51
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupAchievementStatsServiceImpl.java
  11. 10
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  12. 8
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml
  13. 16
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml

6
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupMilestoneConfigDTO.java → epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementConfigDTO.java
View File

@ -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：已删除

6
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupMilestoneStatsDTO.java → epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementStatsDTO.java
View File

@ -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;
/**
* 实现时间

4
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupMilestoneConfigDao.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupAchievementConfigDao.java
View File

@ -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<ResiGroupMilestoneConfigEntity> {
public interface ResiGroupAchievementConfigDao extends BaseDao<ResiGroupAchievementConfigEntity> {
}

8
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupMilestoneStatsDao.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupAchievementStatsDao.java
View File

@ -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<ResiGroupMilestoneStatsEntity> {
public interface ResiGroupAchievementStatsDao extends BaseDao<ResiGroupAchievementStatsEntity> {
/**
* 获取未完成的成就
* @author zhaoqifeng
@ -40,5 +40,5 @@ public interface ResiGroupMilestoneStatsDao extends BaseDao<ResiGroupMilestoneSt
* @param groupId
* @return java.util.List<com.epmet.resi.group.dto.group.ResiGroupMilestoneStatsDTO>
*/
List<ResiGroupMilestoneStatsDTO> selectUnAchieved(@Param("groupId") String groupId);
List<ResiGroupAchievementStatsDTO> selectUnAchieved(@Param("groupId") String groupId);
}

8
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupMilestoneConfigEntity.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementConfigEntity.java
View File

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

8
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupMilestoneStatsEntity.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementStatsEntity.java
View File

@ -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;
/**
* 实现时间

16
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupMilestoneConfigService.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupAchievementConfigService.java
View File

@ -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<ResiGroupMilestoneConfigEntity> {
public interface ResiGroupAchievementConfigService extends BaseService<ResiGroupAchievementConfigEntity> {
/**
* 默认分页
@ -41,7 +41,7 @@ public interface ResiGroupMilestoneConfigService extends BaseService<ResiGroupMi
* @author generator
* @date 2021-04-19
*/
PageData<ResiGroupMilestoneConfigDTO> page(Map<String, Object> params);
PageData<ResiGroupAchievementConfigDTO> page(Map<String, Object> params);
/**
* 默认查询
@ -51,7 +51,7 @@ public interface ResiGroupMilestoneConfigService extends BaseService<ResiGroupMi
* @author generator
* @date 2021-04-19
*/
List<ResiGroupMilestoneConfigDTO> list(Map<String, Object> params);
List<ResiGroupAchievementConfigDTO> list(Map<String, Object> params);
/**
* 单条查询
@ -61,7 +61,7 @@ public interface ResiGroupMilestoneConfigService extends BaseService<ResiGroupMi
* @author generator
* @date 2021-04-19
*/
ResiGroupMilestoneConfigDTO get(String id);
ResiGroupAchievementConfigDTO get(String id);
/**
* 默认保存
@ -71,7 +71,7 @@ public interface ResiGroupMilestoneConfigService extends BaseService<ResiGroupMi
* @author generator
* @date 2021-04-19
*/
void save(ResiGroupMilestoneConfigDTO dto);
void save(ResiGroupAchievementConfigDTO dto);
/**
* 默认更新
@ -81,7 +81,7 @@ public interface ResiGroupMilestoneConfigService extends BaseService<ResiGroupMi
* @author generator
* @date 2021-04-19
*/
void update(ResiGroupMilestoneConfigDTO dto);
void update(ResiGroupAchievementConfigDTO dto);
/**
* 批量删除

20
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupMilestoneStatsService.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupAchievementStatsService.java
View File

@ -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.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 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 ResiGroupMilestoneStatsService extends BaseService<ResiGroupMilestoneStatsEntity> {
public interface ResiGroupAchievementStatsService extends BaseService<ResiGroupAchievementStatsEntity> {
/**
* 默认分页
@ -41,7 +41,7 @@ public interface ResiGroupMilestoneStatsService extends BaseService<ResiGroupMil
* @author generator
* @date 2021-04-19
*/
PageData<ResiGroupMilestoneStatsDTO> page(Map<String, Object> params);
PageData<ResiGroupAchievementStatsDTO> page(Map<String, Object> params);
/**
* 默认查询
@ -51,7 +51,7 @@ public interface ResiGroupMilestoneStatsService extends BaseService<ResiGroupMil
* @author generator
* @date 2021-04-19
*/
List<ResiGroupMilestoneStatsDTO> list(Map<String, Object> params);
List<ResiGroupAchievementStatsDTO> list(Map<String, Object> params);
/**
* 单条查询
@ -61,7 +61,7 @@ public interface ResiGroupMilestoneStatsService extends BaseService<ResiGroupMil
* @author generator
* @date 2021-04-19
*/
ResiGroupMilestoneStatsDTO get(String id);
ResiGroupAchievementStatsDTO get(String id);
/**
* 默认保存
@ -71,7 +71,7 @@ public interface ResiGroupMilestoneStatsService extends BaseService<ResiGroupMil
* @author generator
* @date 2021-04-19
*/
void save(ResiGroupMilestoneStatsDTO dto);
void save(ResiGroupAchievementStatsDTO dto);
/**
* 默认更新
@ -81,7 +81,7 @@ public interface ResiGroupMilestoneStatsService extends BaseService<ResiGroupMil
* @author generator
* @date 2021-04-19
*/
void update(ResiGroupMilestoneStatsDTO dto);
void update(ResiGroupAchievementStatsDTO dto);
/**
* 批量删除
@ -100,7 +100,7 @@ public interface ResiGroupMilestoneStatsService extends BaseService<ResiGroupMil
* @param groupId
* @return java.util.List<com.epmet.resi.group.dto.group.ResiGroupMilestoneStatsDTO>
*/
List<ResiGroupMilestoneStatsDTO> getAchieved(String groupId);
List<ResiGroupAchievementStatsDTO> getAchieved(String groupId);
/**
* 未达成的成就
@ -109,5 +109,5 @@ public interface ResiGroupMilestoneStatsService extends BaseService<ResiGroupMil
* @param groupId
* @return java.util.List<com.epmet.resi.group.dto.group.ResiGroupMilestoneStatsDTO>
*/
List<ResiGroupMilestoneStatsDTO> getUnAchieved(String groupId);
List<ResiGroupAchievementStatsDTO> getUnAchieved(String groupId);
}

41
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupMilestoneConfigServiceImpl.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupAchievementConfigServiceImpl.java
View File

@ -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<ResiGroupMilestoneConfigDao, ResiGroupMilestoneConfigEntity> implements ResiGroupMilestoneConfigService {
public class ResiGroupAchievementConfigServiceImpl extends BaseServiceImpl<ResiGroupAchievementConfigDao, ResiGroupAchievementConfigEntity> implements ResiGroupAchievementConfigService {
@Override
public PageData<ResiGroupMilestoneConfigDTO> page(Map<String, Object> params) {
IPage<ResiGroupMilestoneConfigEntity> page = baseDao.selectPage(
public PageData<ResiGroupAchievementConfigDTO> page(Map<String, Object> params) {
IPage<ResiGroupAchievementConfigEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, ResiGroupMilestoneConfigDTO.class);
return getPageData(page, ResiGroupAchievementConfigDTO.class);
}
@Override
public List<ResiGroupMilestoneConfigDTO> list(Map<String, Object> params) {
List<ResiGroupMilestoneConfigEntity> entityList = baseDao.selectList(getWrapper(params));
public List<ResiGroupAchievementConfigDTO> list(Map<String, Object> params) {
List<ResiGroupAchievementConfigEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, ResiGroupMilestoneConfigDTO.class);
return ConvertUtils.sourceToTarget(entityList, ResiGroupAchievementConfigDTO.class);
}
private QueryWrapper<ResiGroupMilestoneConfigEntity> getWrapper(Map<String, Object> params){
private QueryWrapper<ResiGroupAchievementConfigEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<ResiGroupMilestoneConfigEntity> wrapper = new QueryWrapper<>();
QueryWrapper<ResiGroupAchievementConfigEntity> 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);
}

51
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupMilestoneStatsServiceImpl.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupAchievementStatsServiceImpl.java
View File

@ -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<ResiGroupMilestoneStatsDao, ResiGroupMilestoneStatsEntity> implements ResiGroupMilestoneStatsService {
public class ResiGroupAchievementStatsServiceImpl extends BaseServiceImpl<ResiGroupAchievementStatsDao, ResiGroupAchievementStatsEntity> implements ResiGroupAchievementStatsService {
@Override
public PageData<ResiGroupMilestoneStatsDTO> page(Map<String, Object> params) {
IPage<ResiGroupMilestoneStatsEntity> page = baseDao.selectPage(
public PageData<ResiGroupAchievementStatsDTO> page(Map<String, Object> params) {
IPage<ResiGroupAchievementStatsEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, ResiGroupMilestoneStatsDTO.class);
return getPageData(page, ResiGroupAchievementStatsDTO.class);
}
@Override
public List<ResiGroupMilestoneStatsDTO> list(Map<String, Object> params) {
List<ResiGroupMilestoneStatsEntity> entityList = baseDao.selectList(getWrapper(params));
public List<ResiGroupAchievementStatsDTO> list(Map<String, Object> params) {
List<ResiGroupAchievementStatsEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, ResiGroupMilestoneStatsDTO.class);
return ConvertUtils.sourceToTarget(entityList, ResiGroupAchievementStatsDTO.class);
}
private QueryWrapper<ResiGroupMilestoneStatsEntity> getWrapper(Map<String, Object> params){
private QueryWrapper<ResiGroupAchievementStatsEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<ResiGroupMilestoneStatsEntity> wrapper = new QueryWrapper<>();
QueryWrapper<ResiGroupAchievementStatsEntity> 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<ResiGrou
* @date 2021/4/19 15:15
*/
@Override
public List<ResiGroupMilestoneStatsDTO> getAchieved(String groupId) {
QueryWrapper<ResiGroupMilestoneStatsEntity> wrapper = new QueryWrapper<>();
public List<ResiGroupAchievementStatsDTO> getAchieved(String groupId) {
QueryWrapper<ResiGroupAchievementStatsEntity> 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<ResiGroupMilestoneStatsEntity> list = baseDao.selectList(wrapper);
return ConvertUtils.sourceToTarget(list, ResiGroupMilestoneStatsDTO.class);
List<ResiGroupAchievementStatsEntity> list = baseDao.selectList(wrapper);
return ConvertUtils.sourceToTarget(list, ResiGroupAchievementStatsDTO.class);
}
/**
@ -127,7 +126,7 @@ public class ResiGroupMilestoneStatsServiceImpl extends BaseServiceImpl<ResiGrou
* @date 2021/4/19 15:15
*/
@Override
public List<ResiGroupMilestoneStatsDTO> getUnAchieved(String groupId) {
public List<ResiGroupAchievementStatsDTO> getUnAchieved(String groupId) {
return baseDao.selectUnAchieved(groupId);
}

10
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
View File

@ -157,7 +157,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
private ResiGroupCodeService resiGroupCodeService;
@Autowired
private ResiGroupMilestoneStatsService resiGroupMilestoneStatsService;
private ResiGroupAchievementStatsService resiGroupAchievementStatsService;
@Override
public PageData<ResiGroupDTO> page(Map<String, Object> params) {
@ -1186,21 +1186,21 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
resultDTO.setCreatedDate(DateUtils.dateToTimestamp(group.getCreatedTime()));
//2.即将完成的3个成就
List<ResiGroupMilestoneStatsDTO> unAchievedList = resiGroupMilestoneStatsService.getUnAchieved(formDTO.getGroupId());
List<ResiGroupAchievementStatsDTO> 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<ResiGroupMilestoneStatsDTO> achievedList = resiGroupMilestoneStatsService.getAchieved(formDTO.getGroupId());
List<ResiGroupAchievementStatsDTO> 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);
});

8
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupMilestoneConfigDao.xml → epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.modules.group.dao.ResiGroupMilestoneConfigDao">
<mapper namespace="com.epmet.modules.group.dao.ResiGroupAchievementConfigDao">
<resultMap type="com.epmet.modules.group.entity.ResiGroupMilestoneConfigEntity" id="resiGroupMilestoneConfigMap">
<resultMap type="com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity" id="resiGroupAchievementConfigMap">
<result property="id" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="mileageName" column="MILEAGE_NAME"/>
<result property="achievementName" column="ACHIEVEMENT_NAME"/>
<result property="preValue" column="PRE_VALUE"/>
<result property="targetValue" column="TARGET_VALUE"/>
<result property="mileageType" column="MILEAGE_TYPE"/>
<result property="achievementType" column="ACHIEVEMENT_TYPE"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>

16
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupMilestoneStatsDao.xml → epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.modules.group.dao.ResiGroupMilestoneStatsDao">
<mapper namespace="com.epmet.modules.group.dao.ResiGroupAchievementStatsDao">
<resultMap type="com.epmet.modules.group.entity.ResiGroupMilestoneStatsEntity" id="resiGroupMilestoneStatsMap">
<resultMap type="com.epmet.modules.group.entity.ResiGroupAchievementStatsEntity" id="resiGroupAchievementStatsMap">
<result property="id" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="groupId" column="GROUP_ID"/>
<result property="mileageId" column="MILEAGE_ID"/>
<result property="mileageName" column="MILEAGE_NAME"/>
<result property="achievementId" column="ACHIEVEMENT_ID"/>
<result property="achievementName" column="ACHIEVEMENT_NAME"/>
<result property="arriveTime" column="ARRIVE_TIME"/>
<result property="currentValue" column="CURRENT_VALUE"/>
<result property="targetValue" column="TARGET_VALUE"/>
@ -20,14 +20,14 @@
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<select id="selectUnAchieved" resultType="com.epmet.resi.group.dto.group.ResiGroupMilestoneStatsDTO">
<select id="selectUnAchieved" resultType="com.epmet.resi.group.dto.group.ResiGroupAchievementStatsDTO">
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
Write Preview
Loading…
Cancel
Save