diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java index 91df1f3397..56b54fd318 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java @@ -15,11 +15,11 @@ public class PointAditiveRecordDailyDTO implements Serializable { /** * 日期yyyy-MM-dd */ - private String dateStr; + private String date; /** * 时间hh:mm */ - private String timeStr; + private String time; /** * 标题 */ @@ -27,11 +27,11 @@ public class PointAditiveRecordDailyDTO implements Serializable { /** * 积分说明 */ - private String statement; + private String remark; /** * 积分值 */ - private String pointValue; + private String point; /** * 业务主键 */ diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java index 5ba929dfeb..c56cbeaade 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java @@ -16,6 +16,6 @@ public class PointAditiveRecordResultDTO implements Serializable { /** * 日期yyyy-MM-dd */ - private String dateStr; - private List recordList; + private String date; + private List dailyList; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java index fb98405897..fbc96f0faf 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java @@ -126,15 +126,15 @@ public class PointAditiveRecordServiceImpl extends BaseServiceImpl> map = - recordList.stream().collect(Collectors.groupingBy(PointAditiveRecordDailyDTO::getDateStr)); + recordList.stream().collect(Collectors.groupingBy(PointAditiveRecordDailyDTO::getDate)); Map> sortedMap = Maps.newLinkedHashMap(); map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue())); sortedMap.forEach((key, value) -> { PointAditiveRecordResultDTO o = new PointAditiveRecordResultDTO(); - o.setDateStr(key); - o.setRecordList(value); + o.setDate(key); + o.setDailyList(value); list.add(o); }); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index 66afc5150e..aa400d8f7a 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java @@ -71,12 +71,18 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl SELECT TITLE, - STATEMENT, + STATEMENT AS remark, CASE POINT_VALUE WHEN POINT_VALUE > 0 THEN concat( '+', POINT_VALUE ) ELSE POINT_VALUE - END AS POINT_VALUE, + END AS point, BUSINESS_ID, BUSINESS_CODE, - DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS dateStr, - DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS timeStr + DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS date, + DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS time FROM point_aditive_record WHERE