fix:修复缺少字段

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

@@ -21,13 +21,7 @@ public interface BulkOrderListMapper extends BaseMapperPlus<BulkOrderList, BulkO
      * @param wrapper 查询条件
      * @return 分页对象
      */
-    Page<BulkOrderListVo> selectVoPageWithGoodImage(IPage<BulkOrderListVo> page, @Param(Constants.WRAPPER) Wrapper<BulkOrderList> wrapper);
-
-    /**
-     * 查询大货列表最近插入的ID
-     * @return ID
-     */
-    Long selectLastId();
+    Page<BulkOrderListVo> selectVoPageWithImage(IPage<BulkOrderListVo> page, @Param(Constants.WRAPPER) Wrapper<BulkOrderList> wrapper);
 
 }
 

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/BulkOrderListServiceImpl.java

@@ -35,8 +35,8 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
     @Override
     public TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery) {
         QueryWrapper<BulkOrderList> qw = new QueryWrapper<>();
-        qw.like(null != bulkOrderListBo.getId(), "id", bulkOrderListBo.getId());
-        Page<BulkOrderListVo> page = bulkOrderListMapper.selectVoPageWithGoodImage(pageQuery.build(), qw);
+        qw.like(null != bulkOrderListBo.getId(), "pi.id", bulkOrderListBo.getId());
+        Page<BulkOrderListVo> page = bulkOrderListMapper.selectVoPageWithImage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
 

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

@@ -15,8 +15,8 @@
         <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="basicNumber" column="basic_nmber"/>
+        <result property="basicFenNumber" column="basic_fen_nmber"/>
         <result property="money" column="money"/>
         <result property="remark" column="remark"/>
         <result property="goodsTypeExtend1Id" column="goods_type_extend_1_id"/>
@@ -29,7 +29,7 @@
         <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="craftPrice" column="gongyi_price"/>
         <result property="itemNumber" column="item_number"/>
         <result property="weight" column="weight"/>
         <result property="menfu" column="menfu"/>
@@ -54,70 +54,69 @@
         <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"/>
+        <result property="imageUrl" column="image"/>
+        <result property="status" column="craft_status"/>
     </resultMap>
-    <select id="selectVoPageWithGoodImage" resultType="org.dromara.bulk.domain.vo.BulkOrderListVo">
+    <select id="selectVoPageWithImage" 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
+            pi.id,
+            pi.sys_no,
+            pi.sc_no,
+            pi.goods_id,
+            pi.goods_code,
+            pi.goods_name,
+            pi.goods_note,
+            pi.unit_id,
+            pi.purchase,
+            pi.number,
+            pi.fen_number,
+            pi.basic_nmber,
+            pi.basic_fen_nmber,
+            pi.money,
+            pi.remark,
+            pi.goods_type_extend_1_id,
+            pi.goods_type_extend_1_attr,
+            pi.goods_type_extend_2_id,
+            pi.goods_type_extend_2_attr,
+            pi.goods_type_extend_3_id,
+            pi.goods_type_extend_3_attr,
+            pi.goods_type_extend_4_id,
+            pi.goods_type_extend_4_attr,
+            pi.base_cloth,
+            pi.base_cloth_price,
+            pi.gongyi_price,
+            pi.item_number,
+            pi.weight,
+            pi.menfu,
+            pi.machine,
+            pi.brand_group,
+            pi.garment_factory,
+            pi.garment_factory_people,
+            pi.garment_factory_tel,
+            pi.receiving_address,
+            pi.current_time_consumption,
+            pi.number_orders_placed,
+            pi.order_time,
+            pi.delivery_date,
+            pi.target_date,
+            pi.user_order_id,
+            pi.goods_sales_info_id,
+            pi.number_orders_placed_type,
+            pi.ship_num,
+            pi.bill_remark,
+            pi.duizhang_status,
+            pi.baibu_type,
+            pi.baibu_price,
+            fp.image,
+            p.craft_status
             FROM
-            fa_kuyou_plan_info bo
+            fa_kuyou_plan_info pi
             LEFT JOIN
-            fa_kuyou_goods go ON go.id = bo.goods_id
+            fa_kuyou_plan p ON pi.plan_id = p.id
+            LEFT JOIN
+            fa_kuyou_user_order uo ON p.order_num = uo.order_num
+            LEFT JOIN
+            fa_kuyou_flower_pattern fp ON uo.id = fp.user_order_id
             ${ew.getCustomSqlSegment()}
     </select>
-    <select id="selectLastId" resultType="java.lang.Long">
-        SELECT
-            id
-        FROM fa_kuyou_plan_info
-        ORDER BY id DESC
-        LIMIT 1
-    </select>
 </mapper>