From e6a58a063354d6bedbfddd310c0a47cdff7f7b88 Mon Sep 17 00:00:00 2001
From: zjh <15615273395@163.com>
Date: Wed, 29 Apr 2026 14:52:11 +0800
Subject: [PATCH] =?UTF-8?q?TC=E6=95=B0=E6=8D=AE=E5=85=A8=E9=83=A8=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?(=E8=A1=A5=E5=85=85=E6=9C=BA=E5=9E=8B=E7=89=88=E6=9C=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TcDataQueryServiceImpl.java        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java
index c5755d0..7f810e7 100644
--- a/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java
@@ -99,7 +99,8 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
             String partsName = subsystemType.split("-")[1];
             //开始查找系统数据
             List<EngineParamDetailPojo> pojoList = bd.getBusinessDatabase()
-                    .eq("engine_model_id", engineModelID)
+                    .eq("engine_model_id", dataEntryEngineModelPojo.getId())
+                    .eq("major_version", dataEntryEngineModelPojo.getVersionNumber())
                     .eq("subsystem_name", subsystem)
                     .eq("parts_name", partsName)
                     .doQuery(EngineParamDetailPojo.class);
@@ -176,7 +177,8 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
         List<EngineParamDetailPojo> systemDataList = new ArrayList<>();
         for (Map.Entry<String, String> subsystemPartsPair : subsystemPartsPairs) {
             List<EngineParamDetailPojo> pojoList = bd.getBusinessDatabase()
-                    .eq("engine_model_id", engineModelID)
+                    .eq("engine_model_id", dataEntryEngineModelPojo.getId())
+                    .eq("major_version", dataEntryEngineModelPojo.getVersionNumber())
                     .eq("subsystem_name", subsystemPartsPair.getKey())
                     .eq("parts_name", subsystemPartsPair.getValue())
                     .doQuery(EngineParamDetailPojo.class);
@@ -237,8 +239,7 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
         try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build()) {
             setupResponse(response, "参数值导入模板" + (new Date()));
             ArrayList<EnginePartsCollectionPojo> enginePartsCollections = new ArrayList<>();
-            List<EnginePartsCollectionPojo> lbjmcs = bd.getBusinessDatabase()
-                    .doQuery(EnginePartsCollectionPojo.class);
+            List<EnginePartsCollectionPojo> lbjmcs = new ArrayList<>();
             for (EnginePartsCollectionPojo parameter : lbjmcs) {
                 EnginePartsCollectionPojo engineParamDetailExcel = new EnginePartsCollectionPojo();
                 engineParamDetailExcel.setZtj(parameter.getZtj());
@@ -264,8 +265,7 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
     public void excelExportB(HttpServletResponse response) {
         try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build()) {
             ArrayList<ClassificationAttributePojo> enginePartsCollections = new ArrayList<>();
-            List<ClassificationAttributePojo> lbjmcs = bd.getBusinessDatabase()
-                    .doQuery(ClassificationAttributePojo.class);
+            List<ClassificationAttributePojo> lbjmcs = new ArrayList<>();
             for (ClassificationAttributePojo parameter : lbjmcs) {
                 ClassificationAttributePojo engineParamDetailExcel = new ClassificationAttributePojo();
                 engineParamDetailExcel.setFieldvalue(parameter.getFieldvalue());
@@ -521,6 +521,7 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
 
         return bd.getBusinessDatabase()
                 .eq("engine_model_id", model.getId())
+                .eq("major_version", model.getVersionNumber())
                 .in("subsystem_name", subsystemSet)
                 .in("parts_name", partsNameSet)
                 .doQuery(EngineParamDetailPojo.class);