检验任务代码迁移&爱尚平台对接测试

zouyu

2025-03-18 8f63d5ce747106195b279e1c158fd12f9997a770

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

@@ -48,7 +48,7 @@

    @ApiOperation(value = "导出委托费用")
    @GetMapping("/exportCommissionFees")
    public void exportCommissionFees(Map<String, Object> data,HttpServletResponse response) {
    public void exportCommissionFees(@RequestParam Map<String, Object> data,HttpServletResponse response) {
         insOrderPlanService.exportCommissionFees(data,response);
    }

@@ -102,8 +102,8 @@

    @ApiOperation(value = "交接按钮")
    @PostMapping("/upPlanUser")
    public Result<?> upPlanUser(Integer userId, Integer orderId, String sonLaboratory) {
        return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
    public Result<?> upPlanUser(@RequestBody UpInsOrderDTO upInsOrderDTO) {
        return Result.success(insOrderPlanService.upPlanUser(upInsOrderDTO.getUserId(), upInsOrderDTO.getOrderId(), upInsOrderDTO.getSonLaboratory()));
    }

    @ApiOperation(value = "判断交接的试验室")
@@ -142,18 +142,18 @@
    }

    /**
     * @param param         模板内容
     * @param currentTable  当前模板id
     * @param sampleId      当前样品id
     * @param orderId       当前订单id
     * @param sonLaboratory 子试验室
     * @param inspectionOrderDTO         检验数据
     * @return
     */
    @ApiOperation(value = "保存检验内容")
    @PostMapping("/saveInsContext")
    public Result<?> saveInsContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory,Boolean isDelete) {
        Map<String, Object> param2 = JSON.parseObject(param, Map.class);
        insOrderPlanService.saveInsContext(param2, currentTable, sampleId, orderId, sonLaboratory,isDelete);
    public Result<?> saveInsContext(@RequestBody InspectionOrderDTO inspectionOrderDTO) {
        insOrderPlanService.saveInsContext(inspectionOrderDTO.getParam(),
                inspectionOrderDTO.getCurrentTable(),
                inspectionOrderDTO.getSampleId(),
                inspectionOrderDTO.getOrderId(),
                inspectionOrderDTO.getSonLaboratory(),
                inspectionOrderDTO.getIsDelete());
        return Result.success();
    }

@@ -228,4 +228,4 @@
        return Result.success(insOrderPlanService.getCurrentMonthPlanTotalBySonLaboratory(insOrderPlanCountDTO.getSonLaboratory(),insOrderPlanCountDTO.getStartTime(),insOrderPlanCountDTO.getEndTime()));
    }

}
}