Merge branch 'master' into dev

zss

2024-11-26 af430e03b2f1a1db9369b17a96896dcec9217919

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

@@ -9,9 +9,11 @@
import com.yuanchu.mom.dto.InsProductDto;
import com.yuanchu.mom.dto.InsProductResultDto;
import com.yuanchu.mom.dto.SubmitPlanDto;
import com.yuanchu.mom.mapper.InsSampleUserMapper;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderState;
import com.yuanchu.mom.pojo.InsProductResult;
import com.yuanchu.mom.pojo.InsSampleUser;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.InsProductResultVo;
@@ -45,6 +47,8 @@
    private InsProductService insProductService;
    private InsOrderStateService insOrderStateService;

    private InsSampleUserMapper insSampleUserMapper;

    @ValueClassify("检验任务")
    @ApiOperation(value = "获取检验任务列表")
    @PostMapping("/selectInsOrderPlanList")
@@ -75,13 +79,14 @@
    @ValueClassify("检验任务")
    @ApiOperation(value = "执行检验操作")
    @PostMapping("/doInsOrder")
    public Result<?> doInsOrder(Integer id, String laboratory) {
        return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
    public Result<?> doInsOrder(Integer sampleId, String laboratory) {
        return Result.success(insOrderPlanService.doInsOrder(sampleId, laboratory));
    }

    @ValueAuth
    @PostMapping("/getInsProduct")
    @ApiOperation("获取检验项目和模板内容")
    //这里的id就是样品id
    public Result<?> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request) {
        return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory, request));
    }
@@ -89,29 +94,29 @@
    @ValueClassify("检验任务")
    @ApiOperation(value = "任务交接")
    @PostMapping("/upPlanUser")
    public Result<?> upPlanUser(Integer userId, Integer orderId, String sonLaboratory) {
        return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
    public Result<?> upPlanUser(Integer userId, Integer sampleId, String sonLaboratory) {
        return Result.success(insOrderPlanService.upPlanUser(userId, sampleId, sonLaboratory));
    }

    @ValueAuth
    @ApiOperation(value = "判断交接的试验室")
    @PostMapping("/upPlanUser2")
    public Result<?> upPlanUser2(Integer orderId) {
        return Result.success(insOrderPlanService.upPlanUser2(orderId));
    public Result<?> upPlanUser2(Integer sampleId) {
        return Result.success(insOrderPlanService.upPlanUser2(sampleId));
    }

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

    @ValueAuth
    @ApiOperation(value = "校验检验任务提交")
    @PostMapping("/checkSubmitPlan")
    public Result<?> checkSubmitPlan(Integer orderId, String laboratory) {
        return Result.success(insOrderPlanService.checkSubmitPlan(orderId, laboratory));
    public Result<?> checkSubmitPlan(Integer sampleId, String laboratory) {
        return Result.success(insOrderPlanService.checkSubmitPlan(sampleId, laboratory));
    }

    @ValueClassify("检验任务")
@@ -165,8 +170,8 @@
    @ValueClassify("检验任务")
    @ApiOperation(value = "上传附件")
    @PostMapping("/uploadFile")
    public Result<?> uploadFile(Integer orderId, MultipartFile file, String sonLaboratory) {
        return Result.success(insOrderPlanService.uploadFile(orderId, file, sonLaboratory));
    public Result<?> uploadFile(Integer orderId, MultipartFile file, String sonLaboratory,Integer sampleId) {
        return Result.success(insOrderPlanService.uploadFile(orderId, file, sonLaboratory,sampleId));
    }

    @ValueClassify("检验任务")
@@ -229,6 +234,7 @@
    @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));
    }
@@ -254,4 +260,16 @@
        return Result.success(insOrderPlanService.preview(id));
    }

    @ValueAuth
    @PostMapping("/getCheckUser")
    @ApiOperation("获取当前检验任务的所有检验员信息")
    //这里的传参是样品id,等检验任务那块全改了之后这里就没问题
    public Result<?> getCheckUser(Integer id,String sonLaboratory) {
        List<InsSampleUser> insSampleUsers = insSampleUserMapper.selectList(Wrappers.<InsSampleUser>lambdaQuery()
                .eq(InsSampleUser::getState, 0)   //检验人
                .eq(InsSampleUser::getInsSampleId, id)
                .eq(InsSampleUser::getSonLaboratory, sonLaboratory));
        return Result.success(insSampleUsers);
    }

}