From f655fb34c97e0e90fccca34a85eafbdeb2d90e0b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 18 Jan 2025 15:12:03 +0800
Subject: [PATCH] =?UTF-8?q?1/18=20=E6=A7=BD=E4=BD=8D=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/req/basic/SysWorkplaceFreightRequest.java   | 2 +-
 .../com/glxp/api/req/basic/SysWorkplaceLayerRequest.java | 9 +++++++++
 .../glxp/api/service/basic/SysWorkplaceLayerService.java | 3 ++-
 .../mybatis/mapper/basic/SysWorkplaceFreightMapper.xml   | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceFreightRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceFreightRequest.java
index 76842cbe1..a3a8ab927 100644
--- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceFreightRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceFreightRequest.java
@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 public class SysWorkplaceFreightRequest extends ListPageRequest {
     private String key;
-//    private String code;
+    private String code;
 //    private String name;
     private Long workPlaceIdFk;
 
diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java
index 08213e12d..389f50e0b 100644
--- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java
@@ -43,5 +43,14 @@ public class SysWorkplaceLayerRequest extends ListPageRequest {
      */
     private Integer isSingQueue;
 
+    /**
+     * 区域编码
+     */
+    private Integer freightRow;
+
+    private  String name;
+
+
+
 
 }
diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
index f6264295a..87a1b4f71 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
@@ -60,7 +60,8 @@ public class SysWorkplaceLayerService extends ServiceImpl<SysWorkplaceLayerMappe
             SysWorkplaceFreight freight = new SysWorkplaceFreight();
             freight.setCode(request.getFreightCode());
             freight.setWorkPlaceIdFk(request.getWorkPlaceIdFk());
-            freight.setRemark(request.getRemark());
+            freight.setName(request.getName());
+            freight.setFreightRow(request.getFreightRow());
             freight.setCreateTime(new Date());
             freight.setCreateUser(userId + "");
             freight.setUpdateUser(userId + "");
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
index df7a4c120..bd72aed2f 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
@@ -31,6 +31,10 @@
                 or swf.name like concat('%', #{key}, '%')
                 )
             </if>
+            <if test=" code != null and code != ''">
+                AND swf.code = #{code}
+            </if>
+
             <if test=" workPlaceIdFk != null and workPlaceIdFk != ''">
                 AND swf.workPlaceIdFk = #{workPlaceIdFk}
             </if>