分页查询关联码包列表(编辑审核页面) sql异常解决

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/BaseActiveMapper.java

@@ -18,12 +18,4 @@ public interface BaseActiveMapper extends BaseMapper<BaseActive> {
 
     IPage<BaseActive> listActivePage(IPage page, @Param("param") ListActiveReq param);
 
-    /**
-     * 通过码活动id查询关联码包列表
-     * @param page
-     * @param activeId
-     * @return
-     */
-    IPage<ActivePackageVO> listPackageById(IPage page, @Param("id") Long activeId);
-
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrPackageMapper.java

@@ -28,6 +28,14 @@ public interface QrPackageMapper extends BaseMapper<QrPackage> {
 	 */
 	QrPackageVO selectQrPackageDetailById(Long id);
 
+	/**
+	 * 通过码活动id查询关联码包列表
+	 * @param page
+	 * @param activeId
+	 * @return
+	 */
+	IPage<ActivePackageVO> listPackageById(IPage page, @Param("id") Long activeId);
+
 	/**
 	 * 通过品牌code查询关联码包列表
 	 * @param page

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/ActiveServiceImpl.java

@@ -198,7 +198,7 @@ public class ActiveServiceImpl implements ActiveService {
     @Override
     public ListActivePackageRes listActivePackage(GetActiveReq req) {
         //查询码活动关联的码包列表
-        IPage<ActivePackageVO> activePackageVOIPage = baseActiveMapper.listPackageById(PageUtil.createPage(req), req.getId());
+        IPage<ActivePackageVO> activePackageVOIPage = qrPackageMapper.listPackageById(PageUtil.createPage(req), req.getId());
         List<ActivePackageVO> records = activePackageVOIPage.getRecords();
         ListActivePackageRes listActivePackageRes = new ListActivePackageRes();
         PageUtil.copyPageInfo(listActivePackageRes, activePackageVOIPage);

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseActiveMapper.xml

@@ -55,22 +55,4 @@
         order by apply_time
     </select>
 
-    <!--通过码活动id查询关联码包列表-->
-    <select id="listPackageById" resultType="com.abi.qms.platform.dao.vo.result.ActivePackageVO">
-        select
-        qp.id as packageId,
-        qp.qr_type,
-        bs.sku_name,
-        bb.brand_name,
-        bb.parent_brand_name,
-        qp.qr_number
-        from base_active ba
-        left join base_active_qr_package_mapping baqpm on ba.id = baqpm.active_id
-        left join qr_package qp on baqpm.qr_package_id = qp.id
-        left join base_material bm on qp.material_id = bm.id
-        left join base_sku bs on bm.sku_id = bs.id
-        left join base_brand bb on bs.sub_brand_code = bb.brand_code
-        where ba.id = #{id}
-    </select>
-
 </mapper>

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -158,6 +158,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE qp.id = #{id}
     </select>
 
+    <!--通过码活动id查询关联码包列表-->
+    <select id="listPackageById" resultType="com.abi.qms.platform.dao.vo.result.ActivePackageVO">
+        select
+        qp.id as packageId,
+        qp.qr_type,
+        bs.sku_name,
+        bb.brand_name,
+        bb.parent_brand_name,
+        qp.qr_number
+        from qr_package qp
+        inner join base_material bm on bm.id=qp.material_id
+        inner join base_sku bs on bs.id=bm.sku_id
+        inner join base_brand bb on bb.brand_code=bs.sub_brand_code
+        left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id
+        left join base_active ba on ba.id = baqpm.active_id
+        where ba.id = #{id}
+    </select>
+
 
     <!--通过品牌code查询关联码包列表-->
     <select id="listPackageByBrandCode" resultType="com.abi.qms.platform.dao.vo.result.PackageActiveSearchVO">