From de124e1fbc929478170e31a34e95f7d43db77a3f Mon Sep 17 00:00:00 2001
From: lzttt <1803073139@qq.com>
Date: Thu, 10 Oct 2024 09:59:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BA=BA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=8F=8A=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/RepairWorkerMapper.java       | 11 ++++++++-
 .../base/service/RepairRecordsService.java    |  2 ++
 .../impl/RepairRecordsServiceImpl.java        |  2 +-
 .../service/impl/RepairWorkerServiceImpl.java | 24 ++++++++++++-------
 .../mapper/base/RepairWorkerMapper.xml        | 13 +++++++++-
 5 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairWorkerMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairWorkerMapper.java
index 9ab4ea7a..980d8c6b 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairWorkerMapper.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairWorkerMapper.java
@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 维修工人 Mapper
  *
@@ -26,4 +28,11 @@ public interface RepairWorkerMapper extends BaseMapper<RepairWorker> {
      **/
     IPage<RepairWorkerRespVO> queryListPage(@Param("entity") RepairWorkerPageReqVO entity, Page<RepairWorkerRespVO> page);
 
-}
\ No newline at end of file
+    /**
+     * 获取所有维修工人的id
+     * @return List<Long> 维修工人id列表
+     * @author lzt
+     * @date 2024年10月10日
+     **/
+    List<Long> getAllWorkerIds();
+}
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairRecordsService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairRecordsService.java
index 5eeee7e5..3f308cbe 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairRecordsService.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairRecordsService.java
@@ -57,4 +57,6 @@ public interface RepairRecordsService extends IService<RepairRecords> {
      */
     List<RepairRecordsRespVO> queryAllRepairRecords(RepairRecordsPageReqVO pageReqVO);
 
+
+
 }
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java
index 967b0b36..99a13819 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java
@@ -62,7 +62,7 @@ public class RepairRecordsServiceImpl extends ServiceImpl<RepairRecordsMapper, R
      * @apiNote lzt
      * @param pageReqVO 查询条件
      * @return queryAllRepairRecords 所有维修记录
-     * @date
+     * @date 2024年10月9日
      */
     @Override
     public List<RepairRecordsRespVO> queryAllRepairRecords(RepairRecordsPageReqVO pageReqVO) {
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java
index 595a1b3f..26ae84be 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java
@@ -36,20 +36,28 @@ public class RepairWorkerServiceImpl extends ServiceImpl<RepairWorkerMapper, Rep
      * 批量创建维修工人
      *
      * @param userList 选中用户集合
-     * @author PQZ
-     * @date 18:33 2024/10/9
+     * @author lzt
+     * @date 2024年10月10日
      **/
     @Override
     public void saveWorkers(List<UserDTO> userList) {
         if (CollectionUtil.isNotEmpty(userList)){
+            //获取已有的维修工人ID列表
+            List<Long> existingWorkerIds = workerMapper.getAllWorkerIds();
+
             List<RepairWorker> saveList = new ArrayList<>();
             userList.forEach(item -> {
-                RepairWorker worker = new RepairWorker();
-                worker.setUserId(item.getId());
-                worker.setUserName(item.getNickname());
-                saveList.add(worker);
+                if (!existingWorkerIds.contains(item.getId())) {
+                    RepairWorker worker = new RepairWorker();
+                    worker.setUserId(item.getId());
+                    worker.setUserName(item.getNickname());
+                    saveList.add(worker);
+                }
             });
-            saveBatch(saveList);
+
+            if (!saveList.isEmpty()) {
+                saveBatch(saveList);
+            }
         }
     }
 
@@ -84,4 +92,4 @@ public class RepairWorkerServiceImpl extends ServiceImpl<RepairWorkerMapper, Rep
         return workerMapper.queryListPage(pageReqVO,page);
     }
 
-}
\ No newline at end of file
+}
diff --git a/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml b/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml
index 4458dbfd..f68be376 100644
--- a/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml
@@ -27,4 +27,15 @@
         </where>
 
     </select>
-</mapper>
\ No newline at end of file
+
+    <select id="getAllWorkerIds" resultType="java.lang.Long">
+        SELECT
+            main.user_id
+        FROM
+            dl_repair_worker main
+        WHERE
+            main.deleted = 0
+    </select>
+
+
+</mapper>