diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java index db000bb..e8f9fc7 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java @@ -214,8 +214,8 @@ public class LisWorkController extends BaseController { } @ApiOperation("自动签收条码") @GetMapping("/autosavebarcode") - public ResultT autosavebarcode(String sqh) { - return ResultT.fromResult(lisWorkService.autosavebarcode(sqh),LabReqmain.class); + public ResultT autosavebarcode(String sqh) { + return ResultT.fromResult(lisWorkService.autosavebarcode(sqh),LabReqmainVO.class); } @ApiOperation("手动保存签收条码") @PostMapping("/savebarcode") @@ -242,7 +242,7 @@ public class LisWorkController extends BaseController { } @ApiOperation("查询条码") @GetMapping("/querybarcode") - public ResultT querybarcode(String sqh) { + public ResultT querybarcode(String sqh) { return ResultT.fromResult(lisWorkService.querybarcode(sqh),LabReqmainVO.class); } } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index 8678dc7..a5f4b4b 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -632,7 +632,7 @@ public class LisWorkServiceImpl implements LisWorkService { return new Result("-1",sqh+"无数据,处理失败"); } LabReqmain labReqmainOne=new LabReqmain(); - BeanUtils.copyBeanProp(labReqmainOne,labReqmainOne); + BeanUtils.copyBeanProp(labReqmainOne,labReqmainvo); //2.调用接口,执行申请单收费 Result result0=reqbilling(labReqmainOne, yhdh); if (!result0.getCode().equals("0")) return result0; @@ -640,7 +640,8 @@ public class LisWorkServiceImpl implements LisWorkService { if (savereqmain(labReqmainOne, yhdh) != 0) { return new Result("-1",sqh+"保存申请单状态失败"+result0.getMsg()); } - return new Result("0","成功",labReqmainOne); + BeanUtils.copyBeanProp(labReqmainvo,labReqmainOne); + return new Result("0","成功",labReqmainvo); } /**