From 1f075ff6fdf2cdd4d15532b408ceb3420bcc1004 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 23 四月 2025 00:00:20 +0800
Subject: [PATCH] 耐丝调整
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 17e3cea..62012d3 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -114,9 +114,11 @@
// todo: 浠呯湅鑷繁
//鑾峰彇褰撳墠浜烘墍灞炲疄楠屽id
String laboratory = null;
- Integer createOrderUser = null;
+
+ Integer createOrderUser = reportPageDto.getCreateOrderUser();
String queryStatus = reportPageDto.getQueryStatus();
reportPageDto.setQueryStatus(null);
+ reportPageDto.setCreateOrderUser(null);
map.put("body", insReportMapper.pageInsReport(page,
QueryWrappers.queryWrappers(reportPageDto),
@@ -260,7 +262,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
String message = "";
- message += "鎶ュ憡缂栧埗瀹℃牳閫�鍥為�氱煡";
+ message += "鑰愪笣绯荤粺鎶ュ憡缂栧埗瀹℃牳閫�鍥為�氱煡";
message += "\n瀹℃牳浜�: " + checkUserName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
message += "\n鏍峰搧鍚嶇О: " + insSample.getModel();
@@ -335,7 +337,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
String message = "";
- message += "鎶ュ憡缂栧埗鎵瑰噯閫氱煡";
+ message += "鑰愪笣绯荤粺鎶ュ憡缂栧埗鎵瑰噯閫氱煡";
message += "\n妫�楠屼汉: " + userName;
message += "\n澶嶆牳浜�: " + checkUserName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
@@ -397,7 +399,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
String message = "";
- message += "鎶ュ憡缂栧埗鎵瑰噯閫�鍥為�氱煡";
+ message += "鑰愪笣绯荤粺鎶ュ憡缂栧埗鎵瑰噯閫�鍥為�氱煡";
message += "\n鎵瑰噯浜�: " + ratifyUserName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
message += "\n鏍峰搧鍚嶇О: " + insSample.getModel();
--
Gitblit v1.9.3