From 2493f0d8a6b9ab603be539338bee3a3a23285303 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 12 Nov 2024 16:01:57 +0800
Subject: [PATCH] =?UTF-8?q?11/12=20=E6=A7=BD=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=A7=A3=E9=99=A4=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/SysWorkplaceQueueController.java     |  9 +++++++
 .../dao/basic/SysWorkplaceQueueMapper.java    |  2 ++
 .../req/basic/SysWorkplaceQueueRequest.java   |  2 ++
 .../res/basic/SysWorkplaceQueueResponse.java  |  2 ++
 .../basic/SysWorkplaceQueueService.java       |  6 +++++
 .../mapper/basic/SysWorkplaceQueueMapper.xml  | 25 +++++++++++++++++--
 6 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
index ea87a5561..9ca4180d8 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
@@ -274,5 +274,14 @@ public class SysWorkplaceQueueController extends BaseController {
         return ResultVOUtils.success(byNameCode);
     }
 
+    /**
+     * 解除绑定
+     */
+    @PostMapping("/udiwms/sysWorkplaceQueue/removeProduct")
+    public BaseResponse removeProduct(@RequestBody SysWorkplaceQueueRequest request){
+        sysWorkplaceQueueService.removeProduct(request);
+        return ResultVOUtils.success();
+    }
+
 }
 
diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java
index 40c3e80a5..c1cd5d708 100644
--- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java
+++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java
@@ -22,4 +22,6 @@ public interface SysWorkplaceQueueMapper extends BaseMapper<SysWorkplaceQueue> {
     String selectMaxCode(String layerCode);
 
     SysWorkplaceQueue selectByLayerCode(String layerCode);
+
+    void updateByRelId(SysWorkplaceQueueRequest request);
 }
diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java
index d24faa428..acdb440ec 100644
--- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java
@@ -41,6 +41,8 @@ public class SysWorkplaceQueueRequest extends ListPageRequest {
 
     private List<String> layerCodes;
 
+    private String relId;
+
 
 
 
diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java
index ed331d0b3..4b706a57c 100644
--- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java
@@ -65,6 +65,8 @@ public class SysWorkplaceQueueResponse {
 
     private String productName;
     private String productSpec;
+    private String layerCode;
+
 
     /**
      * 格数
diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
index fa54f6b77..921c8cea4 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
@@ -189,4 +189,10 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
     public List<SysWorkplaceQueue> getListByLayerCode(String layerCode) {
         return list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getLayerCode,layerCode));
     }
+
+    public void removeProduct(SysWorkplaceQueueRequest request) {
+        SysWorkplaceQueue sysWorkplaceQueue = sysWorkplaceQueueMapper.selectOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getCode, request.getCode()).eq(SysWorkplaceQueue::getRelId, request.getRelId()));
+        sysWorkplaceQueue.setRelId(null);
+        sysWorkplaceQueueMapper.updateByRelId(request);
+    }
 }
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
index 3218915db..45c7cea7d 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
@@ -18,6 +18,7 @@
         <!--@mbg.generated-->
         id, code, `name`, workPlaceIdFk, remark, createTime, updateTime, `createUser`, updateUser
     </sql>
+
     <select id="selectMaxLayer" resultType="java.lang.Integer">
         select max(layer) as layer from sys_workplace_queue
         <where>
@@ -28,10 +29,12 @@
     </select>
 
     <select id="filterBindList" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
-        select swq.*,bp.nameCode,bp.ggxh,bp.cpmctymc
+        select swq.*,bp.nameCode,
+               COALESCE(bp.ggxh,bp.bzgg) AS ggxh,
+               bp.cpmctymc
         from sys_workplace_queue swq
         left join
-        (select bu.id,bp.nameCode,bp.ggxh,bp.cpmctymc
+        (select bu.id,bp.nameCode,bp.ggxh,bp.cpmctymc,bp.bzgg
         from basic_udirel bu
         left join basic_products bp ON bu.uuid = bp.uuid
         group by bu.id,bp.nameCode,bp.ggxh,bp.cpmctymc) as bp ON bp.id = swq.relId
@@ -124,4 +127,22 @@
         LIMIT 1
     </select>
 
+<!--    <update id="updateByRelId">-->
+<!--        UPDATE sys_workplace_queue-->
+<!--        <trim prefix="set" suffixOverrides=",">-->
+<!--            <if test="nameCode != null">-->
+<!--                nameCode=#{nameCode},-->
+<!--            </if>-->
+<!--        </trim>-->
+<!--        WHERE nameCode = #{nameCode}-->
+<!--        and uuid = #{uuid}-->
+<!--    </update>-->
+    <update id="updateByRelId">
+        UPDATE sys_workplace_queue
+        <set>
+            relId = null
+        </set>
+        WHERE code = #{code}
+    </update>
+
 </mapper>