Browse Source

Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

release-sy-tdsql
“lyd” 1 month ago
parent
commit
ae560a4509
  1. 3
      shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java
  2. 1
      shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java

3
shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java

@ -42,6 +42,9 @@ public class CharInfoDto {
@Data
public static class Series {
@ApiModelProperty(value = "指标编码")
private String code;
@ApiModelProperty(value = "名称")
private String name;

1
shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java

@ -109,6 +109,7 @@ public enum ProjectCharEnum {
.map(type -> {
CharInfoDto.Series series = new CharInfoDto.Series();
series.setName(type.getZhName());
series.setCode(type.name());
Map<String, String> values = dataMap.getOrDefault(type, new HashMap<>());
series.setData(charInfoDto.getXAxis().stream()
.map(time -> {

Loading…
Cancel
Save