fix:完善聚合查询

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/DaHuoNumberMapper.java

@@ -1,5 +1,8 @@
 package org.dromara.commodityManagement.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.dromara.commodityManagement.domain.DaHuoNumber;
 import org.dromara.commodityManagement.domain.vo.DaHuoNumberVo;
@@ -10,4 +13,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 @Mapper
 public interface DaHuoNumberMapper extends BaseMapperPlus<DaHuoNumber, DaHuoNumberVo> {
+    Page<DaHuoNumberVo> selectVoPageWithTemplate(IPage<DaHuoNumberVo> page, QueryWrapper<DaHuoNumber> wrapper);
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/DaHuoNumberImpl.java

@@ -32,11 +32,11 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
         QueryWrapper<DaHuoNumber> qw = new QueryWrapper<>();
         qw.eq("type", DAHUO_TYPE);
         qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getName()), "name", daHuoNumberBo.getName());
-        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getKuanhao()), "name", daHuoNumberBo.getKuanhao());
-        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getHuaxinghao()), "name", daHuoNumberBo.getHuaxinghao());
-        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getCustomer_name()), "name", daHuoNumberBo.getCustomer_name());
-        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getDibu()), "name", daHuoNumberBo.getDibu());
-        Page<DaHuoNumberVo> page = daHuoNumberMapper.selectVoPage(pageQuery.build(), qw);
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getKuanhao()), "kuanhao", daHuoNumberBo.getKuanhao());
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getHuaxinghao()), "huaxinghao", daHuoNumberBo.getHuaxinghao());
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getCustomer_name()), "customer_name", daHuoNumberBo.getCustomer_name());
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getDibu()), "dibu", daHuoNumberBo.getDibu());
+        Page<DaHuoNumberVo> page = daHuoNumberMapper.selectVoPageWithTemplate(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
 

ruoyi-modules/ruoyi-commodityManagement/src/main/resources/mapper/DaHuoNumberMapper.xml

@@ -1,7 +1,52 @@
 <?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">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.commodityManagement.mapper.DaHuoNumberMapper">
 
+    <resultMap id="DaHuoNumberResultMap" type="org.dromara.commodityManagement.domain.vo.DaHuoNumberVo">
+        <id property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="kuanhao" column="kuanhao"/>
+        <result property="huaxinghao" column="huaxinghao"/>
+        <result property="dibu" column="dibu"/>
+        <result property="dibu_price" column="dibu_price"/>
+        <result property="customer_name" column="customer_name"/>
+        <result property="machine" column="machine"/>
+        <collection property="template" ofType="org.dromara.commodityManagement.domain.Template">
+            <id property="id" column="template_id"/>
+            <result property="item_id" column="item_id"/>
+            <result property="name" column="template_name"/>
+            <result property="image" column="template_image"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectVoPageWithTemplate" resultMap="DaHuoNumberResultMap">
+        SELECT
+        dh.id,
+        dh.name,
+        dh.type,
+        dh.kuanhao,
+        dh.huaxinghao,
+        dh.dibu,
+        dh.dibu_price,
+        dh.customer_name,
+        dh.machine,
+        t.id AS template_id,
+        t.name AS template_name,
+        t.image AS template_image
+        FROM
+        fa_kuyou_item_name dh
+        LEFT JOIN
+        fa_kuyou_item_name_template t ON dh.id = t.item_id
+        WHERE
+        dh.type = #{ew.eq('type', '1')}
+        <if test="ew.getCustomSqlSegment() != null">
+            ${ew.getCustomSqlSegment()}
+        </if>
+        ORDER BY
+        dh.id
+    </select>
+
 </mapper>