feat: 1.检验单详情温湿度 2.报告编制样品外观.平均值优化

liding

2 天以前 bd46f203b0d30a3d33b7c51ae9a528e4807477e1

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java

@@ -9,6 +9,10 @@
import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
import com.ruoyi.inspect.dto.InsProductBindingDto;
import com.ruoyi.inspect.dto.SaveInsContextDto;
import com.ruoyi.inspect.dto.SaveOrderDevicesDto;
import com.ruoyi.inspect.dto.SaveTemplateContextDto;
import com.ruoyi.inspect.dto.VerifyPlanDto;
import com.ruoyi.inspect.dto.WriteInspectionConditionDto;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
@@ -93,8 +97,8 @@

    @ApiOperation(value = "复核检验任务")
    @PostMapping("/verifyPlan")
    public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell, Integer userId) {
        return Result.success(insOrderPlanService.rawMaterialVerifyPlan(orderId, laboratory, type, tell, userId));
    public Result<?> verifyPlan(@RequestBody VerifyPlanDto verifyPlanDto) {
        return Result.success(insOrderPlanService.rawMaterialVerifyPlan(verifyPlanDto));
    }

    @ApiOperation(value = "校验检验任务提交")
@@ -106,16 +110,35 @@

    @ApiOperation(value = "检验任务提交")
    @PostMapping("/submitPlan")
    public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) {
        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
    public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, Boolean registerInsResults) {
        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode, registerInsResults);
        return num == 1 ? Result.success() : Result.fail("提交失败，部分项目还未进行检验");
    }

    @ApiOperation(value = "保存检验内容")
    @PostMapping("/saveInsContext")
    public Result<?> saveInsContext(@RequestBody SaveInsContextDto saveInsContextDto) {
        Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
        insOrderPlanService.saveInsContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
        insOrderPlanService.saveInsContext(saveInsContextDto);
        return Result.success();
    }

    @ApiOperation(value = "按模板坐标保存新聚原始记录")
    @PostMapping("/saveTemplateContext")
    public Result<?> saveTemplateContext(@RequestBody SaveTemplateContextDto saveTemplateContextDto) {
        insOrderPlanService.saveTemplateContext(saveTemplateContextDto);
        return Result.success();
    }

    @ApiOperation(value = "查询检验单选择的设备")
    @GetMapping("/orderDevices")
    public Result<?> getOrderDevices(Integer orderId) {
        return Result.success(insOrderPlanService.getOrderDeviceIds(orderId));
    }

    @ApiOperation(value = "保存检验单选择的设备")
    @PutMapping("/orderDevices")
    public Result<?> saveOrderDevices(@RequestBody SaveOrderDevicesDto saveOrderDevicesDto) {
        insOrderPlanService.saveOrderDevices(saveOrderDevicesDto);
        return Result.success();
    }

@@ -154,8 +177,8 @@

    @ApiOperation(value = "填写温度与湿度")
    @PostMapping("/write")
    public Result<?> write(@RequestBody InsOrder insOrder) {
        return Result.success(insProductService.write(insOrder));
    public Result<?> write(@RequestBody WriteInspectionConditionDto dto) {
        return Result.success(insProductService.write(dto));
    }


@@ -244,7 +267,8 @@
    @GetMapping("/getBindingProductByProductId")
    public Result<List<InsProduct>> getBindingProductByProductId(Integer productId) {
        return Result.success(insProductService.list(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getBindingProductId, productId)));
                .eq(InsProduct::getBindingProductId, productId)
                .orderByAsc(InsProduct::getSort)));
    }