修改报表名称

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

@@ -1,7 +1,7 @@
 package com.abi.qms.platform.controller.console;
 
 import com.abi.qms.platform.dto.req.ReportReq;
-import com.abi.qms.platform.dto.res.ListReportRes;
+import com.abi.qms.platform.dto.res.ListBrandCodeReportRes;
 import com.abi.qms.platform.service.ReportService;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
@@ -31,8 +31,8 @@ public class ReportController {
 
     @ApiOperation("品牌使用码量占比")
     @GetMapping("/queryBrandCodeProportion")
-    public BaseResponse<ListReportRes> queryBrandCodeProportion(@Validated ReportReq reportReq) {
-        ListReportRes result= reportService.queryBrandCodeProportion(reportReq);
+    public BaseResponse<ListBrandCodeReportRes> queryBrandCodeProportion(@Validated ReportReq reportReq) {
+        ListBrandCodeReportRes result= reportService.queryBrandCodeProportion(reportReq);
        return BaseResponse.create(result);
     }
 

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

@@ -1,8 +1,7 @@
 package com.abi.qms.platform.dao.mapper;
 
-import com.abi.qms.platform.dao.vo.result.ListReportVO;
+import com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO;
 import com.abi.qms.platform.dto.req.ReportReq;
-import com.abi.qms.platform.dto.res.ListReportRes;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,5 +17,5 @@ public interface ReportServiceMapper  {
      * @author ludashi
      * @date 2021/6/2 16:01 
      */
-    List<ListReportVO> queryBrandCodeProportion(@Param("reportReq") ReportReq reportReq);
+    List<ListBrandCodeReportVO> queryBrandCodeProportion(@Param("reportReq") ReportReq reportReq);
 }

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

@@ -12,7 +12,7 @@ import java.io.Serializable;
  */
 @Data
 @ApiModel
-public class ListReportVO implements Serializable {
+public class ListBrandCodeReportVO implements Serializable {
     @ApiModelProperty("品牌名称")
     private String brandName;
 

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

@@ -16,17 +16,17 @@ import java.util.List;
  */
 @Data
 @ApiModel
-public class ListReportRes implements Serializable {
+public class ListBrandCodeReportRes implements Serializable {
 
     @ApiModelProperty("品牌使用码量占比列表")
-    private List<ReportRes> reportResList;
+    private List<BrandCodeReportBean> reportBrandCodeResList;
 
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
     @ToString
-    @ApiModel(value = "ListReportRes_ReportRes")
-    public static class ReportRes implements Serializable {
+    @ApiModel(value = "ListBrandCodeReportRes_BrandCodeReportBean")
+    public static class BrandCodeReportBean implements Serializable {
 
         @ApiModelProperty("品牌名称")
         private String brandName;

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

@@ -1,9 +1,7 @@
 package com.abi.qms.platform.service;
 
 import com.abi.qms.platform.dto.req.ReportReq;
-import com.abi.qms.platform.dto.res.ListReportRes;
-
-import java.util.List;
+import com.abi.qms.platform.dto.res.ListBrandCodeReportRes;
 
 /**
  * @author ludashi
@@ -12,6 +10,6 @@ import java.util.List;
 public interface ReportService {
 
 
-   ListReportRes queryBrandCodeProportion(ReportReq reportReq);
+   ListBrandCodeReportRes queryBrandCodeProportion(ReportReq reportReq);
     
 }

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

@@ -1,10 +1,9 @@
 package com.abi.qms.platform.service.impl;
 
 import com.abi.qms.platform.dao.mapper.ReportServiceMapper;
-import com.abi.qms.platform.dao.vo.result.ListReportVO;
+import com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO;
 import com.abi.qms.platform.dto.req.ReportReq;
-import com.abi.qms.platform.dto.res.ListQrVariableRes;
-import com.abi.qms.platform.dto.res.ListReportRes;
+import com.abi.qms.platform.dto.res.ListBrandCodeReportRes;
 import com.abi.qms.platform.service.ReportService;
 import com.abi.task.common.utils.PojoConverterUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,12 +27,12 @@ public class ReportServiceImpl implements ReportService {
      * @date 2021/6/2 16:06
      */
     @Override
-    public ListReportRes queryBrandCodeProportion(ReportReq reportReq) {
-        List<ListReportVO> listReportVOS = reportServiceMapper.queryBrandCodeProportion(reportReq);
+    public ListBrandCodeReportRes queryBrandCodeProportion(ReportReq reportReq) {
+        List<ListBrandCodeReportVO> listReportVOS = reportServiceMapper.queryBrandCodeProportion(reportReq);
         // 封装出参
-        ListReportRes res = new ListReportRes();
-        List<ListReportRes.ReportRes> reportRes = PojoConverterUtils.copyList(listReportVOS, ListReportRes.ReportRes.class);
-        res.setReportResList(reportRes);
+        ListBrandCodeReportRes res = new ListBrandCodeReportRes();
+        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

@@ -2,7 +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">
 
-    <select id="queryBrandCodeProportion" resultType="com.abi.qms.platform.dao.vo.result.ListReportVO">
+    <select id="queryBrandCodeProportion" resultType="com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO">
         SELECT
             quer.brand_name brandName,
             SUM( quer.qr_number ) qrNumber,