1/18 槽位优化1.0

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;
 

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;
+
+
+
 
 }

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 + "");

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>