From 42131eb034e559dc361fe75d653e4d904aa6a316 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 23 十月 2025 17:51:32 +0800
Subject: [PATCH] 保修详情增加资产类型名称字段
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 0b4f34c..e3daf29 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
@@ -56,7 +56,7 @@
@Resource
private OaApprovalApplicationsService approvalApplicationsService;
@Resource
- private OaApprovalApplicationAdvertisementService approvalApplicationAdvertisementService;
+ private OaApprovalApplicationAdService approvalApplicationAdvertisementService;
@Resource
private OaApprovalApplicationContactService approvalApplicationContactService;
@Resource
@@ -94,9 +94,7 @@
private OaApprovalFlowService approvalFlowService;
- public static void main(String[] args) {
- }
@ApiOperation("待办事项列表")
@PostMapping("/pageList")
public R<PageInfo<ApprovalTodoVO>> pageList(@RequestBody ApprovalTodoListQuery query) {
@@ -140,9 +138,9 @@
Map<Integer, List<OaApprovalApplicationAssetItem>> approvalApplicationAssetItemMap = approvalApplicationAssetItemService.lambdaQuery()
.in(OaApprovalApplicationAssetItem::getApprovalApplicationId, applicationIds).list()
.stream().collect(Collectors.groupingBy(OaApprovalApplicationAssetItem::getApprovalApplicationId));
- Map<Integer, OaApprovalApplicationAdvertisement> approvalApplicationAdvertisementMap = approvalApplicationAdvertisementService.lambdaQuery()
- .in(OaApprovalApplicationAdvertisement::getApprovalApplicationId, applicationIds).list()
- .stream().collect(Collectors.toMap(OaApprovalApplicationAdvertisement::getApprovalApplicationId, e -> e));
+ Map<Integer, OaApprovalApplicationAd> approvalApplicationAdvertisementMap = approvalApplicationAdvertisementService.lambdaQuery()
+ .in(OaApprovalApplicationAd::getApprovalApplicationId, applicationIds).list()
+ .stream().collect(Collectors.toMap(OaApprovalApplicationAd::getApprovalApplicationId, e -> e));
Map<Integer, OaApprovalApplicationAttendance> applicationAttendanceMap = approvalApplicationAttendanceService.lambdaQuery()
.in(OaApprovalApplicationAttendance::getApprovalApplicationId, applicationIds).list()
.stream().collect(Collectors.toMap(OaApprovalApplicationAttendance::getApprovalApplicationId, e -> e));
@@ -284,11 +282,11 @@
}
break;
case 17:
- OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = approvalApplicationAdvertisementMap.get(approvalApplication.getId());
- if (oaApprovalApplicationAdvertisement!=null){
- approvalTodoVO.setTitle(oaApprovalApplicationAdvertisement.getTitle());
- approvalTodoVO.setContent(oaApprovalApplicationAdvertisement.getContent());
- approvalTodoVO.setAmount(oaApprovalApplicationAdvertisement.getTotalAmount());
+ OaApprovalApplicationAd oaApprovalApplicationAd = approvalApplicationAdvertisementMap.get(approvalApplication.getId());
+ if (oaApprovalApplicationAd !=null){
+ approvalTodoVO.setTitle(oaApprovalApplicationAd.getTitle());
+ approvalTodoVO.setContent(oaApprovalApplicationAd.getContent());
+ approvalTodoVO.setAmount(oaApprovalApplicationAd.getTotalAmount());
}
break;
}
@@ -1029,8 +1027,8 @@
@GetMapping(value = "/detailAdvertisement")
public R<AdvertisementDetailVO> detailAdvertisement(@ApiParam("申请单d")Integer id) {
OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
- OaApprovalApplicationAdvertisement applicationAdvertisement = approvalApplicationAdvertisementService.lambdaQuery()
- .eq(OaApprovalApplicationAdvertisement::getApprovalApplicationId, approvalApplications.getId())
+ OaApprovalApplicationAd applicationAdvertisement = approvalApplicationAdvertisementService.lambdaQuery()
+ .eq(OaApprovalApplicationAd::getApprovalApplicationId, approvalApplications.getId())
.last("limit 1").one();
List<OaApprovalFlowAudit> approvalFlowAudits = approvalFlowAuditService.lambdaQuery().eq(OaApprovalFlowAudit::getApprovalApplicationId, approvalApplications.getId())
@@ -1069,6 +1067,8 @@
}
private List<ApprovalFlowNodeListVO> getFlowNodeList(SysUser sysUser, List<OaApprovalFlowAudit> approvalFlowAudits
,List<OaApprovalFlowNode> approvalFlowNodes) {
+ Map<Long, String> userMap = sysUserService.selectAllList().stream()
+ .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS = new ArrayList<>();
Map<Integer, OaApprovalFlowAudit> approvalFlowAuditMap = approvalFlowAudits.stream().collect(Collectors.toMap(OaApprovalFlowAudit::getFlowNodeId, e -> e));
@@ -1084,7 +1084,10 @@
OaApprovalFlowAudit approvalFlowAudit = approvalFlowAuditMap.get(approvalFlowNode.getId());
if (approvalFlowAudit!=null){
approvalFlowNodeVO.setFlowName(approvalFlowAudit.getFlowName());
- approvalFlowNodeVO.setUserName(approvalFlowAudit.getUserName());
+ String s = userMap.get(approvalFlowAudit.getUserId().longValue());
+ if (s!=null){
+ approvalFlowNodeVO.setUserName(s);
+ }
approvalFlowNodeVO.setSignPicUrl(approvalFlowAudit.getSignPicUrl());
approvalFlowNodeVO.setApprovalStatus(approvalFlowAudit.getApprovalStatus());
}else{
--
Gitblit v1.7.1