elink-star
/
epdc-cloud-points-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

积分兑换导出

master
wanggongfeng 3 years ago
parent
b73461cb2f
commit
f9f4ea4b98
6 changed files with 105 additions and 40 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. 12
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java
  2. 10
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
  3. 83
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsLogsExcel.java
  4. 10
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java
  5. 7
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
  6. 23
      epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml

12
epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java
View File

@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dao.PointsLogsDao;
import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO;
import com.elink.esua.epdc.dto.PointsLogsDTO;
import com.elink.esua.epdc.dto.UserDTO;
@ -53,12 +54,21 @@ public class PointsLogsController {
@Autowired
private PointsLogsService pointsLogsService;
@Autowired
private PointsLogsDao pointsLogsDao;
@GetMapping("page")
public Result<PageData<PointsLogsDTO>> page(@RequestParam Map<String, Object> params){
PageData<PointsLogsDTO> page = pointsLogsService.page(params);
return new Result<PageData<PointsLogsDTO>>().ok(page);
}
@GetMapping("logpage")
public Result<PageData<PointsLogsDTO>> logpage(@RequestParam Map<String, Object> params){
PageData<PointsLogsDTO> page = pointsLogsService.logpage(params);
return new Result<PageData<PointsLogsDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<PointsLogsDTO> get(@PathVariable("id") String id){
PointsLogsDTO data = pointsLogsService.get(id);
@ -95,7 +105,7 @@ public class PointsLogsController {
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<PointsLogsDTO> list = pointsLogsService.list(params);
List<PointsLogsDTO> list = pointsLogsDao.selectListVolunteerPointsLogPage(params);
ExcelUtils.exportExcelToTarget(response, null, list, PointsLogsExcel.class);
}

10
epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
View File

@ -98,6 +98,16 @@ public interface PointsLogsDao extends BaseDao<PointsLogsEntity> {
**/
List<PointsLogsDTO> selectListVolunteerPointsLog(Map<String, Object> params);
/**
* 志愿者管理 积分记录页面分页查询
* @param params
* param userId 必选 用户ID
* @return java.util.List<com.elink.esua.epdc.dto.PointsLogsDTO>
* @Author zhangyong
* @Date 15:31 2020-05-12
**/
List<PointsLogsDTO> selectListVolunteerPointsLogPage(Map<String, Object> params);
/**
* 积分排行接口（0 周排行、1 月排行） - 查询用户个人排名名次 及 积分
*

83
epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsLogsExcel.java
View File

@ -31,56 +31,61 @@ import java.util.Date;
@Data
public class PointsLogsExcel {
@Excel(name = "ID")
private String id;
@Excel(name = "用户ID")
private String userId;
@Excel(name = "关联表ID")
private String referenceId;
@Excel(name = "积分规则编码")
private String ruleCode;
@Excel(name = "操作描述")
private String operationDesc;
@Excel(name = "积分行为编码")
@Excel(name = "积分行为")
private String behaviorCode;
@Excel(name = "积分操作类型 0-减积分，1-加积分")
private String operationType;
@Excel(name = "操作时间", format = "yyyy-MM-dd HH:mm:ss")
private Date operationTime;
@Excel(name = "操作积分值")
@Excel(name = "积分变化")
private Integer points;
@Excel(name = "操作描述")
private String operationDesc;
@Excel(name = "操作时间")
private Date operationTime;
@Excel(name = "操作方式 user-用户操作，admin-管理员操作，sys-系统操作")
private String operationMode;
@Excel(name = "操作类型", replace = {"减积分_0","加积分_1"})
private String operationType;
@Excel(name = "剩余积分值")
@Excel(name = "剩余积分")
private Integer lavePoints;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "删除标识 0-否，1-是")
private String delFlag;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
}
// @Excel(name = "ID")
// private String id;
//
// @Excel(name = "用户ID")
// private String userId;
//
// @Excel(name = "关联表ID")
// private String referenceId;
//
// @Excel(name = "积分规则编码")
// private String ruleCode;
//
// @Excel(name = "操作方式 user-用户操作，admin-管理员操作，sys-系统操作")
// private String operationMode;
//
// @Excel(name = "乐观锁")
// private Integer revision;
//
// @Excel(name = "删除标识 0-否，1-是")
// private String delFlag;
//
// @Excel(name = "创建人")
// private String createdBy;
//
// @Excel(name = "创建时间")
// private Date createdTime;
//
// @Excel(name = "更新人")
// private String updatedBy;
//
// @Excel(name = "更新时间")
// private Date updatedTime;
}

10
epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java
View File

@ -49,6 +49,16 @@ public interface PointsLogsService extends BaseService<PointsLogsEntity> {
*/
PageData<PointsLogsDTO> page(Map<String, Object> params);
/**
* 默认分页
*
* @param params
* @return PageData<PointsLogsDTO>
* @author generator
* @date 2020-04-29
*/
PageData<PointsLogsDTO> logpage(Map<String, Object> params);
/**
* 默认查询
*

7
epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
View File

@ -91,6 +91,13 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
return new PageData<>(list, page.getTotal());
}
@Override
public PageData<PointsLogsDTO> logpage(Map<String, Object> params) {
IPage<PointsLogsDTO> page = getPage(params);
List<PointsLogsDTO> list = baseDao.selectListVolunteerPointsLogPage(params);
return new PageData<>(list, page.getTotal());
}
@Override
public List<PointsLogsDTO> list(Map<String, Object> params) {
List<PointsLogsEntity> entityList = baseDao.selectList(getWrapper(params));

23
epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml
View File

@ -128,6 +128,29 @@
l.CREATED_TIME DESC
</select>
<select id="selectListVolunteerPointsLogPage" resultType="com.elink.esua.epdc.dto.PointsLogsDTO">
SELECT
l.OPERATION_DESC operationDesc,
b.BEHAVIOR_DESC behaviorCode,
l.OPERATION_TIME operationTime,
l.POINTS points,
l.OPERATION_TYPE operationType,
l.LAVE_POINTS lavePoints
FROM
epdc_points_logs l
LEFT JOIN epdc_points_behavior b ON l.BEHAVIOR_CODE = b.BEHAVIOR_CODE AND b.DEL_FLAG = 0
WHERE l.DEL_FLAG = 0
AND l.BEHAVIOR_CODE = 'points_exchange'
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( l.OPERATION_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
<if test="deptId != null and deptId != ''">
and FIND_IN_SET(#{deptId},l.ALL_DEPT_IDS)
</if>
ORDER BY
l.CREATED_TIME DESC
</select>
<select id="selectUserPointsRanking" resultType="com.elink.esua.epdc.dto.result.EpdcAppPointsRankingUserDTO">
SELECT
userRanking.rank,

Write Preview
Loading…
Cancel
Save