From 7c2c6a5e5b3d9f96aef3c67573aa62bbd9a3aa7f Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 11 九月 2025 10:48:18 +0800
Subject: [PATCH] 修改产品类型，单位工程条偶见查询问题
---
src/main/java/com/webmanage/service/OrderInfoService.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index a7a367f..1c9c1aa 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -38,7 +38,12 @@
/**
* 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛�
*/
- PageResult<OrderInfo> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
+ PageResult<OrderDetailVO> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
+
+ /**
+ * 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛紙鏀寔浜у搧鏉′欢锛�
+ */
+ PageResult<OrderDetailVO> getPendingApprovalOrderPageWithProductConditions(OrderQueryDTO queryDTO);
/**
* 鑾峰彇璁㈠崟璇︽儏
@@ -55,13 +60,13 @@
*/
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);
/**
* 娣诲姞璁㈠崟璇勪环
*/
- boolean addOrderEvaluation(String orderId, Long evaluatorId, String evaluatorName,
+ boolean addOrderEvaluation(String orderId, String evaluatorId, String evaluatorName,
String evaluatorType, String content, Integer rating,
Integer serviceRating, Integer qualityRating, Integer deliveryRating,
Boolean isAnonymous);
@@ -140,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