添加注释

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

@@ -28,7 +28,12 @@ public class ReportController {
     @Autowired
     private ReportService reportService;
 
-
+    /**
+     * @author ludashi
+     * @date 2021/6/2 17:49
+     * @param reportReq
+     * @return com.abi.task.common.api.base.BaseResponse<com.abi.qms.platform.dto.res.ListBrandCodeReportRes>
+     */
     @ApiOperation("品牌使用码量占比")
     @GetMapping("/queryBrandCodeProportion")
     public BaseResponse<ListBrandCodeReportRes> queryBrandCodeProportion(@Validated ReportReq reportReq) {

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

@@ -15,7 +15,9 @@ public interface ReportServiceMapper  {
     /**
      * 品牌使用码量占比
      * @author ludashi
-     * @date 2021/6/2 16:01 
+     * @date 2021/6/2 17:50
+     * @param reportReq
+     * @return java.util.List<com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO>
      */
     List<ListBrandCodeReportVO> queryBrandCodeProportion(@Param("reportReq") ReportReq reportReq);
 }

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

@@ -9,7 +9,13 @@ import com.abi.qms.platform.dto.res.ListBrandCodeReportRes;
  */
 public interface ReportService {
 
-
+   /**
+    * 品牌使用码量占比
+    * @author ludashi
+    * @date 2021/6/2 17:50
+    * @param reportReq
+    * @return com.abi.qms.platform.dto.res.ListBrandCodeReportRes
+    */
    ListBrandCodeReportRes queryBrandCodeProportion(ReportReq reportReq);
     
 }

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

@@ -21,11 +21,13 @@ public class ReportServiceImpl implements ReportService {
     @Autowired
     private ReportServiceMapper reportServiceMapper;
 
-    /**
-     *
-     * @author ludashi
-     * @date 2021/6/2 16:06
-     */
+   /**
+    * 品牌使用码量占比
+    * @author ludashi
+    * @date 2021/6/2 17:50
+    * @param reportReq
+    * @return com.abi.qms.platform.dto.res.ListBrandCodeReportRes
+    */
     @Override
     public ListBrandCodeReportRes queryBrandCodeProportion(ReportReq reportReq) {
         List<ListBrandCodeReportVO> listReportVOS = reportServiceMapper.queryBrandCodeProportion(reportReq);

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

@@ -19,9 +19,10 @@
                     LEFT JOIN base_material AS material ON material.sku_id = sku.id
                     LEFT JOIN qr_package AS package ON package.material_id = material.id
                 <where>
+                    package.generate_status = 2
                     <!--   1本周  -->
                     <if test="null != reportReq.value and reportReq.value == 1">
-                        yearweek(date_format(package.generate_time,'%Y-%m-%d')) = yearweek(now())
+                       and yearweek(date_format(package.generate_time,'%Y-%m-%d')) = yearweek(now())
                     </if>
                     <!--  2本月 -->
                     <if test="null != reportReq.value and reportReq.value == 2">