fix:新增自定义查询

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/BulkOrderListMapper.java

@@ -1,6 +1,11 @@
 package org.dromara.bulk.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.bulk.domain.BulkOrderList;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -14,6 +19,8 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 @Mapper
 public interface BulkOrderListMapper extends BaseMapperPlus<BulkOrderList, BulkOrderListVo> {
 
+    Page<BulkOrderListVo> selectVoPageWithGoodImage(IPage<BulkOrderListVo> page, @Param(Constants.WRAPPER) Wrapper<BulkOrderList> wrapper);
+
 }
 
 

ruoyi-modules/ruoyi-bulkOrder/src/main/resources/mapper/BulkOrderListMapper.xml

@@ -3,4 +3,114 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.bulk.mapper.BulkOrderListMapper">
+    <resultMap id="BulkOrderListResultMap" type="org.dromara.bulk.domain.vo.BulkOrderListVo">
+        <id property="id" column="id"/>
+        <result property="sysNo" column="sys_no"/>
+        <result property="scNo" column="sc_no"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="goodsCode" column="goods_code"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="goodsNote" column="goods_note"/>
+        <result property="unitId" column="unit_id"/>
+        <result property="purchase" column="purchase"/>
+        <result property="number" column="number"/>
+        <result property="fenNumber" column="fen_number"/>
+        <result property="basicNmber" column="basic_nmber"/>
+        <result property="basicFenNmber" column="basic_fen_nmber"/>
+        <result property="money" column="money"/>
+        <result property="remark" column="remark"/>
+        <result property="goodsTypeExtend1Id" column="goods_type_extend_1_id"/>
+        <result property="goodsTypeExtend1Attr" column="goods_type_extend_1_attr"/>
+        <result property="goodsTypeExtend2Id" column="goods_type_extend_2_id"/>
+        <result property="goodsTypeExtend2Attr" column="goods_type_extend_2_attr"/>
+        <result property="goodsTypeExtend3Id" column="goods_type_extend_3_id"/>
+        <result property="goodsTypeExtend3Attr" column="goods_type_extend_3_attr"/>
+        <result property="goodsTypeExtend4Id" column="goods_type_extend_4_id"/>
+        <result property="goodsTypeExtend4Attr" column="goods_type_extend_4_attr"/>
+        <result property="baseCloth" column="base_cloth"/>
+        <result property="baseClothPrice" column="base_cloth_price"/>
+        <result property="gongyiPrice" column="gongyi_price"/>
+        <result property="itemNumber" column="item_number"/>
+        <result property="weight" column="weight"/>
+        <result property="menfu" column="menfu"/>
+        <result property="machine" column="machine"/>
+        <result property="brandGroup" column="brand_group"/>
+        <result property="garmentFactory" column="garment_factory"/>
+        <result property="garmentFactoryPeople" column="garment_factory_people"/>
+        <result property="garmentFactoryTel" column="garment_factory_tel"/>
+        <result property="receivingAddress" column="receiving_address"/>
+        <result property="currentTimeConsumption" column="current_time_consumption"/>
+        <result property="numberOrdersPlaced" column="number_orders_placed"/>
+        <result property="orderTime" column="order_time"/>
+        <result property="deliveryDate" column="delivery_date"/>
+        <result property="targetDate" column="target_date"/>
+        <result property="userOrderId" column="user_order_id"/>
+        <result property="goodsSalesInfoId" column="goods_sales_info_id"/>
+        <result property="numberOrdersPlacedType" column="number_orders_placed_type"/>
+        <result property="shipNum" column="ship_num"/>
+        <result property="billRemark" column="bill_remark"/>
+        <result property="duizhangStatus" column="duizhang_status"/>
+        <result property="baibuType" column="baibu_type"/>
+        <result property="baibuPrice" column="baibu_price"/>
+        <result property="baibuUnit" column="baibu_unit"/>
+        <result property="shaohuaDabaoCount" column="shaohua_dabao_count"/>
+        <result property="image" column="goods_image"/>
+    </resultMap>
+    <select id="selectVoPageWithGoodImage" resultType="org.dromara.bulk.domain.vo.BulkOrderListVo">
+        SELECT
+            bo.id,
+            bo.sys_no,
+            bo.sc_no,
+            bo.goods_id,
+            bo.goods_code,
+            bo.goods_name,
+            bo.goods_note,
+            bo.unit_id,
+            bo.purchase,
+            bo.number,
+            bo.fen_number,
+            bo.basic_nmber,
+            bo.basic_fen_nmber,
+            bo.money,
+            bo.remark,
+            bo.goods_type_extend_1_id,
+            bo.goods_type_extend_1_attr,
+            bo.goods_type_extend_2_id,
+            bo.goods_type_extend_2_attr,
+            bo.goods_type_extend_3_id,
+            bo.goods_type_extend_3_attr,
+            bo.goods_type_extend_4_id,
+            bo.goods_type_extend_4_attr,
+            bo.base_cloth,
+            bo.base_cloth_price,
+            bo.gongyi_price,
+            bo.item_number,
+            bo.weight,
+            bo.menfu,
+            bo.machine,
+            bo.brand_group,
+            bo.garment_factory,
+            bo.garment_factory_people,
+            bo.garment_factory_tel,
+            bo.receiving_address,
+            bo.current_time_consumption,
+            bo.number_orders_placed,
+            bo.order_time,
+            bo.delivery_date,
+            bo.target_date,
+            bo.user_order_id,
+            bo.goods_sales_info_id,
+            bo.number_orders_placed_type,
+            bo.ship_num,
+            bo.bill_remark,
+            bo.duizhang_status,
+            bo.baibu_type,
+            bo.baibu_price,
+            go.goods_image
+            FROM
+            fa_kuyou_plan_info bo
+            LEFT JOIN
+            fa_kuyou_goods go ON go.id = bo.goods_id
+            ${ew.getCustomSqlSegment()}
+    </select>
 </mapper>