修改查询供应商列表bug

顺手改了改格式。。。

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

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

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListFactorySelectReq.java

@@ -18,7 +18,7 @@ public class ListFactorySelectReq implements Serializable {
 
     @NotNull(message = "请提供你要查找的供应商类型")
     @ApiModelProperty(value = "供应商类型 1-包材厂 2-啤酒厂 3-二级包材厂")
-    private List<Long> factoryTypeList;
+    private List<Integer> factoryTypeList;
 
     @NotNull(message = "是否数据隔离为空")
     @ApiModelProperty(value = "是否数据隔离")

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

@@ -24,11 +24,12 @@
 
     <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
+            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}