Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-27 c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java

@@ -1,8 +1,12 @@
package com.yuanchu.limslaboratory.controller;


import com.yuanchu.limslaboratory.pojo.Plan;
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -20,7 +24,7 @@
 * @author 江苏鵷雏网络科技有限公司
 * @since 2023-07-17
 */
@Api(tags = "检验模块")
@Api(tags = "检验模块-->检验计划")
@RestController
@RequestMapping("/plan")
public class PlanController {
@@ -28,7 +32,10 @@
    @Resource
    private PlanService planService;

    @ApiOperation("查询所有检验计划表")
    @Resource
    ProductService productService;

    @ApiOperation("查询所有检验计划分配")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize", value = "页数", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "countSize", value = "条数/页", dataTypeClass = Integer.class, required = true),
@@ -39,21 +46,50 @@
        return Result.success(planService.selectAllPlan(pageSize, countSize, state));
    }

    @ApiOperation("查询检验计划里面的分配信息")
    @ApiOperation("根据项目名查询所有试验方法")
    @GetMapping("/selectInstrumentByProname")
    public Result selectInstrumentByProname(String name) {
        return Result.success(productService.selectInstrumentByProname(name));
    }

    @ApiOperation("选择试验方法")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "样品编号", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "id", value = "项目id", dataTypeClass = Integer.class, required = true),
    })
    @PutMapping("/selectPlanById/{id}")
    public Result selectPlanById(@PathVariable Integer id) {
        return Result.success(planService.selectById(id));
    @PostMapping("/selectProMethodById")
    public Result selectProMethodById(Integer id) {
        Product product = productService.getById(id);
        return Result.success(product.getMethod());
    }

    @ApiOperation("分配检验计划中分配项目")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "检验样品ID", dataTypeClass = Integer.class, required = true),
    })
    @PutMapping("/upPlan/{id}")
    public Result upPlan(@PathVariable Integer id ,@RequestBody InspectionProductListDto inspectionProductListDto) {
        planService.upPlan(id,inspectionProductListDto);
        return Result.success();
    }

    @ApiOperation("作废检验计划")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "检验计划ID", dataTypeClass = Integer.class, required = true),
    })
    @PostMapping("/delPlan")
    public Result delPlan(Integer id) {
        return Result.success(planService.delPlan(id));
    @PutMapping("/delPlan/{id}")
    public Result delPlan(@PathVariable Integer id) {
        planService.delPlan(id);
        return Result.success();
    }

    @ApiOperation("查询成品检验")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize", value = "页数", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "countSize", value = "条数/页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "state", value = "状态(为空=全部)", dataTypeClass = Integer.class)
    })
    @GetMapping("/selectInspection")
    public Result selectInspection(int pageSize, int countSize, Integer state) {
        return Result.success(planService.selectInspection(pageSize,countSize,state));
    }
}