优化调整

zss

2025-02-18 bcc80a6833abe9f24abdb978f7c7f01b664a574f

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java

@@ -5,10 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.InsProductDto;
import com.yuanchu.mom.dto.InsProductResultDto;
import com.yuanchu.mom.dto.SubmitPlanDto;
import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.mapper.InsSampleUserMapper;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderState;
@@ -112,6 +109,13 @@
        return Result.success(insOrderPlanService.verifyPlan(sampleId, laboratory, type, tell));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "纠正复核")
    @PostMapping("/verifyPlan2")
    public Result<?> verifyPlan2(Integer sampleId, String laboratory, Integer type, String tell) throws IOException {
        return Result.success(insOrderPlanService.verifyPlan2(sampleId, laboratory, type, tell));
    }

    @ValueAuth
    @ApiOperation(value = "校验检验任务提交")
    @PostMapping("/checkSubmitPlan")
@@ -125,6 +129,13 @@
    public Result<?> submitPlan(@RequestBody SubmitPlanDto submitPlanDto) {
        int num = insOrderPlanService.submitPlan(submitPlanDto);
        return num == 1 ? Result.success() : Result.fail("提交失败，部分项目还未进行检验");
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "检验任务撤销提交")
    @PostMapping("/cancelSubmitPlan")
    public Result cancelSubmitPlan(Integer orderStateId) {
        return Result.success(insOrderPlanService.cancelSubmitPlan(orderStateId));
    }

    @ValueClassify("设备")
@@ -148,6 +159,13 @@
    @ValueAuth
    public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
        return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
    }

    @ApiOperation(value = "电路试验的保存检验内容(返回/提交)")
    @PostMapping("/saveInsContext2s")
    @ValueAuth
    public Result<?> saveInsContext2s(@RequestBody InsProductResultDtos insProductResultDtos) {
        return Result.success(insOrderPlanService.saveInsContext2s(insProductResultDtos));
    }

    @ApiOperation(value = "温湿度试验+功率试验的保存检验内容")
@@ -234,7 +252,6 @@
    @ValueAuth
    @PostMapping("/getInsProduct2")
    @ApiOperation("查看检验历史")
    //这里的id是样品id
    public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request, Integer num) {
        return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request, num));
    }
@@ -263,7 +280,6 @@
    @ValueAuth
    @PostMapping("/getCheckUser")
    @ApiOperation("获取当前检验任务的所有检验员信息")
    //这里的传参是样品id,等检验任务那块全改了之后这里就没问题
    public Result<?> getCheckUser(Integer id,String sonLaboratory) {
        List<InsSampleUser> insSampleUsers = insSampleUserMapper.selectList(Wrappers.<InsSampleUser>lambdaQuery()
                .eq(InsSampleUser::getState, 0)   //检验人