附件调试修改+辐射站点报告生成

zss

2024-10-24 a00890e840b80a741f62eb6cb31b46f13be6202f

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

@@ -89,7 +89,7 @@
    @ValueClassify("检验任务")
    @ApiOperation(value = "任务交接")
    @PostMapping("/upPlanUser")
    public Result<?> upPlanUser(Integer userId, Integer orderId,String sonLaboratory) {
    public Result<?> upPlanUser(Integer userId, Integer orderId, String sonLaboratory) {
        return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
    }

@@ -132,9 +132,9 @@
    @ApiOperation(value = "保存检验内容")
    @PostMapping("/saveInsContext")
    @ValueAuth
    public Result<?> saveInsContext(String param,Integer num) {
    public Result<?> saveInsContext(String param, Integer num) {
        Map<String, Object> param2 = JSON.parseObject(param, Map.class);
        insOrderPlanService.saveInsContext(param2,num);
        insOrderPlanService.saveInsContext(param2, num);
        return Result.success();
    }

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

    @ValueClassify("检验任务")
    @ApiOperation(value = "删除附件")
    @PostMapping("/delfile")
    public Result<?> delfile(Integer id) {
        return Result.success(insOrderFileService.removeById(id));
        return Result.success(insOrderFileService.delfile(id));
    }

    @ValueAuth
@@ -212,7 +212,7 @@
    @ApiOperation(value = "电路试验点击检验选择版本")
    @PostMapping("/chooseVersion")
    @ValueAuth
    public Result<?> chooseVersion(Integer orderStateId,Integer version) {
    public Result<?> chooseVersion(Integer orderStateId, Integer version) {
        InsOrderState orderState = new InsOrderState();
        orderState.setId(orderStateId);
        orderState.setVersion(version);
@@ -229,28 +229,28 @@
    @ValueAuth
    @PostMapping("/getInsProduct2")
    @ApiOperation("查看检验历史")
    public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num) {
        return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request,num));
    public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request, Integer num) {
        return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request, num));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "扫码报检(入库)")
    @PostMapping("/scanInsOrderState")
    public Result scanInsOrderState(String sonLaboratory,String sampleCode,String trees) {
        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory,sampleCode,trees));
    public Result scanInsOrderState(String sonLaboratory, String sampleCode, String trees) {
        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "扫码出库")
    @PostMapping("/outInsOrderState")
    public Result outInsOrderState(String sonLaboratory,String sampleCode) {
        return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory,sampleCode));
    public Result outInsOrderState(String sonLaboratory, String sampleCode) {
        return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode));
    }

    @ValueAuth
    @PostMapping("/preview")
    @ApiOperation("预览文件")
    public Result<?> preview(Integer id)throws Exception {
    public Result<?> preview(Integer id) throws Exception {
        return Result.success(insOrderPlanService.preview(id));
    }