This commit is contained in:
@@ -80,10 +80,16 @@ public class MaterialController {
|
|||||||
|
|
||||||
@PostMapping("material/list")
|
@PostMapping("material/list")
|
||||||
@Operation(summary = "查询所有物料列表")
|
@Operation(summary = "查询所有物料列表")
|
||||||
public List<Material> all(@Parameter(description = "类型") @RequestParam(required = false, defaultValue = "") String type) {
|
public List<Material> all(@Parameter(description = "类型") @RequestParam(required = false, defaultValue = "") String type,
|
||||||
|
@Parameter(description = "是否赋码") @RequestParam(required = false) Boolean assignRule) {
|
||||||
String[] types = StringUtils.isNotBlank(type) ? type.split(",") : new String[0];
|
String[] types = StringUtils.isNotBlank(type) ? type.split(",") : new String[0];
|
||||||
List<Material> materials = materialService.queryLikeRight(List.of(types));
|
List<Material> materials = materialService.queryLikeRight(List.of(types));
|
||||||
materials.forEach(item -> item.setTypeName(typeService.getTypeName(item.getType())));
|
if (Boolean.FALSE.equals(assignRule)) {
|
||||||
|
materials.stream().filter(item -> Boolean.TRUE.equals(item.getAssignRule()))
|
||||||
|
.forEach(item -> item.setTypeName(typeService.getTypeName(item.getType())));
|
||||||
|
} else {
|
||||||
|
materials.forEach(item -> item.setTypeName(typeService.getTypeName(item.getType())));
|
||||||
|
}
|
||||||
return materials;
|
return materials;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user