master
parent
272c65f12c
commit
82e6b323d4
|
|
@ -50,6 +50,12 @@ public class SzTreatmentBasisController{
|
||||||
dto.setCreateTime(new Date());
|
dto.setCreateTime(new Date());
|
||||||
dto.setId(IdWorker.getId());
|
dto.setId(IdWorker.getId());
|
||||||
|
|
||||||
|
if (dto.getStatus() == 0) {
|
||||||
|
dto.setDisplay(0);
|
||||||
|
} else {
|
||||||
|
dto.setDisplay(1);
|
||||||
|
}
|
||||||
|
|
||||||
boolean result = service.save(dto);
|
boolean result = service.save(dto);
|
||||||
|
|
||||||
return R.ok(result ? dto : null);
|
return R.ok(result ? dto : null);
|
||||||
|
|
@ -71,6 +77,11 @@ public class SzTreatmentBasisController{
|
||||||
dto.setCreateBy(null);
|
dto.setCreateBy(null);
|
||||||
dto.setCreateName(null);
|
dto.setCreateName(null);
|
||||||
dto.setUpdateTime(new Date());
|
dto.setUpdateTime(new Date());
|
||||||
|
if (dto.getStatus() == 0) {
|
||||||
|
dto.setDisplay(0);
|
||||||
|
} else {
|
||||||
|
dto.setDisplay(1);
|
||||||
|
}
|
||||||
boolean result = service.updateById(dto);
|
boolean result = service.updateById(dto);
|
||||||
|
|
||||||
return R.ok(result ? dto : null);
|
return R.ok(result ? dto : null);
|
||||||
|
|
@ -102,6 +113,25 @@ public class SzTreatmentBasisController{
|
||||||
return R.ok(parentList);
|
return R.ok(parentList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "获取树-不显示禁用的")
|
||||||
|
@GetMapping("/get/treeFiltered")
|
||||||
|
public R<List<SzTreatmentBasis>> getTreeFiltered() {
|
||||||
|
List<SzTreatmentBasis> list = service.list();
|
||||||
|
if (CollectionUtils.isEmpty(list)){
|
||||||
|
return R.ok(list);
|
||||||
|
}
|
||||||
|
Map<Long, List<SzTreatmentBasis>> listMap = list.stream().collect(Collectors.groupingBy(SzTreatmentBasis::getPId));
|
||||||
|
|
||||||
|
list.forEach(o -> o.setChildren(listMap.get(o.getId())));
|
||||||
|
List<SzTreatmentBasis> parentList = list.stream()
|
||||||
|
.filter(o -> 0L == o.getPId())
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
return R.ok(parentList);
|
||||||
|
}
|
||||||
|
|
||||||
@Operation(summary = "删除")
|
@Operation(summary = "删除")
|
||||||
@GetMapping("/del/{id}")
|
@GetMapping("/del/{id}")
|
||||||
public R<Boolean> del(@Schema(name = "id") @PathVariable("id") Serializable id) {
|
public R<Boolean> del(@Schema(name = "id") @PathVariable("id") Serializable id) {
|
||||||
|
|
|
||||||
|
|
@ -117,6 +117,9 @@ public class SzTreatmentBasis extends CommUpdate implements Serializable {
|
||||||
@Size(max = 2000,message = "处罚措施最大长度要小于 2000")
|
@Size(max = 2000,message = "处罚措施最大长度要小于 2000")
|
||||||
private String penalties;
|
private String penalties;
|
||||||
|
|
||||||
|
@TableField(value="display")
|
||||||
|
@Schema(description="给需要不显示禁用的菜单项使用,0=不显示")
|
||||||
|
private Integer display;
|
||||||
|
|
||||||
// /**
|
// /**
|
||||||
// * 更新人Id
|
// * 更新人Id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue