From 84b7d5223a5f5229866a7d5686d198cca4251453 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 九月 2025 15:23:25 +0800
Subject: [PATCH] 代码提交，查询部门下级递归
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java | 127 ++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 36 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 19da0e4..af49e9e 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
@@ -73,6 +73,7 @@
private OaApprovalApplicationReimbursementItemService approvalApplicationReimbursementItemService;
@Resource
private OaApprovalFlowNodeService approvalFlowNodeService;
+
@Resource
private OaApprovalApplicationAssetService approvalApplicationAssetService;
@Resource
@@ -93,7 +94,9 @@
private OaApprovalFlowService approvalFlowService;
+ public static void main(String[] args) {
+ }
@ApiOperation("待办事项列表")
@PostMapping("/pageList")
public R<PageInfo<ApprovalTodoVO>> pageList(@RequestBody ApprovalTodoListQuery query) {
@@ -151,6 +154,7 @@
List<OaApprovalApplications> approvalApplications = approvalApplicationsService.lambdaQuery().in(OaApprovalApplications::getId, applicationIds).list();
for (OaApprovalApplications approvalApplication : approvalApplications) {
ApprovalTodoVO approvalTodoVO = new ApprovalTodoVO();
+ approvalTodoVO.setApplicationReason(approvalApplication.getApplicationReason());
approvalTodoVO.setApprovalCategory(approvalMap.get(approvalApplication.getApprovalId()).getApprovalCategory());
switch (approvalTodoVO.getApprovalCategory()){
case 1:
@@ -168,7 +172,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,17 +186,25 @@
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) {
@@ -212,24 +224,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){
@@ -240,12 +260,14 @@
case 12:
OaApprovalApplicationReimbursement oaApprovalApplicationReimbursement = approvalApplicationReimbursementMap.get(approvalApplication.getId());
if (oaApprovalApplicationReimbursement!=null){
+ approvalTodoVO.setType(oaApprovalApplicationReimbursement.getType());
approvalTodoVO.setAmount(oaApprovalApplicationReimbursement.getReimbursementAmount());
}
break;
case 13:
OaApprovalApplicationMoney oaApprovalApplicationMoney = oaApprovalApplicationMoneyMap.get(approvalApplication.getId());
if (oaApprovalApplicationMoney!=null){
+ approvalTodoVO.setProjectName(oaApprovalApplicationMoney.getProjectName());
approvalTodoVO.setAmount(oaApprovalApplicationMoney.getApplyAmount());
approvalTodoVO.setDescription(oaApprovalApplicationMoney.getDescription());
@@ -254,6 +276,8 @@
case 15:
OaApprovalApplicationPayment oaApprovalApplicationPayment = approvalApplicationPaymentMap.get(approvalApplication.getId());
if (oaApprovalApplicationPayment!=null){
+ // todo 当前阶段没有项目id 后续完善
+ approvalTodoVO.setProjectName("项目名称");
approvalTodoVO.setAmount(oaApprovalApplicationPayment.getApplyAmount());
approvalTodoVO.setDescription(approvalApplication.getApplicationReason());
@@ -262,6 +286,7 @@
case 17:
OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = approvalApplicationAdvertisementMap.get(approvalApplication.getId());
if (oaApprovalApplicationAdvertisement!=null){
+ approvalTodoVO.setTitle(oaApprovalApplicationAdvertisement.getTitle());
approvalTodoVO.setContent(oaApprovalApplicationAdvertisement.getContent());
approvalTodoVO.setAmount(oaApprovalApplicationAdvertisement.getTotalAmount());
}
@@ -287,13 +312,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());
@@ -319,19 +346,22 @@
.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());
}
}
List<ApprovalFlowNodeListVO> flowNodeList = getFlowNodeList(sysUser, approvalFlowAudits,approvalFlowNodes);
+ res.setContractAmount(approvalApplicationPayment.getContractAmount());
res.setApprovalFlowNodeListVOS(flowNodeList);
res.setApprovalApplicationId(approvalApplications.getId());
res.setApplicationReason(approvalApplications.getApplicationReason());
@@ -354,14 +384,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());
@@ -385,19 +416,24 @@
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());
@@ -410,9 +446,9 @@
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);
}
@@ -428,13 +464,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());
@@ -448,6 +486,7 @@
res.setStartTime(approvalApplicationAttendance.getStartTime());
res.setEndTime(approvalApplicationAttendance.getEndTime());
res.setDuration(approvalApplicationAttendance.getDuration());
+ res.setAddress(approvalApplicationAttendance.getAddress());
return R.ok(res);
}
@ApiOperation(value = "出差审批详情")
@@ -463,14 +502,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());
@@ -508,13 +548,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());
@@ -554,7 +596,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())
@@ -562,7 +605,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());
@@ -592,7 +635,6 @@
@ApiOperation(value = "资产入库审批详情")
@GetMapping(value = "/detailInStock")
public R<StorageDetailVO> detailInStock(@ApiParam("申请单d")Integer id) {
-
OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
OaApprovalApplicationStorage approvalApplicationStorage = approvalApplicationStorageService.lambdaQuery()
.eq(OaApprovalApplicationStorage::getApprovalApplicationId, approvalApplications.getId())
@@ -601,6 +643,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)
@@ -608,6 +652,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());
@@ -637,14 +682,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.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());
@@ -680,13 +726,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());
@@ -724,14 +772,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());
@@ -774,13 +823,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());
@@ -821,7 +872,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())
@@ -829,7 +881,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());
@@ -857,13 +909,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());
@@ -888,23 +942,23 @@
public R<ContactDetailVO> detailContact(@ApiParam("申请单d")Integer id) {
OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
- OaApprovalApplicationMoney approvalApplicationMoney = approvalApplicationMoneyService.lambdaQuery()
- .eq(OaApprovalApplicationMoney::getApprovalApplicationId, approvalApplications.getId())
+ OaApprovalApplicationContact approvalApplicationContact = approvalApplicationContactService.lambdaQuery()
+ .eq(OaApprovalApplicationContact::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
List<OaApprovalFlowAudit> approvalFlowAudits = approvalFlowAuditService.lambdaQuery().eq(OaApprovalFlowAudit::getApprovalApplicationId, approvalApplications.getId())
.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());
@@ -915,7 +969,7 @@
res.setApprovalApplicationId(approvalApplications.getId());
res.setApplicationReason(approvalApplications.getApplicationReason());
res.setAttachmentUrl(approvalApplications.getAttachmentUrl());
- res.setDescription(approvalApplicationMoney.getDescription());
+ res.setDescription(approvalApplicationContact.getDescription());
return R.ok(res);
}
@ApiOperation(value = "广告制作审批详情")
@@ -932,7 +986,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())
@@ -940,7 +995,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());
@@ -967,7 +1022,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