Merge remote-tracking branch 'origin/master'

zss

2023-08-23 58579a382615c0f9bd03b52ae7227a2ca64f43f3

 standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java

@@ -30,7 +30,13 @@
    @Autowired
    private MaterialService materialService;

    @ApiOperation("添加物料")
    @ApiOperation(value = "添加指标-->选择样品名称")
    @GetMapping("/selectmater")
    public Result selectmater() {
        return Result.success(materialService.selectmater());
    }

    @ApiOperation("添加指标")
    @PostMapping("/add")
    public Result<?> addMaterialInformation(@Validated @RequestBody AddMaterialDto addMaterialDto) {
        Integer isMaterialSuccess = materialService.addMaterialInformation(addMaterialDto);
@@ -53,13 +59,10 @@
        return Result.fail("删除失败！");
    }

    @ApiOperation(value = "标准库-->物料-->侧边栏四级展开", tags = "⭐⭐⭐后端调整")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(value = "型号/型号名称", name = "specificationName", dataTypeClass = String.class)
    })
    @ApiOperation(value = "标准库-->物料-->侧边栏四级展开")
    @GetMapping("/list")
    public Result<?> getFourLevelInformation(String specificationName) {
        List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation(specificationName);
    public Result<?> getFourLevelInformation() {
        List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation();
        return Result.success(fourLevelInformation);
    }
}