From cda9decfde8c6b518639c5da506aa293c07f88ff Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 08 九月 2025 16:43:04 +0800
Subject: [PATCH] 修改附件上传用户id类型为string,及审核页面不显示带文件上传状态
---
src/main/java/com/webmanage/service/OrderInfoService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index 7481c6c..6d0b1d3 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -38,12 +38,12 @@
/**
* 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛�
*/
- PageResult<OrderInfo> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
+ PageResult<OrderDetailVO> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
/**
* 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛紙鏀寔浜у搧鏉′欢锛�
*/
- PageResult<OrderInfo> getPendingApprovalOrderPageWithProductConditions(OrderQueryDTO queryDTO);
+ PageResult<OrderDetailVO> getPendingApprovalOrderPageWithProductConditions(OrderQueryDTO queryDTO);
/**
* 鑾峰彇璁㈠崟璇︽儏
@@ -60,7 +60,7 @@
*/
Long uploadOrderAttachment(String orderId, String fileName, String originalName,
String fileType, Long fileSize, String fileUrl,
- String bucketName, String objectName, Long uploadUserId,
+ String bucketName, String objectName, String uploadUserId,
String uploadUserName, String attachmentType, String description);
/**
@@ -145,4 +145,13 @@
* @return 鏄惁鏇存柊鎴愬姛
*/
boolean updateWorkflowId(String orderId, String workflowId);
+
+ /**
+ * 鏍规嵁浜у搧ID鍒ゆ柇鏄惁瀛樺湪鏈彇娑堜笖宸插畬鎴愮殑鍏宠仈璁㈠崟
+ * @param productId 浜у搧ID
+ * @return 瀛樺湪杩斿洖true锛屼笉瀛樺湪杩斿洖false
+ */
+ boolean existsCompletedNotCancelledOrderByProductId(String productId);
+
+ boolean updateOrderIsEvaluate(String orderId);
}
--
Gitblit v1.8.0