From db0054d19f04a16db90af2dc77a8db8c9d743d0e Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 19 六月 2025 20:32:17 +0800
Subject: [PATCH] 维修调度-工单模块的设备信息关联处理

---
 src/main/java/com/whyc/pojo/web_site/WorkflowMain.java    |   12 ++----------
 src/main/java/com/whyc/service/WorkflowDeviceService.java |   19 +++++++++++++++++++
 src/main/java/com/whyc/mapper/WorkflowDeviceMapper.java   |    6 ++++++
 src/main/java/com/whyc/service/WorkflowMainService.java   |   13 +++++++++++++
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/whyc/mapper/WorkflowDeviceMapper.java b/src/main/java/com/whyc/mapper/WorkflowDeviceMapper.java
new file mode 100644
index 0000000..7241047
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/WorkflowDeviceMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.web_site.WorkflowDevice;
+
+public interface WorkflowDeviceMapper extends CustomMapper<WorkflowDevice>{
+}
diff --git a/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java b/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
index 6abed7c..3c562bb 100644
--- a/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
+++ b/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
@@ -104,15 +104,7 @@
 
     @TableField(exist = false)
     private List<WorkflowLink> linkList;
-    public WorkflowMain(Integer id, Integer status, String endReason, Date endTime) {
-        this.id = id;
-        this.status = status;
-        this.endReason = endReason;
-        this.endTime = endTime;
-    }
 
-    public WorkflowMain() {
-
-    }
-
+    @TableField(exist = false)
+    private List<WorkflowDevice> deviceList;
 }
diff --git a/src/main/java/com/whyc/service/WorkflowDeviceService.java b/src/main/java/com/whyc/service/WorkflowDeviceService.java
new file mode 100644
index 0000000..8bc2317
--- /dev/null
+++ b/src/main/java/com/whyc/service/WorkflowDeviceService.java
@@ -0,0 +1,19 @@
+package com.whyc.service;
+
+import com.whyc.mapper.WorkflowDeviceMapper;
+import com.whyc.pojo.web_site.WorkflowDevice;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WorkflowDeviceService {
+
+    @Autowired
+    private WorkflowDeviceMapper mapper;
+
+    public void addBatch(List<WorkflowDevice> deviceList) {
+        mapper.insertBatchSomeColumn(deviceList);
+    }
+}
diff --git a/src/main/java/com/whyc/service/WorkflowMainService.java b/src/main/java/com/whyc/service/WorkflowMainService.java
index 179a95a..db7566a 100644
--- a/src/main/java/com/whyc/service/WorkflowMainService.java
+++ b/src/main/java/com/whyc/service/WorkflowMainService.java
@@ -11,6 +11,7 @@
 import com.whyc.dto.Response;
 import com.whyc.mapper.WorkflowMainMapper;
 import com.whyc.pojo.db_user.User;
+import com.whyc.pojo.web_site.WorkflowDevice;
 import com.whyc.pojo.web_site.WorkflowLink;
 import com.whyc.pojo.web_site.WorkflowMain;
 import com.whyc.util.ActionUtil;
@@ -34,6 +35,9 @@
 
     @Autowired(required = false)
     private WorkflowLinkService linkService;
+
+    @Autowired
+    private WorkflowDeviceService deviceService;
 
 
     /**
@@ -235,6 +239,8 @@
     /**
      * 閫氱敤鎻愪氦鏂规硶,鎻愪氦缁欒鑹�-瑙掕壊灞�
      * 濡傛灉related_id涓嶄负绌�,鍒欓渶瑕佺壒娈婂鐞�. 璇佹槑浼氬奖鍝嶅埌鍏宠仈鍗曟嵁
+     *
+     * 娑夊強鍒版柊鐨勯棶棰橀渶瑕佽В鍐�,鐜板満鏁呴殰鍚�,璁惧缁翠慨鐢宠 鎴� 鎶ュ簾鐢宠 鏄涓�,骞跺瓨鍏ュ伐鍗曡澶囪〃涓�. 骞朵笉鍙槸鍗曠函鐨勬暟閲�. TODO ?鑷姩鍖栧鐞嗘�庝箞鏇存柊
      */
 
     @Transactional
@@ -271,6 +277,13 @@
             main.setQuantityUnprocessed(main.getQuantity());
         }
         add(main);
+        //涓昏〃鍏宠仈鐨勭墿鏂欐彃鍏�
+        List<WorkflowDevice> deviceList = main.getDeviceList();
+        for (WorkflowDevice device : deviceList) {
+            device.setMainId(main.getId());
+        }
+        deviceService.addBatch(deviceList);
+
         //鍐呭瓨涓幓闄ゅ凡鎻掑叆鏁版嵁搴撶殑鍗曞彿
         ServletContext application = ActionUtil.getApplication();
         List<String> orderIdList = (List<String>) application.getAttribute("orderIdList");

--
Gitblit v1.9.1