报表SKU(630 已修改)

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

@@ -3,7 +3,7 @@ package com.abi.qms.platform.controller.console;
 import com.abi.qms.platform.dto.req.ReportReq;
 import com.abi.qms.platform.dto.res.ListBrandCodeReportRes;
 import com.abi.qms.platform.dto.res.ListFactoryCodeReportRes;
-import com.abi.qms.platform.dto.res.ListSkuCodeRankingReportRes;
+import com.abi.qms.platform.dto.res.ListMaterialCodeRankingReportRes;
 import com.abi.qms.platform.dto.res.PackageCodeTypeRes;
 import com.abi.qms.platform.service.ReportService;
 import com.abi.task.common.api.base.BaseResponse;
@@ -33,7 +33,7 @@ public class ReportController {
      * @param reportReq
      * @return com.abi.task.common.api.base.BaseResponse<com.abi.qms.platform.dto.res.ListBrandCodeReportRes>
      */
-    @ApiOperation("品牌使用码量占比")
+    @ApiOperation("品牌使用码量占比(603版 已废弃)")
     @GetMapping("/queryBrandCodeProportion")
     public BaseResponse<ListBrandCodeReportRes> queryBrandCodeProportion(@Validated ReportReq reportReq) {
         ListBrandCodeReportRes result= reportService.queryBrandCodeProportion(reportReq);
@@ -46,10 +46,11 @@ public class ReportController {
         PackageCodeTypeRes result= reportService.queryPackageCodeGeneral(reportReq);
         return BaseResponse.create(result);
     }
-    @ApiOperation("SKU使用码量排名")
-    @GetMapping("/querySkuCodeRanking")
-    public BaseResponse<ListSkuCodeRankingReportRes> querySkuCodeRanking(@Validated ReportReq reportReq) {
-        ListSkuCodeRankingReportRes result= reportService.querySkuCodeRanking(reportReq);
+
+    @ApiOperation("物料使用码量排名")
+    @GetMapping("/queryMaterialCodeRanking")
+    public BaseResponse<ListMaterialCodeRankingReportRes> queryMaterialCodeRanking(@Validated ReportReq reportReq) {
+        ListMaterialCodeRankingReportRes result= reportService.queryMaterialCodeRanking(reportReq);
         return BaseResponse.create(result);
     }
 

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

@@ -3,7 +3,7 @@ package com.abi.qms.platform.dao.mapper;
 import com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO;
 import com.abi.qms.platform.dao.vo.result.ListFactoryCodeReportVO;
 import com.abi.qms.platform.dao.vo.result.ListPackageCodeVo;
-import com.abi.qms.platform.dao.vo.result.ListSkuCodeReportVO;
+import com.abi.qms.platform.dao.vo.result.ListMaterialCodeReportVO;
 import com.abi.qms.platform.dto.req.ReportReq;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,7 +17,7 @@ import java.util.List;
 public interface ReportServiceMapper  {
     
     /**
-     * 品牌使用码量占比
+     * (603版 品牌使用码量占比列表 已废弃)
      * @author ludashi
      * @date 2021/6/2 17:50
      * @param reportReq
@@ -70,11 +70,11 @@ public interface ReportServiceMapper  {
     ListPackageCodeVo queryActivateCodeNumPast(@Param("beginDate")LocalDateTime beginDate,@Param("endDate")LocalDateTime endDate);
 
     /**
-     * SKU使用码量排名
+     * 物料使用码量排名
      * @param reportReq
      * @return
      */
-    List<ListSkuCodeReportVO> querySkuCodeRanking(@Param("reportReq") ReportReq reportReq);
+    List<ListMaterialCodeReportVO> queryMaterialCodeRanking(@Param("reportReq") ReportReq reportReq);
 
     /**
      * 包材厂使用码量，下载率

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/ListBrandCodeReportVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-/**
+/**(603版 品牌使用码量占比 已废弃)
  * @author ludashi
  * @date 2021年06月02日 16:39
  */

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/ListSkuCodeReportVO.java

@@ -7,15 +7,16 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
+ * 物料使用码量排名对象
  * @author guokaixiang
  * @date 2021年06月02日 16:39
  */
 @Data
 @ApiModel
-public class ListSkuCodeReportVO implements Serializable {
+public class ListMaterialCodeReportVO implements Serializable {
 
     @ApiModelProperty("品牌名称")
-    private String skuName;
+    private String materialName;
 
     @ApiModelProperty("码数量")
     private Long qrNumber;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListBrandCodeReportRes.java

@@ -10,7 +10,7 @@ import lombok.ToString;
 import java.io.Serializable;
 import java.util.List;
 
-/**
+/**(603版 品牌使用码量占比列表 已废弃)
  * @author ludashi
  * @date 2021年06月02日 16:26
  */

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListSkuCodeRankingReportRes.java

@@ -11,25 +11,26 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
+ * 物料品牌使用量报表出参
  * @author guokaixiang
  * @date 2021年06月02日 16:26
  */
 @Data
 @ApiModel
-public class ListSkuCodeRankingReportRes implements Serializable {
+public class ListMaterialCodeRankingReportRes implements Serializable {
 
     @ApiModelProperty("品牌使用码量占比列表")
-    private List<SkuCodeReportResBean> reportSkuCodeRankingResList;
+    private List<MaterialCodeReportResBean> reportMaterialCodeRankingResList;
 
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
     @ToString
-    @ApiModel(value = "ListSkuCodeRankingReportRes_SkuCodeReportResBean")
-    public static class SkuCodeReportResBean implements Serializable {
+    @ApiModel(value = "ListMaterialCodeRankingReportRes_MaterialCodeReportResBean")
+    public static class MaterialCodeReportResBean implements Serializable {
 
-        @ApiModelProperty("品牌名称")
-        private String skuName;
+        @ApiModelProperty("物料名称")
+        private String materialName;
 
         @ApiModelProperty("码数量")
         private Long qrNumber;

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

@@ -4,7 +4,7 @@ import com.abi.qms.platform.dto.req.ReportReq;
 import com.abi.qms.platform.dto.res.ListBrandCodeReportRes;
 import com.abi.qms.platform.dto.res.ListFactoryCodeReportRes;
 import com.abi.qms.platform.dto.res.PackageCodeTypeRes;
-import com.abi.qms.platform.dto.res.ListSkuCodeRankingReportRes;
+import com.abi.qms.platform.dto.res.ListMaterialCodeRankingReportRes;
 
 /**
  * @author ludashi
@@ -13,7 +13,7 @@ import com.abi.qms.platform.dto.res.ListSkuCodeRankingReportRes;
 public interface ReportService {
 
    /**
-    * 品牌使用码量占比
+    * (603版 品牌使用码量占比列表 已废弃)
     * @author ludashi
     * @date 2021/6/2 17:50
     * @param reportReq
@@ -32,11 +32,11 @@ public interface ReportService {
 
 
    /**
-    * SKU使用码量排名
+    * 物料使用码量排名
     * @param reportReq
     * @return
     */
-   ListSkuCodeRankingReportRes querySkuCodeRanking(ReportReq reportReq);
+   ListMaterialCodeRankingReportRes queryMaterialCodeRanking(ReportReq reportReq);
 
 
     /**

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

@@ -4,23 +4,21 @@ import com.abi.qms.platform.dao.enums.QrTypeEnum;
 import com.abi.qms.platform.dao.mapper.ReportServiceMapper;
 import com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO;
 import com.abi.qms.platform.dao.vo.result.ListFactoryCodeReportVO;
-import com.abi.qms.platform.dao.vo.result.ListSkuCodeReportVO;
+import com.abi.qms.platform.dao.vo.result.ListMaterialCodeReportVO;
 import com.abi.qms.platform.dao.vo.result.ListPackageCodeVo;
 import com.abi.qms.platform.dto.req.ReportReq;
 import com.abi.qms.platform.dto.res.ListBrandCodeReportRes;
 import com.abi.qms.platform.dto.res.ListFactoryCodeReportRes;
-import com.abi.qms.platform.dto.res.ListSkuCodeRankingReportRes;
+import com.abi.qms.platform.dto.res.ListMaterialCodeRankingReportRes;
 import com.abi.qms.platform.dto.res.PackageCodeTypeRes;
 import com.abi.qms.platform.service.ReportService;
 import com.abi.task.common.utils.PojoConverterUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -42,7 +40,7 @@ public class ReportServiceImpl implements ReportService {
     private ReportServiceMapper reportServiceMapper;
 
     /**
-     * 品牌使用码量占比
+     * 品牌使用码量占比（603版 已废弃）
      *
      * @param reportReq
      * @return com.abi.qms.platform.dto.res.ListBrandCodeReportRes
@@ -71,17 +69,17 @@ public class ReportServiceImpl implements ReportService {
     }
 
     /**
-     * SKU使用码量排名
+     * 物料使用码量排名
      * @param reportReq
      * @return
      */
     @Override
-    public ListSkuCodeRankingReportRes querySkuCodeRanking(ReportReq reportReq) {
-        List<ListSkuCodeReportVO> listSkuCodeReportVOS = reportServiceMapper.querySkuCodeRanking(reportReq);
+    public ListMaterialCodeRankingReportRes queryMaterialCodeRanking(ReportReq reportReq) {
+        List<ListMaterialCodeReportVO> listMaterialCodeReportVOS = reportServiceMapper.queryMaterialCodeRanking(reportReq);
         // 封装出参
-        ListSkuCodeRankingReportRes res = new ListSkuCodeRankingReportRes();
-        List<ListSkuCodeRankingReportRes.SkuCodeReportResBean> skuCodeReportResBeans = PojoConverterUtils.copyList(listSkuCodeReportVOS, ListSkuCodeRankingReportRes.SkuCodeReportResBean.class);
-        res.setReportSkuCodeRankingResList(skuCodeReportResBeans);
+        ListMaterialCodeRankingReportRes res = new ListMaterialCodeRankingReportRes();
+        List<ListMaterialCodeRankingReportRes.MaterialCodeReportResBean> materialCodeReportResBeans = PojoConverterUtils.copyList(listMaterialCodeReportVOS, ListMaterialCodeRankingReportRes.MaterialCodeReportResBean.class);
+        res.setReportMaterialCodeRankingResList(materialCodeReportResBeans);
         return res;
     }
 

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

@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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,
@@ -21,18 +22,20 @@
         GROUP BY brand.brand_code ORDER BY qr_number DESC
     </select>
 
-    <select id="querySkuCodeRanking" resultType="com.abi.qms.platform.dao.vo.result.ListSkuCodeReportVO">
-        select bs.sku_code,sum(qp.qr_number) as qr_number,max(bs.sku_name) as sku_name
-        from qr_package qp
-        LEFT JOIN base_material bm on qp.material_id  = bm.id
-        LEFT JOIN base_sku bs on bm.sku_id  = bs.id
+    <select id="queryMaterialCodeRanking" resultType="com.abi.qms.platform.dao.vo.result.ListMaterialCodeReportVO">
+        SELECT
+        sum( qp.qr_number ) AS qr_number,
+        max( bm.material_name ) AS material_name
+        FROM
+        qr_package qp
+        LEFT JOIN base_material bm ON qp.material_id = bm.id
         <where>
             <if test="null != reportReq.beginTime and null != reportReq.endTime">
                 and #{reportReq.beginTime} &lt; qp.generate_time &lt; #{reportReq.endTime}
             </if>
             and qp.generate_status = 2
         </where>
-        GROUP BY bs.sku_code
+        GROUP BY bm.material_code
         ORDER BY qr_number DESC
     </select>