From 47f5e9df7f2f4c00752bc87c057e70640de22caa Mon Sep 17 00:00:00 2001
From: "ys.git" <18439391935@163.com>
Date: Fri, 26 Dec 2025 11:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9+=E5=BE=85=E5=8A=9E=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC3.3(=E9=9B=B6?=
 =?UTF-8?q?=E9=83=A8=E4=BB=B6=E6=A0=91=E6=96=B0=E5=A2=9ETC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EngineParamDetailController.java  |  4 ++--
 .../service/EngineParamDetailService.java        |  2 +-
 .../impl/EngineParamDetailServiceImpl.java       | 16 +++++++++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java b/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java
index 00dbb0e..4a6b150 100644
--- a/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java
+++ b/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java
@@ -33,8 +33,8 @@ public class EngineParamDetailController {
 
     //参数列表查询
     @GetMapping("/selectParamList")
-    public Response selectParamList(@RequestParam(value = "modelID", required = false) String modelID) {
-        Map<String, List<String>> list = engineParamDetailService.selectParamList(modelID);
+    public Response selectParamList(@RequestParam(value = "modelID", required = false) String modelID,@RequestParam(value = "tcData", required = false) String tcData) {
+        Map<String, List<String>> list = engineParamDetailService.selectParamList(modelID,tcData);
         return Response.ok().data(list);
     }
     //参数列表查询
diff --git a/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java b/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java
index 09c5c4a..ef6773c 100644
--- a/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java
+++ b/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java
@@ -23,7 +23,7 @@ import java.util.Map;
 public interface EngineParamDetailService {
 
 
-    HashMap<String, List<String>> selectParamList(String  modelID);
+    HashMap<String, List<String>> selectParamList(String  modelID,String tcData);
 
     void excelImport(MultipartFile file,String modelId);
 
diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
index 80a0785..3c85ef8 100644
--- a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
@@ -78,8 +78,13 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
      * @return
      */
     @Override
-    public HashMap<String, List<String>> selectParamList(String modelID) {
-        List<Parameter> parameters = selectAllByNewVersion();
+    public HashMap<String, List<String>> selectParamList(String modelID, String tcData) {
+        List<Parameter> parameters = new ArrayList<>();
+        if (ObjectUtils.isNotEmpty(tcData) && "tc".equals(tcData)) {
+            parameters = selectAllAndTcByNewVersion();
+        } else {
+            parameters = selectAllByNewVersion();
+        }
 
         List<Template> templates =
                 sw.buildFromDatasource("xdap_app_223770822127386625")
@@ -175,7 +180,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
         HashMap<String, HashMap<String, List<String>>> map = new HashMap<>();
         DataEntryEngineModelPojo dataEntryEngineModelPojo = dataEntryEngineModelService.selectBymodelId(modelID);
         String s = dataEntryEngineModelPojo.getProductNumber();
-        HashMap<String, List<String>> stringListMap = selectParamList(modelID);
+        HashMap<String, List<String>> stringListMap = selectParamList(modelID,null);
         map.put(s, stringListMap);
         return map;
     }
@@ -464,7 +469,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
             //新增这个人的已办
             CompletedTaskPojo completedTaskPojo = new CompletedTaskPojo();
             BeanUtils.copyProperties(todoTaskPojo, completedTaskPojo);
-            completedTaskPojo.setId(UUID.randomUUID().toString().replaceAll("-",""));
+            completedTaskPojo.setId(UUID.randomUUID().toString().replaceAll("-", ""));
             completedTaskPojo.setDocumentNo(todoTaskPojo.getDocumentNo());
             completedTaskPojo.setCreationDate(Timestamp.valueOf(LocalDateTime.now()));
             completedTaskPojo.setIsDelete(0);
@@ -596,7 +601,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
             //新增这个人的已办
             CompletedTaskPojo completedTaskPojo = new CompletedTaskPojo();
             BeanUtils.copyProperties(todoTaskPojo, completedTaskPojo);
-            completedTaskPojo.setId(UUID.randomUUID().toString().replaceAll("-",""));
+            completedTaskPojo.setId(UUID.randomUUID().toString().replaceAll("-", ""));
             completedTaskPojo.setDocumentNo(todoTaskPojo.getDocumentNo());
             completedTaskPojo.setCreationDate(Timestamp.valueOf(LocalDateTime.now()));
             completedTaskPojo.setIsDelete(0);
@@ -616,6 +621,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
     public void batchInsertTodoTask(List<TodoTaskPojo> todoTaskPojos) {
         sw.buildFromDatasource("xdap_app_223770822127386625").doBatchInsert(todoTaskPojos);
     }
+
     @Transactional(rollbackFor = Exception.class) // 发生任何异常都回滚
     public void batchInsertInitiatedTask(List<InitiatedTaskPojo> taskPojos) {
         sw.buildFromDatasource("xdap_app_223770822127386625").doBatchInsert(taskPojos);