修改bug

Fixiaobai

2023-09-07 e29f147aab5b0b0b794d611b522b67b94423e3cf

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

@@ -1,21 +1,18 @@
package com.yuanchu.limslaboratory.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.*;

/**
 * <p>
@@ -34,16 +31,64 @@
    private PlanService planService;


    @ApiOperation("查询检验计划")
    @ApiOperation("查询所有检验计划")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "deviceId", value = "设备名称Id", dataTypeClass = Integer.class),
            @ApiImplicitParam(name = "beginTime", value = "检验开始时间", dataTypeClass = Date.class),
            @ApiImplicitParam(name = "endTime", value = "检验结束时间", dataTypeClass = Date.class),
            @ApiImplicitParam(name = "userId", value = "检验人", dataTypeClass = Integer.class)
            @ApiImplicitParam(name = "code", value = "申请单编号", dataTypeClass = String.class),
            @ApiImplicitParam(name = "beginTime", value = "检验开始时间", dataTypeClass = String.class),
            @ApiImplicitParam(name = "endTime", value = "检验结束时间", dataTypeClass = String.class),
            @ApiImplicitParam(name = "status", value = "检验结果", dataTypeClass = Integer.class),
            @ApiImplicitParam(name = "isLookMe", value = "是否只看我", dataTypeClass = Boolean.class)
    })
    @GetMapping("/selectAllPlan")
    public Result selectAllPlan(Integer deviceId, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, Integer userId) {
        List<PlanVo> planVoList = planService.selectAllPlan(deviceId, beginTime, endTime, userId);
        return Result.success(planVoList);
    @AuthHandler
    public Result selectAllPlan(String code, String beginTime, String endTime, Integer status,boolean isLookMe) {
        return Result.success(planService.selectAllPlan(code, beginTime, endTime, status,isLookMe));
    }

    @ApiOperation("分配-->选择检验人")
    @GetMapping("/choosecheck")
    @AuthHandler
    public Result choosecheck() {
        return Result.success(planService.choosecheck());
    }

    @ApiOperation("分配--选择设备")
    @GetMapping("/chooseinstum")
    @AuthHandler
    public Result chooseinstum() {
        return Result.success(planService.chooseinstum());
    }

    @ApiOperation("分配")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "检验项目id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "userId", value = "执行人id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "instrumentId", value = "设备id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/distribution")
    @AuthHandler
    public Result distribution(Integer id, Integer userId, Integer instrumentId) {
        return Result.success(planService.distribution(id, userId, instrumentId));
    }

    @ApiOperation("检验")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "检验项目id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "value", value = "检验值", dataTypeClass = String.class)
    })
    @PostMapping("/check")
    @AuthHandler
    public Result check(Integer id, String value) {
        return Result.success(planService.check(id, value));
    }

    @ApiOperation("上报")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "检验单id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/reported")
    @AuthHandler
    public Result reported(Integer id) {
        return Result.success(planService.reported(id));
    }
}