Browse Source

fix: 巡查树返回remark字段

master_tdsql
hxh 1 year ago
parent
commit
a6cc6f47c8
  1. 2
      shuili-system/src/main/java/com/kms/yxgh/common/dto/CommonCheckingTreeDto.java
  2. 1
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java
  3. 1
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java

2
shuili-system/src/main/java/com/kms/yxgh/common/dto/CommonCheckingTreeDto.java

@ -24,6 +24,8 @@ public class CommonCheckingTreeDto {
private String value;
@ApiModelProperty("排序")
private Long sort;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("子节点")
private List<CommonCheckingTreeDto> children;
}

1
shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java

@ -61,6 +61,7 @@ public class DfCheckingService extends BaseService<DfCheckingMapper, DfChecking>
dto.setKey(dict.getDictValue());
dto.setValue(dict.getDictLabel());
dto.setSort(dict.getDictSort());
dto.setRemark(dict.getRemark());
dto.setChildren(getByDictTypeStream(dict.getDictValue()).map(this::getByDictTypeStream).sorted(Comparator.comparing(CommonCheckingTreeDto::getSort)).collect(Collectors.toList()));
return dto;
}

1
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java

@ -61,6 +61,7 @@ public class SzCheckingService extends BaseService<SzCheckingMapper, SzChecking>
dto.setKey(dict.getDictValue());
dto.setValue(dict.getDictLabel());
dto.setSort(dict.getDictSort());
dto.setRemark(dict.getRemark());
dto.setChildren(getByDictTypeStream(dict.getDictValue()).map(this::getByDictTypeStream).sorted(Comparator.comparing(CommonCheckingTreeDto::getSort)).collect(Collectors.toList()));
return dto;
}

Loading…
Cancel
Save