From 7f75b111c64641a21b8f3784fb9b4cc34e681b2d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 四月 2026 15:24:07 +0800
Subject: [PATCH] 检验任务:修复多芯产品生成报告中线芯颜色与检验值不对应问题
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java
index 8d7d884..0b58504 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java
@@ -16,7 +16,7 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.utils.DateImageUtil;
-import com.ruoyi.common.utils.IfsApiUtils;
+import com.ruoyi.common.utils.api.IfsApiUtils;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.IfsStockQueryDTO;
@@ -77,7 +77,6 @@
public Result getIfsStockReport(IfsStockQueryDTO ifsStockQueryDTO) {
JSONObject jresult = new JSONObject();
- jresult.put("total", 0);
jresult.put("count", 0);
jresult.put("data", new JSONArray());
JSONObject jsonObject = new JSONObject();
@@ -92,9 +91,6 @@
}
//鑾峰彇鎬绘暟閲�
int count = data.getIntValue("TOTAL_RECORD");
- //鑾峰彇椤垫暟
- int total = (int) Math.ceil((double) count / (double) ifsStockQueryDTO.getLimit());
- jresult.put("total", total);
jresult.put("count", count);
jresult.put("data", array);
}
@@ -476,6 +472,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
@@ -669,6 +666,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (IOException e) {
throw new RuntimeException(e);
}
--
Gitblit v1.9.3