From 5b13db7e2c95385d69b8bdb449560bbbfe359146 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 23 十月 2025 17:16:47 +0800
Subject: [PATCH] 广告物料零星结算接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 16 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 8eb7a3d..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;
}
@@ -332,8 +330,25 @@
res.setContractUrl(approvalApplicationContract.getContractUrl());
res.setApplicationReason(approvalApplications.getApplicationReason());
res.setAttachmentUrl(approvalApplications.getAttachmentUrl());
+ res.setIsAudit(extracted(id, approvalApplications));
return R.ok(res);
}
+
+ private Boolean extracted(Integer id, OaApprovalApplications approvalApplications) {
+ Integer currentFlowNodeId = approvalApplications.getCurrentFlowNodeId();
+ Long userId = tokenService.getLoginUser().getUserId();
+ OaApprovalTodo approvalTodo = approvalTodoService.lambdaQuery().eq(OaApprovalTodo::getApplicationId, id)
+ .eq(OaApprovalTodo::getFlowNodeId, currentFlowNodeId)
+ .eq(OaApprovalTodo::getUserId, userId)
+ .eq(OaApprovalTodo::getStatus, 0).last("limit 1")
+ .one();
+ if (approvalTodo!=null){
+ return true;
+ }else{
+ return false;
+ }
+ }
+
@ApiOperation(value = "进度款支付审批详情")
@GetMapping(value = "/detailPayment")
public R<PaymentDetailVO> detailPayment(@ApiParam("申请单d")Integer id) {
@@ -369,6 +384,8 @@
// todo 三阶段设计项目表之后完善
res.setProjectName("本期还未涉及到项目");
res.setApplyAmount(approvalApplicationPayment.getApplyAmount());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "请假申请审批详情")
@@ -406,6 +423,8 @@
res.setStartTime(approvalApplicationAttendance.getStartTime());
res.setEndTime(approvalApplicationAttendance.getEndTime());
res.setDuration(approvalApplicationAttendance.getDuration());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "销假审批详情")
@@ -450,6 +469,7 @@
res.setEndTimeLeave(leaveApplicationAttendance.getEndTime());
res.setDurationLeave(leaveApplicationAttendance.getDuration());
res.setDuration(approvalApplicationAttendance.getDuration());
+ res.setIsAudit(extracted(id, approvalApplications));
return R.ok(res);
}
@ApiOperation(value = "外出申请审批详情")
@@ -487,6 +507,8 @@
res.setEndTime(approvalApplicationAttendance.getEndTime());
res.setDuration(approvalApplicationAttendance.getDuration());
res.setAddress(approvalApplicationAttendance.getAddress());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "出差审批详情")
@@ -526,6 +548,8 @@
res.setDuration(approvalApplicationAttendance.getDuration());
res.setAddress(approvalApplicationAttendance.getAddress());
res.setProjectName(approvalApplicationAttendance.getProjectName());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "采购审批详情-采购物品清单")
@@ -575,6 +599,8 @@
if (assetType!=null){
res.setAssetTypeName(assetType.getTypeName());
}
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "物品领用-领用资产列表")
@@ -624,6 +650,8 @@
if (assetType!=null){
res.setAssetTypeName(assetType.getTypeName());
}
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "资产入库-入库资产列表")
@@ -663,6 +691,8 @@
res.setStorageType(approvalApplicationStorage.getStorageType());
res.setStorageTime(approvalApplicationStorage.getStorageTime());
res.setRemarks(approvalApplicationStorage.getTitle());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "物品借用-借用资产列表")
@@ -707,6 +737,8 @@
res.setAttachmentUrl(approvalApplications.getAttachmentUrl());
res.setOperateTime(approvalApplicationAsset.getOperateTime());
res.setExpectReturnDate(approvalApplicationAsset.getExpectReturnDate());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "物品借用归还-归还资产列表")
@@ -754,6 +786,8 @@
res.setExpectReturnDate(approvalApplicationAssetBack.getExpectReturnDate());
res.setTitle(approvalApplicationAssetBack.getTitle());
res.setApplicationCode(approvalApplications.getApplicationCode());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "资产处置-处置资产列表")
@@ -806,6 +840,8 @@
}
res.setDisposeType(approvalApplicationDispose.getDisposeType());
res.setDisposeTotalAmount(approvalApplicationDispose.getDisposeTotalAmount());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@@ -862,6 +898,8 @@
// todo 三阶段完善 仓库名称
res.setWarehouseName("三阶段完善");
res.setAddress(approvalApplicationChange.getAddress());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "报销申请审批详情")
@@ -902,6 +940,8 @@
res.setType(approvalApplicationReimbursement.getType());
res.setApprovalApplicationReimbursementItems(oaApprovalApplicationReimbursementItems);
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "款项申请审批详情")
@@ -942,6 +982,8 @@
res.setPayee(approvalApplicationMoney.getPayee());
res.setPayeeContact(approvalApplicationMoney.getPayeeContact());
res.setPayeeAccount(approvalApplicationMoney.getPayeeAccount());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "内部联系单审批详情")
@@ -977,16 +1019,16 @@
res.setApplicationReason(approvalApplications.getApplicationReason());
res.setAttachmentUrl(approvalApplications.getAttachmentUrl());
res.setDescription(approvalApplicationContact.getDescription());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
@ApiOperation(value = "广告制作审批详情")
@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())
@@ -1019,10 +1061,14 @@
res.setNumber(applicationAdvertisement.getNumber());
res.setTotalAmount(applicationAdvertisement.getTotalAmount());
res.setSpec(applicationAdvertisement.getSpec());
+ res.setIsAudit(extracted(id, approvalApplications));
+
return R.ok(res);
}
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));
@@ -1038,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