From 3728fa293e1faf4bf4f9bf41105b84ddb43dc82e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 02 十一月 2026 16:53:02 +0800
Subject: [PATCH] feat(order-rates): 新增筛选条件下全部订单费用汇总接口
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
index 1b9e75e..ba2edc1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
@@ -22,7 +22,7 @@
Map<String,Object> pageInsReport(Page page, ReportPageDto reportPageDto);
- void wordToPdf(String path,String sealUrl, boolean isRawMater);
+ void wordToPdf(String path, String maSealUrl, String seamSealUrl, boolean isRawMater);
int inReport(String url, Integer id);
@@ -35,9 +35,13 @@
int examineReport(Integer id, Integer isExamine, String examineTell, Integer userId);
//鎵瑰噯
- int ratifyReport(Integer id, Integer isRatify, String ratifyTell);
+ int ratifyReport(Integer id, Integer isRatify, String ratifyTell, String sealIds,
+ Integer maSealId, Integer reportSealId, Integer seamSealId);
int wordInsertUrl(Map<String, Object> map, String url);
+
+ /** 鍦ㄧ嚎缂栬緫淇濆瓨鍚庨噸鏂扮敓鎴愬搴旀姤鍛婄殑涓存椂 PDF銆� */
+ String prepareEditedReportPreview(String absoluteDocxPath);
String downAll(String ids);
@@ -45,6 +49,9 @@
* 鍗曚唤鎶ュ憡 Word 涓嬭浇锛宺eportType锛�0妫�娴嬫姤鍛婏紝1妫�楠屾姤鍛婏紱createOrderUser 鐢ㄤ簬澶嶇敤鎶ュ憡缂栧埗鐨勬暟鎹寖鍥淬��
*/
void download(Integer id, Integer reportType, Integer createOrderUser, HttpServletResponse response);
+
+ /** 涓� Word 涓嬭浇鐩稿悓鐨勬暟鎹寖鍥达紝浣跨敤鍥哄畾鍒嗛〉鐨� PDF 淇濈暀鎶ュ憡鐗堝紡銆� */
+ void preview(Integer id, Integer reportType, Integer createOrderUser, HttpServletResponse response);
int upAll(MultipartFile file) throws IOException;
@@ -59,11 +66,10 @@
Long getUnqualifiedCount(InsOrder insOrder);
/**
- * 閫�鍥炲埌妫�楠屼换鍔�
- * @param id
- * @return
+ * 閫�鍥炴姤鍛婃祦绋嬨��
+ * target锛欼NSPECTION_TASK 閫�鍥炴楠屼换鍔★紱REPORT_REVIEW 閫�鍥炴姤鍛婂鏍搞��
*/
- boolean sendBackTask(Integer id);
+ boolean sendBackTask(Integer id, String target, String reason);
/**
* 鎶ュ憡瀵煎嚭
--
Gitblit v1.9.3