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;
@@ -44,6 +46,8 @@

    private InsProductService insProductService;
    private InsOrderStateService insOrderStateService;

    private InsSampleUserMapper insSampleUserMapper;

    @ValueClassify("检验任务")
    @ApiOperation(value = "获取检验任务列表")
@@ -256,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);
    }

}