diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index d005d954b..d78a14dc3 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -73,7 +73,7 @@ public class IoCollectOrderBackupController extends BaseController { // } // collectOrderRequest.setWorkPlaceCodes(workPlaceCodes); // } - log.error("collectOrderRequest"+collectOrderRequest); + log.error("collectOrderRequest" + collectOrderRequest); List orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest); PageInfo pageInfo = new PageInfo<>(orderResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -127,6 +127,7 @@ public class IoCollectOrderBackupController extends BaseController { } return ResultVOUtils.success(); } + @Resource private ErpBasicClient erpBasicClient; /** @@ -137,6 +138,7 @@ public class IoCollectOrderBackupController extends BaseController { */ @Resource private IoCollectOrderBackupMapper ioCollectOrderBackupMapper; + @PostMapping("/udiwms/basic/collect/order/orderMedicalDelete") public BaseResponse orderMedicalDelete(@RequestBody CollectOrderRequest collectOrderRequest) { PostOrderMedicalDeleteRequest postOrderMedicalDeleteRequest = new PostOrderMedicalDeleteRequest(); @@ -148,12 +150,13 @@ public class IoCollectOrderBackupController extends BaseController { IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup(); ioCollectOrderBackup.setUploadStatus(4); ioCollectOrderBackupMapper.update( - ioCollectOrderBackup,new QueryWrapper().eq("billNo",collectOrderRequest.getBillNo()) + ioCollectOrderBackup, new QueryWrapper().eq("billNo", collectOrderRequest.getBillNo()) ); } return baseResponse; } + /** * 通过业务外键获取码明细 * @@ -223,10 +226,10 @@ public class IoCollectOrderBackupController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest(); - if (StrUtil.isNotEmpty(collectOrderRequest.getBillNo())){ + if (StrUtil.isNotEmpty(collectOrderRequest.getBillNo())) { collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo()); } - if (StrUtil.isNotEmpty(collectOrderRequest.getYbbm())){ + if (StrUtil.isNotEmpty(collectOrderRequest.getYbbm())) { collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getYbbm()); } List collectOrderBizResponses = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest); @@ -238,19 +241,16 @@ public class IoCollectOrderBackupController extends BaseController { } - @PostMapping("/udiwms/basic/collect/orderFinish/orderStats") public BaseResponse orderStats(@RequestBody CollectOrderRequest collectOrderRequest) { List workPlaceCodes = null; List page; // 上传医保不做登录权限限制 - log.error("collectOrderRequest"+collectOrderRequest); + log.error("collectOrderRequest" + collectOrderRequest); Page orderResponses = ioCollectOrderBackupService.filterorderStatsList(collectOrderRequest); return ResultVOUtils.success(orderResponses); } - - } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index 078f96d95..89e84ab41 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -281,7 +281,7 @@ public class IoSplitCodeService extends ServiceImpl