From a3a0d8a83e538efc6cf27865e5a33bf26e958ff7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 25 九月 2025 09:37:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java | 252 +++++++++++++++++++++++++++++---------------------
1 files changed, 146 insertions(+), 106 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..a569beb 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
@@ -1,23 +1,18 @@
package com.ruoyi.web.controller.api;
-import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.TDept;
-import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.emums.ApprovalTypeEnum;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.ApprovalDetailQuery;
import com.ruoyi.system.query.ApprovalTodoListQuery;
-import com.ruoyi.system.query.NotificationListQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
-import com.ruoyi.system.vo.system.NotificationVO;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.util.StringUtils;
@@ -78,6 +73,7 @@
private OaApprovalApplicationReimbursementItemService approvalApplicationReimbursementItemService;
@Resource
private OaApprovalFlowNodeService approvalFlowNodeService;
+
@Resource
private OaApprovalApplicationAssetService approvalApplicationAssetService;
@Resource
@@ -98,7 +94,9 @@
private OaApprovalFlowService approvalFlowService;
+ public static void main(String[] args) {
+ }
@ApiOperation("待办事项列表")
@PostMapping("/pageList")
public R<PageInfo<ApprovalTodoVO>> pageList(@RequestBody ApprovalTodoListQuery query) {
@@ -150,7 +148,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));
@@ -174,7 +171,7 @@
}
SysUser sysUser = userMap.get(approvalApplication.getApplicantUserId().longValue());
if (sysUser!=null){
- approvalTodoVO.setApplyUserName(sysUser.getUserName());
+ approvalTodoVO.setApplyUserName(sysUser.getNickName());
TDept tDept = deptMap.get(Integer.parseInt(sysUser.getDeptId()));
if (tDept!=null){
approvalTodoVO.setApplyDeptName(tDept.getDeptName());
@@ -182,25 +179,31 @@
}
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()){
case 5:
OaApprovalApplicationPurchase oaApprovalApplicationPurchase = approvalApplicationPurchaseMap.get(approvalApplication.getId());
if (oaApprovalApplicationPurchase!=null){
+ approvalTodoVO.setTitle(oaApprovalApplicationPurchase.getTitle());
+
approvalTodoVO.setAmount(oaApprovalApplicationPurchase.getTotalAmount());
}
break;
case 6:
OaApprovalApplicationStorage oaApprovalApplicationStorage = applicationStorageMap.get(approvalApplication.getId());
if (oaApprovalApplicationStorage!=null){
+ approvalTodoVO.setTitle(oaApprovalApplicationStorage.getTitle());
+
approvalTodoVO.setStorageType(oaApprovalApplicationStorage.getStorageType());
}
break;
case 7:
StringBuilder temp = new StringBuilder();
+ OaApprovalApplicationAsset oaApprovalApplicationAsset = approvalApplicationAssetMap.get(approvalApplication.getId());
+ if (oaApprovalApplicationAsset!=null){
+ approvalTodoVO.setTitle(oaApprovalApplicationAsset.getTitle());
+ }
List<OaApprovalApplicationAssetItem> oaApprovalApplicationAssetItems = approvalApplicationAssetItemMap.get(approvalApplication.getId());
if (oaApprovalApplicationAssetItems!=null){
for (OaApprovalApplicationAssetItem oaApprovalApplicationAssetItem : oaApprovalApplicationAssetItems) {
@@ -220,24 +223,32 @@
case 8:
OaApprovalApplicationAsset oaApprovalApplicationAssetOut = approvalApplicationAssetMap.get(approvalApplication.getId());
if (oaApprovalApplicationAssetOut!=null){
+ approvalTodoVO.setTitle(oaApprovalApplicationAssetOut.getTitle());
+
approvalTodoVO.setOperateTime(oaApprovalApplicationAssetOut.getOperateTime());
}
break;
case 9:
OaApprovalApplicationAsset oaApprovalApplicationAssetBack = approvalApplicationAssetMap.get(approvalApplication.getId());
if (oaApprovalApplicationAssetBack!=null){
+ approvalTodoVO.setTitle(oaApprovalApplicationAssetBack.getTitle());
+
approvalTodoVO.setOperateTime(oaApprovalApplicationAssetBack.getExpectReturnDate());
}
break;
case 10:
OaApprovalApplicationDispose oaApprovalApplicationDispose = approvalApplicationDisposeMap.get(approvalApplication.getId());
if (oaApprovalApplicationDispose!=null){
+ approvalTodoVO.setTitle(oaApprovalApplicationDispose.getTitle());
+
approvalTodoVO.setDisposeType(oaApprovalApplicationDispose.getDisposeType());
}
break;
case 11:
OaApprovalApplicationChange oaApprovalApplicationChange = approvalApplicationChangeMap.get(approvalApplication.getId());
if (oaApprovalApplicationChange!=null){
+ approvalTodoVO.setTitle(oaApprovalApplicationChange.getTitle());
+
Integer ownershipDeptId = oaApprovalApplicationChange.getOwnershipDeptId();
TDept tDept = deptMap.get(ownershipDeptId);
if (tDept!=null){
@@ -248,12 +259,14 @@
case 12:
OaApprovalApplicationReimbursement oaApprovalApplicationReimbursement = approvalApplicationReimbursementMap.get(approvalApplication.getId());
if (oaApprovalApplicationReimbursement!=null){
+
approvalTodoVO.setAmount(oaApprovalApplicationReimbursement.getReimbursementAmount());
}
break;
case 13:
OaApprovalApplicationMoney oaApprovalApplicationMoney = oaApprovalApplicationMoneyMap.get(approvalApplication.getId());
if (oaApprovalApplicationMoney!=null){
+
approvalTodoVO.setAmount(oaApprovalApplicationMoney.getApplyAmount());
approvalTodoVO.setDescription(oaApprovalApplicationMoney.getDescription());
@@ -262,6 +275,7 @@
case 15:
OaApprovalApplicationPayment oaApprovalApplicationPayment = approvalApplicationPaymentMap.get(approvalApplication.getId());
if (oaApprovalApplicationPayment!=null){
+
approvalTodoVO.setAmount(oaApprovalApplicationPayment.getApplyAmount());
approvalTodoVO.setDescription(approvalApplication.getApplicationReason());
@@ -270,6 +284,7 @@
case 17:
OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = approvalApplicationAdvertisementMap.get(approvalApplication.getId());
if (oaApprovalApplicationAdvertisement!=null){
+ approvalTodoVO.setTitle(oaApprovalApplicationAdvertisement.getTitle());
approvalTodoVO.setContent(oaApprovalApplicationAdvertisement.getContent());
approvalTodoVO.setAmount(oaApprovalApplicationAdvertisement.getTotalAmount());
}
@@ -285,9 +300,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();
@@ -295,13 +310,15 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
ContractDetailVO res = new ContractDetailVO();
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.CONTRACT.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -317,9 +334,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();
@@ -327,13 +344,15 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
PaymentDetailVO res = new PaymentDetailVO();
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.PAYMENT.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -351,9 +370,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();
@@ -362,14 +381,15 @@
.list();
LeaveDetailVO res = new LeaveDetailVO();
-
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.LEAVE.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -387,25 +407,30 @@
}
@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();
- OaApprovalApplicationAttendance leaveApplication = approvalApplicationAttendanceService.getById(approvalApplicationAttendance.getLeaveApprovalApplicationId());
+ OaApprovalApplications leaveApplication = approvalApplicationsService.getById(approvalApplicationAttendance.getLeaveApprovalApplicationId());
+
+ OaApprovalApplicationAttendance leaveApplicationAttendance = approvalApplicationAttendanceService.lambdaQuery()
+ .eq(OaApprovalApplicationAttendance::getApprovalApplicationId, leaveApplication.getId())
+ .last("limit 1").one();
List<OaApprovalFlowAudit> approvalFlowAudits = approvalFlowAuditService.lambdaQuery().eq(OaApprovalFlowAudit::getApprovalApplicationId, approvalApplications.getId())
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
LeaveDestroyDetailVO res = new LeaveDestroyDetailVO();
-
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.LEAVE_DESTROY.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -418,17 +443,17 @@
res.setAttachmentUrl(approvalApplications.getAttachmentUrl());
res.setStartTime(approvalApplicationAttendance.getStartTime());
res.setEndTime(approvalApplicationAttendance.getEndTime());
- res.setStartTimeLeave(leaveApplication.getStartTime());
- res.setEndTimeLeave(leaveApplication.getEndTime());
- res.setDurationLeave(leaveApplication.getDuration());
+ res.setStartTimeLeave(leaveApplicationAttendance.getStartTime());
+ res.setEndTimeLeave(leaveApplicationAttendance.getEndTime());
+ res.setDurationLeave(leaveApplicationAttendance.getDuration());
res.setDuration(approvalApplicationAttendance.getDuration());
return R.ok(res);
}
@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();
@@ -436,13 +461,15 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
OutDetailVO res = new OutDetailVO();
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.OUT.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -456,13 +483,14 @@
res.setStartTime(approvalApplicationAttendance.getStartTime());
res.setEndTime(approvalApplicationAttendance.getEndTime());
res.setDuration(approvalApplicationAttendance.getDuration());
+ res.setAddress(approvalApplicationAttendance.getAddress());
return R.ok(res);
}
@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();
@@ -471,14 +499,15 @@
.list();
BusinessTripDetailVO res = new BusinessTripDetailVO();
-
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.BUSINESS_TRIP.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -499,17 +528,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();
@@ -517,13 +545,15 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
PurchaseDetailVO res = new PurchaseDetailVO();
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.PURCHASE.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -546,17 +576,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();
@@ -564,7 +593,8 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
GrabDetailVO res = new GrabDetailVO();
-
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.GRAB.getCode())
@@ -572,7 +602,7 @@
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -594,17 +624,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();
@@ -612,6 +641,8 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
StorageDetailVO res = new StorageDetailVO();
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.IN_STOCK.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
@@ -619,6 +650,7 @@
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
List<ApprovalFlowNodeListVO> flowNodeList = getFlowNodeList(sysUser, approvalFlowAudits,approvalFlowNodes);
+ res.setAssetTypeName(assetTypeService.getById(approvalApplicationStorage.getAssetTypeId()).getTypeName());
res.setApprovalFlowNodeListVOS(flowNodeList);
res.setApprovalApplicationId(approvalApplications.getId());
res.setAttachmentUrl(approvalApplications.getAttachmentUrl());
@@ -631,17 +663,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();
@@ -649,14 +680,15 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
BorrowDetailVO res = new BorrowDetailVO();
-
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
- .eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.BURROW.getCode())
+ .eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.BORROW.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -674,17 +706,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();
@@ -693,13 +724,15 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
BackDetailVO res = new BackDetailVO();
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.RETURN.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplicationsBack.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -719,17 +752,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();
@@ -737,14 +770,15 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
DisposeDetailVO res = new DisposeDetailVO();
-
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.ASSET_DISPOSE.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -770,17 +804,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();
@@ -788,13 +821,15 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
ChangeDetailVO res = new ChangeDetailVO();
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.ASSET_CHANGE.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -822,9 +857,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();
@@ -835,7 +870,8 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
ReimbursementDetailVO res = new ReimbursementDetailVO();
-
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.REIMBURSEMENT.getCode())
@@ -843,7 +879,7 @@
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -861,9 +897,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();
@@ -871,13 +907,15 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
MoneyDetailVO res = new MoneyDetailVO();
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.MONEY.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -899,9 +937,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();
@@ -910,15 +948,15 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
ContactDetailVO res = new ContactDetailVO();
-
-
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.CONTACT.getCode())
.orderByAsc(OaApprovalFlowNode::getSortOrder)
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -934,9 +972,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();
@@ -945,7 +984,8 @@
.orderByAsc(OaApprovalFlowAudit::getSortOrder)
.list();
AdvertisementDetailVO res = new AdvertisementDetailVO();
-
+ OaApprovalFlowNode oaApprovalFlowNode = approvalFlowNodeService.getById(approvalApplications.getCurrentFlowNodeId());
+ res.setSignFlag(oaApprovalFlowNode.getSignFlag());
List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery()
.eq(OaApprovalFlowNode::getApprovalId, ApprovalTypeEnum.ADVERTISEMENT.getCode())
@@ -953,7 +993,7 @@
.eq(OaApprovalFlowNode::getStatus, 1).list();
SysUser sysUser = sysUserService.selectUserById(approvalApplications.getApplicantUserId().longValue());
if (sysUser!=null){
- res.setUserName(sysUser.getUserName());
+ res.setUserName(sysUser.getNickName());
TDept dept = deptService.getById(sysUser.getDeptId());
if (dept!=null){
res.setDeptName(dept.getDeptName());
@@ -980,7 +1020,7 @@
ApprovalFlowNodeListVO approvalFlowNodeListVO = new ApprovalFlowNodeListVO();
approvalFlowNodeListVO.setFlowName("发起");
if (sysUser!=null){
- approvalFlowNodeListVO.setUserName(sysUser.getUserName());
+ approvalFlowNodeListVO.setUserName(sysUser.getNickName());
}
approvalFlowNodeListVOS.add(approvalFlowNodeListVO);
for (OaApprovalFlowNode approvalFlowNode : approvalFlowNodes) {
--
Gitblit v1.7.1