问题处理

hx-wms/src/main/java/com/fjhx/wms/mapper/stock/StockWaitMapper.java

@@ -21,6 +21,11 @@ public interface StockWaitMapper extends BaseMapper<StockWait> {
     /**
      * 待出入库分页
      */
+    Page<StockWaitVo> getPage1(@Param("page") Page<Object> page, @Param("ew") IWrapper<StockWait> wrapper);
+
+    /**
+     * 待出入库分页
+     */
     Page<StockWaitVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<StockWait> wrapper);
 
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -75,7 +75,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         //过滤入库/出库
         wrapper.eq(StockWait::getType, dto.getType());
         wrapper.eq(StockWait::getBusinessCode, dto.getKeyword());
-        Page<StockWaitVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        Page<StockWaitVo> page = this.baseMapper.getPage1(dto.getPage(), wrapper);
 
         List<StockWaitVo> records = page.getRecords();
         // 赋值产品属性

hx-wms/src/main/resources/mapper/stock/StockWaitMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.wms.mapper.stock.StockWaitMapper">
-    <select id="getPage" resultType="com.fjhx.wms.entity.stock.vo.StockWaitVo">
+    <select id="getPage1" resultType="com.fjhx.wms.entity.stock.vo.StockWaitVo">
         SELECT
             sw.id,
             swd.id stockWaitDetailsId,
@@ -24,4 +24,22 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getPage" resultType="com.fjhx.wms.entity.stock.vo.StockWaitVo">
+        SELECT
+            sw.id,
+            sw.type,
+            sw.business_id,
+            sw.business_code,
+            sw.business_type,
+            sw.`status`,
+            sw.create_user,
+            sw.create_time,
+            sw.update_user,
+            sw.update_time,
+            sw.victoriatourist_json
+        FROM
+            stock_wait sw
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>