报表SKU(630 已修改)

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/ReportController.java

@@ -33,12 +33,12 @@ public class ReportController {
      * @param reportReq
      * @return com.abi.task.common.api.base.BaseResponse<com.abi.qms.platform.dto.res.ListBrandCodeReportRes>
      */
-    @ApiOperation("品牌使用码量占比(603版 已废弃)")
+    /*@ApiOperation("品牌使用码量占比(603版 已废弃)")
     @GetMapping("/queryBrandCodeProportion")
     public BaseResponse<ListBrandCodeReportRes> queryBrandCodeProportion(@Validated ReportReq reportReq) {
         ListBrandCodeReportRes result= reportService.queryBrandCodeProportion(reportReq);
        return BaseResponse.create(result);
-    }
+    }*/
 
     @ApiOperation("码包概况")
     @GetMapping("/queryPackageCodeGeneral")

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

@@ -23,7 +23,7 @@ public interface ReportServiceMapper  {
      * @param reportReq
      * @return java.util.List<com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO>
      */
-    List<ListBrandCodeReportVO> queryBrandCodeProportion(@Param("reportReq") ReportReq reportReq);
+    //List<ListBrandCodeReportVO> queryBrandCodeProportion(@Param("reportReq") ReportReq reportReq);
 
     /**
      * 查询生成码数量

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

@@ -19,7 +19,7 @@ public interface ReportService {
     * @param reportReq
     * @return com.abi.qms.platform.dto.res.ListBrandCodeReportRes
     */
-   ListBrandCodeReportRes queryBrandCodeProportion(ReportReq reportReq);
+   //ListBrandCodeReportRes queryBrandCodeProportion(ReportReq reportReq);
 
    /**
     * 获取码包概况

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

@@ -47,7 +47,7 @@ public class ReportServiceImpl implements ReportService {
      * @author ludashi
      * @date 2021/6/2 17:50
      */
-    @Override
+    /*@Override
     public ListBrandCodeReportRes queryBrandCodeProportion(ReportReq reportReq) {
         //参数设置初始化
         setQueryTime(reportReq);
@@ -66,7 +66,7 @@ public class ReportServiceImpl implements ReportService {
         List<ListBrandCodeReportRes.BrandCodeReportBean> reportRes = PojoConverterUtils.copyList(listReportVOS, ListBrandCodeReportRes.BrandCodeReportBean.class);
         res.setReportBrandCodeResList(reportRes);
         return res;
-    }
+    }*/
 
     /**
      * 物料使用码量排名

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

@@ -3,24 +3,24 @@
 <mapper namespace="com.abi.qms.platform.dao.mapper.ReportServiceMapper">
 
     <!--603版 品牌使用报表已废弃 -->
-    <select id="queryBrandCodeProportion" resultType="com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO">
-        SELECT
-        SUM( package.qr_number ) AS qr_number,
-        max(brand.brand_name) AS brand_name
-        FROM
-        qr_package AS package
-        LEFT JOIN base_material AS material ON package.material_id = material.id
-        LEFT JOIN base_sku AS sku ON material.sku_id = sku.id
-        LEFT JOIN base_brand AS brand ON sku.sub_brand_code = brand.brand_code
-        <where>
-            <!--   1本周 2本月 -->
-            <if test="null != reportReq.beginTime and null != reportReq.endTime">
-                and #{reportReq.beginTime} &lt; package.generate_time &lt; #{reportReq.endTime}
-            </if>
-             and package.generate_status = 2
-        </where>
-        GROUP BY brand.brand_code ORDER BY qr_number DESC
-    </select>
+<!--    <select id="queryBrandCodeProportion" resultType="com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO">-->
+<!--        SELECT-->
+<!--        SUM( package.qr_number ) AS qr_number,-->
+<!--        max(brand.brand_name) AS brand_name-->
+<!--        FROM-->
+<!--        qr_package AS package-->
+<!--        LEFT JOIN base_material AS material ON package.material_id = material.id-->
+<!--        LEFT JOIN base_sku AS sku ON material.sku_id = sku.id-->
+<!--        LEFT JOIN base_brand AS brand ON sku.sub_brand_code = brand.brand_code-->
+<!--        <where>-->
+<!--            &lt;!&ndash;   1本周 2本月 &ndash;&gt;-->
+<!--            <if test="null != reportReq.beginTime and null != reportReq.endTime">-->
+<!--                and #{reportReq.beginTime} &lt; package.generate_time &lt; #{reportReq.endTime}-->
+<!--            </if>-->
+<!--             and package.generate_status = 2-->
+<!--        </where>-->
+<!--        GROUP BY brand.brand_code ORDER BY qr_number DESC-->
+<!--    </select>-->
 
     <select id="queryMaterialCodeRanking" resultType="com.abi.qms.platform.dao.vo.result.ListMaterialCodeReportVO">
         SELECT