From 995293880f5ca5c05ca94e53f5dac213b0155e3a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 13:57:09 +0800
Subject: [PATCH] 审批模块接口代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java | 128 ++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 68 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
index e94ca1f..b7f2b0c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
@@ -150,7 +150,6 @@
.stream().collect(Collectors.toMap(OaApprovalApplicationAttendance::getApprovalApplicationId, e -> e));
Map<Integer, AssetMain> assetMainMap = assetMainService.list().stream().collect(Collectors.toMap(AssetMain::getId, e -> e));
- Map<Integer, OaApprovalTodo> approvalTodoMap = list.stream().collect(Collectors.toMap(OaApprovalTodo::getApplicationId, e -> e));
Map<Long, SysUser> userMap = sysUserService.selectAllList().stream().collect(Collectors.toMap(SysUser::getUserId, e -> e));
Map<Integer, TDept> deptMap = deptService.list().stream().collect(Collectors.toMap(TDept::getId, e -> e));
Map<Integer, OaApproval> approvalMap = approvalService.list().stream().collect(Collectors.toMap(OaApproval::getId, e -> e));
@@ -182,8 +181,6 @@
}
approvalTodoVO.setApplicationCode(approvalApplication.getApplicationCode());
approvalTodoVO.setCreateTime(approvalApplication.getCreateTime());
- OaApprovalTodo oaApprovalTodo = approvalTodoMap.get(approvalApplication.getId());
- approvalTodoVO.setId(oaApprovalTodo.getId());
approvalTodoVO.setApplicationId(approvalApplication.getId());
switch (approvalTodoVO.getApprovalCategory()){
@@ -285,9 +282,9 @@
@ApiOperation(value = "合同文件审批详情")
@GetMapping(value = "/detailContract")
- public R<ContractDetailVO> detailContract(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<ContractDetailVO> detailContract(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationContract approvalApplicationContract = approvalApplicationContractService.lambdaQuery()
.eq(OaApprovalApplicationContract::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -317,9 +314,9 @@
}
@ApiOperation(value = "进度款支付审批详情")
@GetMapping(value = "/detailPayment")
- public R<PaymentDetailVO> detailPayment(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<PaymentDetailVO> detailPayment(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationPayment approvalApplicationPayment = approvalApplicationPaymentService.lambdaQuery()
.eq(OaApprovalApplicationPayment::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -351,9 +348,9 @@
}
@ApiOperation(value = "请假申请审批详情")
@GetMapping(value = "/detailLeave")
- public R<LeaveDetailVO> detailLeave(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<LeaveDetailVO> detailLeave(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationAttendance approvalApplicationAttendance = approvalApplicationAttendanceService.lambdaQuery()
.eq(OaApprovalApplicationAttendance::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -387,9 +384,9 @@
}
@ApiOperation(value = "销假审批详情")
@GetMapping(value = "/detailLeaveDestroy")
- public R<LeaveDestroyDetailVO> detailLeaveDestroy(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<LeaveDestroyDetailVO> detailLeaveDestroy(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationAttendance approvalApplicationAttendance = approvalApplicationAttendanceService.lambdaQuery()
.eq(OaApprovalApplicationAttendance::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -426,9 +423,9 @@
}
@ApiOperation(value = "外出申请审批详情")
@GetMapping(value = "/detailOut")
- public R<OutDetailVO> detailOut(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<OutDetailVO> detailOut(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationAttendance approvalApplicationAttendance = approvalApplicationAttendanceService.lambdaQuery()
.eq(OaApprovalApplicationAttendance::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -460,9 +457,9 @@
}
@ApiOperation(value = "出差审批详情")
@GetMapping(value = "/detailBusinessTrip")
- public R<BusinessTripDetailVO> detailBusinessTrip(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<BusinessTripDetailVO> detailBusinessTrip(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationAttendance approvalApplicationAttendance = approvalApplicationAttendanceService.lambdaQuery()
.eq(OaApprovalApplicationAttendance::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -499,17 +496,16 @@
@ApiOperation(value = "采购审批详情-采购物品清单")
@PostMapping(value = "/detailPurchaseList")
public R<PageInfo<PurchaseListVO>> detailPurchaseList(@RequestBody ApprovalDetailQuery query) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(query.getId());
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
query.setId(approvalApplications.getId());
PageInfo<PurchaseListVO> items = approvalApplicationPurchaseItemService.pageList(query);
return R.ok(items);
}
@ApiOperation(value = "采购审批详情")
@GetMapping(value = "/detailPurchase")
- public R<PurchaseDetailVO> detailPurchase(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<PurchaseDetailVO> detailPurchase(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationPurchase approvalApplicationPurchase = approvalApplicationPurchaseService.lambdaQuery()
.eq(OaApprovalApplicationPurchase::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -546,17 +542,16 @@
@ApiOperation(value = "物品领用-领用资产列表")
@PostMapping(value = "/detailGrabList")
public R<PageInfo<GrabListVO>> detailGrabList(@RequestBody ApprovalDetailQuery query) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(query.getId());
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
query.setId(approvalApplications.getId());
PageInfo<GrabListVO> items = approvalApplicationAssetItemService.pageList(query);
return R.ok(items);
}
@ApiOperation(value = "物品领用审批详情")
@GetMapping(value = "/detailGrab")
- public R<GrabDetailVO> detailGrab(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<GrabDetailVO> detailGrab(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationAsset approvalApplicationAsset = approvalApplicationAssetService.lambdaQuery()
.eq(OaApprovalApplicationAsset::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -594,17 +589,16 @@
@ApiOperation(value = "资产入库-入库资产列表")
@PostMapping(value = "/detailInStockList")
public R<PageInfo<StorageListVO>> detailInStockList(@RequestBody ApprovalDetailQuery query) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(query.getId());
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
query.setId(approvalApplications.getId());
PageInfo<StorageListVO> items = approvalApplicationStorageService.pageList(query);
return R.ok(items);
}
@ApiOperation(value = "资产入库审批详情")
@GetMapping(value = "/detailInStock")
- public R<StorageDetailVO> detailInStock(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<StorageDetailVO> detailInStock(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationStorage approvalApplicationStorage = approvalApplicationStorageService.lambdaQuery()
.eq(OaApprovalApplicationStorage::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -631,17 +625,16 @@
@ApiOperation(value = "物品借用-借用资产列表")
@PostMapping(value = "/detailBurrowList")
public R<PageInfo<GrabListVO>> detailBurrowList(@RequestBody ApprovalDetailQuery query) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(query.getId());
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
query.setId(approvalApplications.getId());
PageInfo<GrabListVO> items = approvalApplicationAssetItemService.pageList(query);
return R.ok(items);
}
@ApiOperation(value = "物品借用审批详情")
@GetMapping(value = "/detailBurrow")
- public R<BorrowDetailVO> detailBurrow(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<BorrowDetailVO> detailBurrow(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationAsset approvalApplicationAsset = approvalApplicationAssetService.lambdaQuery()
.eq(OaApprovalApplicationAsset::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -674,17 +667,16 @@
@ApiOperation(value = "物品借用归还-归还资产列表")
@PostMapping(value = "/detailBackList")
public R<PageInfo<GrabListVO>> detailBackList(@RequestBody ApprovalDetailQuery query) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(query.getId());
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
query.setId(approvalApplications.getId());
PageInfo<GrabListVO> items = approvalApplicationAssetItemService.pageList(query);
return R.ok(items);
}
@ApiOperation(value = "物品借用归还审批详情")
@GetMapping(value = "/detailBack")
- public R<BackDetailVO> detailBack(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplicationsBack = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<BackDetailVO> detailBack(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplicationsBack = approvalApplicationsService.getById(id);
OaApprovalApplicationAsset approvalApplicationAssetBack = approvalApplicationAssetService.lambdaQuery()
.eq(OaApprovalApplicationAsset::getApprovalApplicationId, approvalApplicationsBack.getId())
.last("limit 1").one();
@@ -719,17 +711,17 @@
@ApiOperation(value = "资产处置-处置资产列表")
@PostMapping(value = "/detailDisposeList")
public R<PageInfo<GrabListVO>> detailDisposeList(@RequestBody ApprovalDetailQuery query) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(query.getId());
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
query.setId(approvalApplications.getId());
PageInfo<GrabListVO> items = approvalApplicationAssetItemService.pageList(query);
return R.ok(items);
}
@ApiOperation(value = "资产处置审批详情")
@GetMapping(value = "/detailDispose")
- public R<DisposeDetailVO> detailDispose(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<DisposeDetailVO> detailDispose(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationDispose approvalApplicationDispose = approvalApplicationDisposeService.lambdaQuery()
.eq(OaApprovalApplicationDispose::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -770,17 +762,16 @@
@ApiOperation(value = "资产变更-变更资产列表")
@PostMapping(value = "/detailChangeList")
public R<PageInfo<GrabListVO>> detailChangeList(@RequestBody ApprovalDetailQuery query) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(query.getId());
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
query.setId(approvalApplications.getId());
PageInfo<GrabListVO> items = approvalApplicationAssetItemService.pageList(query);
return R.ok(items);
}
@ApiOperation(value = "资产变更审批详情")
@GetMapping(value = "/detailChange")
- public R<ChangeDetailVO> detailChange(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<ChangeDetailVO> detailChange(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationChange approvalApplicationChange = approvalApplicationChangeService.lambdaQuery()
.eq(OaApprovalApplicationChange::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -822,9 +813,9 @@
}
@ApiOperation(value = "报销申请审批详情")
@GetMapping(value = "/detailReimbursement")
- public R<ReimbursementDetailVO> detailReimbursement(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<ReimbursementDetailVO> detailReimbursement(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationReimbursement approvalApplicationReimbursement = approvalApplicationReimbursementService.lambdaQuery()
.eq(OaApprovalApplicationReimbursement::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -861,9 +852,9 @@
}
@ApiOperation(value = "款项申请审批详情")
@GetMapping(value = "/detailMoney")
- public R<MoneyDetailVO> detailMoney(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<MoneyDetailVO> detailMoney(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationMoney approvalApplicationMoney = approvalApplicationMoneyService.lambdaQuery()
.eq(OaApprovalApplicationMoney::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -899,9 +890,9 @@
}
@ApiOperation(value = "内部联系单审批详情")
@GetMapping(value = "/detailContact")
- public R<ContactDetailVO> detailContact(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<ContactDetailVO> detailContact(@ApiParam("申请单d")Integer id) {
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationMoney approvalApplicationMoney = approvalApplicationMoneyService.lambdaQuery()
.eq(OaApprovalApplicationMoney::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
@@ -934,9 +925,10 @@
}
@ApiOperation(value = "广告制作审批详情")
@GetMapping(value = "/detailAdvertisement")
- public R<AdvertisementDetailVO> detailAdvertisement(@ApiParam("待办事项id")Integer id) {
- OaApprovalTodo approvalTodo = approvalTodoService.getById(id);
- OaApprovalApplications approvalApplications = approvalApplicationsService.getById(approvalTodo.getApplicationId());
+ public R<AdvertisementDetailVO> detailAdvertisement(@ApiParam("申请单d")Integer id) {
+
+
+ OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationAdvertisement applicationAdvertisement = approvalApplicationAdvertisementService.lambdaQuery()
.eq(OaApprovalApplicationAdvertisement::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
--
Gitblit v1.7.1