9 changed files with 253 additions and 29 deletions
@ -0,0 +1,46 @@ |
|||
package com.epmet.plugins.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 6、【工作日志】近12月趋势图 |
|||
* |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class WorkRecordTrendFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -2934835714413031036L; |
|||
/** |
|||
* party:支部建设; union:联建共建;党员志愿服务:voluntaryservice |
|||
*/ |
|||
@NotBlank(message = "dataType不能为空;可选值:party:支部建设; union:联建共建;党员志愿服务:voluntaryservice") |
|||
private String dataType; |
|||
|
|||
/** |
|||
* 当前组织id |
|||
*/ |
|||
@NotBlank(message = "agencyId不能为空") |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 组织次数:organize;参与人数:joinuser;平均参与人数:avguser |
|||
*/ |
|||
@NotBlank(message = "type不能为空") |
|||
private String type; |
|||
|
|||
@NotBlank(message = "customerId不能为空") |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 查询数据起始月份Id |
|||
*/ |
|||
private String startMonth; |
|||
|
|||
/** |
|||
* 查询数据结束月份Id |
|||
*/ |
|||
private String endMonth; |
|||
} |
@ -0,0 +1,56 @@ |
|||
package com.epmet.plugins.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 6、【工作日志】近12月趋势图 |
|||
* |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class WorkRecordTrendResultDTO implements Serializable { |
|||
/** |
|||
* 横轴 过去十二个月份 |
|||
* ['1月', '2月', '3月', '4月', '5月','6月','7月','8月','9月','10月','11月','12月'] |
|||
*/ |
|||
private List<String> xAxis; |
|||
/** |
|||
* 资源标签名 |
|||
* ['三会一课', '主题党日', '三述专题', '志愿服务', '党内关怀'] |
|||
*/ |
|||
private List<String> legend; |
|||
|
|||
/** |
|||
*各项资源对应数据对象 |
|||
*/ |
|||
private List<WorkRecordTrendResultDTO.SeriesResultDTO> series; |
|||
|
|||
@Data |
|||
public static class SeriesResultDTO { |
|||
/** |
|||
* 资源标签名 |
|||
* ['三会一课', '主题党日', '三述专题', '志愿服务', '党内关怀'] |
|||
*/ |
|||
private String name; |
|||
/** |
|||
* 各项资源对应12月份数据 |
|||
*/ |
|||
private List<Integer> data; |
|||
/** |
|||
* 数据对应的月份Id |
|||
*/ |
|||
@JsonIgnore |
|||
private String monthId; |
|||
/** |
|||
* 各项资源对应某一月份数据 |
|||
*/ |
|||
@JsonIgnore |
|||
private Integer value; |
|||
} |
|||
|
|||
} |
Loading…
Reference in new issue