Browse Source

bug修改

dev_shibei_match
yinzuomei 4 years ago
parent
commit
5db438fe5d
  1. 4
      epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/MyPointTaskFormDTO.java
  2. 11
      epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java
  3. 1
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

4
epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/MyPointTaskFormDTO.java

@ -28,5 +28,9 @@ public class MyPointTaskFormDTO implements Serializable {
* */
@NotBlank(message = "未完成:unfinished;已完成:finished;全部:all")
private String type;
/**
* yyyyMMdd现在默认是当天后端代码写死
* */
private String dateId;
}

11
epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java

@ -49,38 +49,41 @@ public class MyPointTaskResultDTO implements Serializable {
/**
* 事件CODE 来自事件表
*/
// @JsonIgnore
@JsonIgnore
private String eventCode;
/**
* 操作类型 加积分:add;减积分:subtract
*/
// @JsonIgnore
@JsonIgnore
private String operateType;
/**
* 积分上限 0表示不涉及积分上限
*/
// @JsonIgnore
@JsonIgnore
private Integer upLimit;
/**
* 获得积分值
*/
// @JsonIgnore
@JsonIgnore
private Integer point;
/**
* 已完成次数
*/
@JsonIgnore
private Integer finishedCount;
/**
* 上限次数,0代表没有上限次数
*/
@JsonIgnore
private Integer upLimitCount;
/**
* 排序
*/
@JsonIgnore
private Integer sort;
/**

1
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

@ -538,6 +538,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
dto.setFinishFlag("未完成");
}
}
//一次性任务,已完成。
if("1".equals(dto.getDisposable())&&dto.getFinishedCount().equals(NumConstant.ONE)){
dto.setFinishFlag("已完成");
}

Loading…
Cancel
Save