luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper

dev
yinzuomei 3 years ago
parent
0d655142c6 d2cebe0188
commit
b20243c6d0
3 changed files with 38 additions and 31 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. 1
      epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml
  2. 1
      epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java
  3. 67
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

1
epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml
View File

@ -12,6 +12,7 @@
del_flag = '0'
AND customer_id = #{customerId}
AND user_id = #{userId}
ORDER BY create_time desc
</select>
<update id="upByUserId" parameterType="com.epmet.dto.form.ReadIcMessageFormDTO">

1
epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java
View File

@ -25,6 +25,7 @@ public class PartyPointResultDTO implements Serializable {
private String time;
private String point;
private String actId;
private String actTopic;
private String actType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date actDate;

67
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
View File

@ -623,39 +623,43 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
@Override
public List<PartyPointRecordResultDTO> pagePartyPoint(PartyPointFormDTO formDTO) {
List<PartyPointRecordResultDTO> result = new LinkedList<>();
if (StringUtils.isNotBlank(formDTO.getQuarter())) {
if (StringUtils.isNotBlank(formDTO.getMonth())) {
if (StringUtils.isNotBlank(formDTO.getYear())) {
if (StringUtils.isNotBlank(formDTO.getQuarter())) {
if (StringUtils.isNotBlank(formDTO.getMonth())) {
formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth()));
formDTO.setDateType(NumConstant.TWO_STR);
} else {
switch (formDTO.getQuarter()) {
case NumConstant.ONE_STR:
formDTO.setStartDate(formDTO.getYear().concat("01"));
formDTO.setEndDate(formDTO.getYear().concat("03"));
break;
case NumConstant.TWO_STR:
formDTO.setStartDate(formDTO.getYear().concat("04"));
formDTO.setEndDate(formDTO.getYear().concat("06"));
break;
case NumConstant.THREE_STR:
formDTO.setStartDate(formDTO.getYear().concat("07"));
formDTO.setEndDate(formDTO.getYear().concat("09"));
break;
case NumConstant.FOUR_STR:
formDTO.setStartDate(formDTO.getYear().concat("10"));
formDTO.setEndDate(formDTO.getYear().concat("12"));
break;
default:
break;
}
formDTO.setDateType(NumConstant.THREE_STR);
}
} else if (StringUtils.isNotBlank(formDTO.getMonth())) {
formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth()));
formDTO.setDateType(NumConstant.TWO_STR);
} else {
switch (formDTO.getQuarter()) {
case NumConstant.ONE_STR:
formDTO.setStartDate(formDTO.getYear().concat("01"));
formDTO.setEndDate(formDTO.getYear().concat("03"));
break;
case NumConstant.TWO_STR:
formDTO.setStartDate(formDTO.getYear().concat("04"));
formDTO.setEndDate(formDTO.getYear().concat("06"));
break;
case NumConstant.THREE_STR:
formDTO.setStartDate(formDTO.getYear().concat("07"));
formDTO.setEndDate(formDTO.getYear().concat("09"));
break;
case NumConstant.FOUR_STR:
formDTO.setStartDate(formDTO.getYear().concat("10"));
formDTO.setEndDate(formDTO.getYear().concat("12"));
break;
default:
break;
}
formDTO.setDateType(NumConstant.THREE_STR);
formDTO.setStartDate(formDTO.getYear());
formDTO.setDateType(NumConstant.ONE_STR);
}
} else if (StringUtils.isNotBlank(formDTO.getMonth())){
formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth()));
formDTO.setDateType(NumConstant.TWO_STR);
} else {
formDTO.setStartDate(formDTO.getYear());
formDTO.setDateType(NumConstant.ONE_STR);
formDTO.setDateType(NumConstant.FOUR_STR);
}
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
List<PartyPointResultDTO> list =baseDao.getPagePartyPoint(formDTO);
@ -666,6 +670,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
item.setActType(actInfo.getData().getActTypeName());
item.setActAddress(actInfo.getData().getAddress());
item.setActDate(actInfo.getData().getHoldTime());
item.setActTopic(actInfo.getData().getTopic());
}
});
@ -675,10 +680,10 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
Map<String, List<PartyPointResultDTO>> sortedMap = Maps.newLinkedHashMap();
map.entrySet().stream().sorted(Map.Entry.<String, List<PartyPointResultDTO>>comparingByKey().reversed())
.forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue()));
sortedMap.entrySet().forEach(e -> {
sortedMap.forEach((key, value) -> {
PartyPointRecordResultDTO o = new PartyPointRecordResultDTO();
o.setDate(e.getKey());
o.setDailyList(e.getValue());
o.setDate(key);
o.setDailyList(value);
result.add(o);
});

Write Preview
Loading…
Cancel
Save