From 7e903ec1c31f7eac5f797af9cb2f1102d8ebf11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 21 Jul 2020 10:33:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=88=86=E7=B1=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/PointsStatisticsListResultDTO.java | 26 +++++++++++++++ .../epdc/controller/PointsLogsController.java | 17 ++++++++++ .../epdc/controller/PointsRuleController.java | 13 ++++++++ .../elink/esua/epdc/dao/PointsLogsDao.java | 8 ++--- .../esua/epdc/service/PointsLogsService.java | 4 +++ .../service/impl/PointsLogsServiceImpl.java | 32 ++++++++++++------- .../main/resources/mapper/PointsLogsDao.xml | 25 +++++++++++++++ 7 files changed, 110 insertions(+), 15 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsStatisticsListResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsStatisticsListResultDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsStatisticsListResultDTO.java new file mode 100644 index 00000000..d0d1be9c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsStatisticsListResultDTO.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; +@Data +public class PointsStatisticsListResultDTO implements Serializable { + + private static final long serialVersionUID = 8249595537995735691L; + + /** + * 总积分 + */ + private int allPoints; + + /** + * 剩余积分 + */ + private int residuePoints; + + /** + * 操作描述 + */ + private String operationDesc; + +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java index f98294cf..4bd12266 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java @@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; +import com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO; import com.elink.esua.epdc.excel.PointsLogsExcel; import com.elink.esua.epdc.service.PointsLogsService; import org.springframework.beans.factory.annotation.Autowired; @@ -121,4 +122,20 @@ public class PointsLogsController { ValidatorUtils.validateEntity(formDto); return pointsLogsService.confirmUserAdjustPoint(formDto); } + + + /*** + * 积分分类统计 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/7/21 9:22 + */ + @GetMapping("/point/listPagePoints") + public Result> listPagePoints(@RequestParam Map params) { + PageData list = pointsLogsService.listPagePoint(params); + return new Result>().ok(list); + } + + } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsRuleController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsRuleController.java index 618c1aa2..927a6c85 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsRuleController.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsRuleController.java @@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -101,4 +102,16 @@ public class PointsRuleController { return pointsRuleService.getPointRule(ruleCode); } + /*** + * 规则列表 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/7/20 17:28 + */ + @GetMapping("ruleList") + public Result> getRuleList() { + List list = pointsRuleService.list(new HashMap<>()); + return new Result>().ok(list); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java index a66b79b5..4e8eda35 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java @@ -20,12 +20,9 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingTopTenDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingUserDTO; -import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; import com.elink.esua.epdc.entity.PointsLogsEntity; import org.apache.ibatis.annotations.Mapper; @@ -128,4 +125,7 @@ public interface PointsLogsDao extends BaseDao { * @Date: 2020-05-13 */ int selectCountPointsRanking(EpdcAppPointsRankingFormDTO formDto); + + + List selectPointsList(Map params); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java index f0f98098..b4d1e37b 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java @@ -29,6 +29,7 @@ import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; +import com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO; import com.elink.esua.epdc.entity.PointsLogsEntity; import java.util.List; @@ -171,4 +172,7 @@ public interface PointsLogsService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result confirmUserAdjustPoint(EpdcAdjustUserPointsDTO formDto); + + + PageData listPagePoint(Map params); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java index aa7bbd56..d96d3c56 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java @@ -161,15 +161,15 @@ public class PointsLogsServiceImpl extends BaseServiceImpl behaviorCodeInfoByBehaviorCode = pointsBehaviorService.getBehaviorCodeInfoByBehaviorCode(formDto.getBehaviorCode()); - if (!behaviorCodeInfoByBehaviorCode.success() || behaviorCodeInfoByBehaviorCode.getData()==null){ + if (!behaviorCodeInfoByBehaviorCode.success() || behaviorCodeInfoByBehaviorCode.getData() == null) { throw new RenException("获取动作编码信息异常或无此动作编码"); } - PointsLogsEntity pointsLogsEntity=new PointsLogsEntity(); + PointsLogsEntity pointsLogsEntity = new PointsLogsEntity(); pointsLogsEntity.setVolunteerId(formDto.getId()); pointsLogsEntity.setUserId(formDto.getUserId()); pointsLogsEntity.setNickname(formDto.getNickname()); @@ -195,7 +195,7 @@ public class PointsLogsServiceImpl extends BaseServiceImpl * @Author zhangyong * @Date 16:09 2020-05-13 **/ - private List sortListPointsRank(EpdcAppPointsRankingFormDTO formDto){ + private List sortListPointsRank(EpdcAppPointsRankingFormDTO formDto) { List listPointsRank = new ArrayList<>(); listPointsRank = baseDao.selectListPointsRanking(formDto); int sortNumber = 1; - if (listPointsRank != null){ - for (int i = 1; i < listPointsRank.size(); i++){ + if (listPointsRank != null) { + for (int i = 1; i < listPointsRank.size(); i++) { listPointsRank.get(0).setRank(NumConstant.ONE); - if(listPointsRank.get(i - NumConstant.ONE).getPoints().intValue() == listPointsRank.get(i).getPoints().intValue()){ + if (listPointsRank.get(i - NumConstant.ONE).getPoints().intValue() == listPointsRank.get(i).getPoints().intValue()) { listPointsRank.get(i).setRank(sortNumber); } else { sortNumber = sortNumber + NumConstant.ONE; @@ -310,12 +312,13 @@ public class PointsLogsServiceImpl extends BaseServiceImpl listPagePoint(Map params) { + IPage page = getPage(params); + List list = baseDao.selectPointsList(params); + return new PageData(list, page.getTotal()); + } } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml index 9bbac039..0cd78bf4 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml @@ -180,4 +180,29 @@ ) p GROUP BY p.points ) tab + +