Commit d4fa0cb4 authored by zhengyi's avatar zhengyi

补充费用申请的详情获取接口

parent 69affac7
...@@ -98,4 +98,6 @@ public interface OrderFeeApplicationService extends IService<OrderFeeApplication ...@@ -98,4 +98,6 @@ public interface OrderFeeApplicationService extends IService<OrderFeeApplication
List<OrderFeeApplicationBackVO> getBatchFeeByProcessId(String processId); List<OrderFeeApplicationBackVO> getBatchFeeByProcessId(String processId);
void cancelFeeApplication(OrderFeeApplicationUpdateReqVO orderFeeApplicationUpdateReqVO); void cancelFeeApplication(OrderFeeApplicationUpdateReqVO orderFeeApplicationUpdateReqVO);
OrderFeeApplicationDO getApprovalFeeApplication(Long id);
} }
...@@ -593,4 +593,15 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl ...@@ -593,4 +593,15 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
//orderService.updateStatus(orderFeeApplicationDO.getOrderId(), null, null, null, null, null, 0, OrderApprovalTypeResultEnum.expense_apply_cancel.getDesc()); //orderService.updateStatus(orderFeeApplicationDO.getOrderId(), null, null, null, null, null, 0, OrderApprovalTypeResultEnum.expense_apply_cancel.getDesc());
// orderBusinessService.addOrderOperateLog(orderFeeApplicationUpdateReqVO.getOrderId(),"","取消费用申请",""); // orderBusinessService.addOrderOperateLog(orderFeeApplicationUpdateReqVO.getOrderId(),"","取消费用申请","");
} }
@Override
public OrderFeeApplicationDO getApprovalFeeApplication(Long id) {
OrderApprovalDO orderApprovalDO = orderApprovalService.getApproval(id);
if (Objects.isNull(orderApprovalDO)){
throw exception(ORDER_APPROVAL_INFO_NOT_FIND);
}
// 这里已经将修改后的内容更新到原数据中去了
OrderFeeApplicationDO orderFeeApplicationDO = JSONObject.parseObject(orderApprovalDO.getDetails(), OrderFeeApplicationDO.class);
return orderFeeApplicationDO;
}
} }
...@@ -155,6 +155,14 @@ public class OrderFeeApplicationController { ...@@ -155,6 +155,14 @@ public class OrderFeeApplicationController {
return success(OrderFeeApplicationConvert.INSTANCE.convert(feeApplication)); return success(OrderFeeApplicationConvert.INSTANCE.convert(feeApplication));
} }
@GetMapping("/approval/get")
@ApiOperation("获得订单费用申请")
@ApiImplicitParam(name = "id", value = "审批id", required = true, example = "1024", dataTypeClass = Long.class)
public CommonResult<OrderFeeApplicationBackVO> getApprovalFeeApplication(@RequestParam("id") Long id) {
OrderFeeApplicationDO feeApplication = feeApplicationService.getApprovalFeeApplication(id);
return success(OrderFeeApplicationConvert.INSTANCE.convert(feeApplication));
}
@GetMapping("/getOrderByProcessId") @GetMapping("/getOrderByProcessId")
@ApiOperation("根据流程ID获得订单信息") @ApiOperation("根据流程ID获得订单信息")
@ApiImplicitParam(name = "processId", value = "流程编号", required = true, example = "1024", dataTypeClass = Long.class) @ApiImplicitParam(name = "processId", value = "流程编号", required = true, example = "1024", dataTypeClass = Long.class)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment