From a065e80bfc4a9f16c7e32f2d1a55013955a40d3c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 20 六月 2025 15:05:17 +0800
Subject: [PATCH] 定时任务

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java
index a4db31b..58f1c6a 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java
@@ -513,6 +513,21 @@
                     paraThreadingTool.setConnectionAperture(ExcelUtils.getCellValueAsString(cell34));
                     Cell cell35 = row.getCell(35);//杩炴帴閿Ы
                     paraThreadingTool.setConnectingKeyway(ExcelUtils.getCellValueAsString(cell35));
+                    Cell cell36 = row.getCell(36);//闆嗗洟鍏徃缂栫爜
+                    paraThreadingTool.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell36));
+                    Cell cell37 = row.getCell(37);//闆嗗洟鍏徃鏍囪
+                    if (cell37 == null || cell37.getCellType() == CellType.BLANK) {
+                        //鏍囪涓虹┖锛屾嫾鎺�
+                        String sign = ExcelUtils.getCellValueAsString(cell7)//涓枃鍚嶇О
+                                + "-" + ExcelUtils.getCellValueAsString(cell11)//鍨嬪彿/鍥惧彿
+                                + "-" + ExcelUtils.getCellValueAsString(cell13)//铻虹汗浠e彿
+                                + "-" + ExcelUtils.getCellValueAsString(cell14);//铻鸿窛
+                        paraThreadingTool.setGroupCompanySign(sign);
+                    } else {
+                        paraThreadingTool.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell37));
+                    }
+                    Cell cell38 = row.getCell(38);//宸ュ叿绠�绉�
+                    paraThreadingTool.setShortCalled(ExcelUtils.getCellValueAsString(cell38));
 
                     paraThreadingToolImportList.add(paraThreadingTool);
                     successLines++;

--
Gitblit v1.9.3