修改入参

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

@@ -62,6 +62,6 @@ public interface ReportServiceMapper  {
      * @param req
      * @return java.util.List<com.abi.qms.platform.dao.vo.result.QueryWxFactoryVO>
      */
-    List<QueryWxFactoryVO> queryWxFactory(@Param("req")QueryWxFactoryReq req);
+    List<QueryWxFactoryVO> queryWxFactory(@Param("req") QueryWxFactoryReq req, @Param("now") LocalDateTime now, @Param("month") LocalDateTime month);
 
 }

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

@@ -20,10 +20,4 @@ public class QueryWxFactoryReq implements Serializable {
     @ApiModelProperty(value = "啤酒厂ID")
     private Long factoryBeerId;
 
-    @ApiModelProperty(value = "现在时间")
-    private LocalDateTime now;
-
-    @ApiModelProperty(value = "前三个月时间")
-    private LocalDateTime month;
-
 }

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

@@ -132,11 +132,8 @@ public class ReportServiceImpl implements ReportService {
         QueryWxFactoryRes res = new QueryWxFactoryRes();
         if (isMainAccount.equals(0)) {
             //子账号报表
-            //获取现在时间
-            queryWxFactoryReq.setNow(LocalDateTime.now());
-            //获取前三个月的时间
-            queryWxFactoryReq.setMonth(getMonth());
-            List<QueryWxFactoryVO> queryWxFactoryVO = reportServiceMapper.queryWxFactory(queryWxFactoryReq);
+            //获取现在时间 获取前三个月的时间
+            List<QueryWxFactoryVO> queryWxFactoryVO = reportServiceMapper.queryWxFactory(queryWxFactoryReq,LocalDateTime.now(),getMonth());
             AssertUtil.isNull(queryWxFactoryVO,"报表数据查询为空");
             List<QueryWxFactoryRes.QueryWxFactoryBean> queryWxFactoryBeans = PojoConverterUtils.copyList(queryWxFactoryVO, QueryWxFactoryRes.QueryWxFactoryBean.class);
             queryWxFactoryBeans.forEach(beans->{
@@ -146,7 +143,7 @@ public class ReportServiceImpl implements ReportService {
             return res;
         }
         //下单量-激活量-库存
-        List<QueryWxFactoryVO> queryWxFactoryVO = reportServiceMapper.queryWxFactory(queryWxFactoryReq);
+        List<QueryWxFactoryVO> queryWxFactoryVO = reportServiceMapper.queryWxFactory(queryWxFactoryReq,null,null);
         AssertUtil.isNull(queryWxFactoryVO,"查询为空");
         List<QueryWxFactoryRes.QueryWxFactoryBean> queryWxFactoryBeans = PojoConverterUtils.copyList(queryWxFactoryVO, QueryWxFactoryRes.QueryWxFactoryBean.class);
         Long total = queryWxFactoryBeans.stream().mapToLong(QueryWxFactoryRes.QueryWxFactoryBean::getTotal).sum();

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

@@ -113,8 +113,8 @@
             <if test="null != req.factoryBeerId and req.factoryBeerId != ''">
                 AND qpackage.factory_beer_id = #{req.factoryBeerId}
             </if>
-            <if test="null != req.now and null != req.month">
-                AND #{req.month} <![CDATA[<=]]> qpackage.create_time <![CDATA[<=]]> #{req.now}
+            <if test="null != now and null != month">
+                AND #{month} <![CDATA[<=]]> qpackage.create_time <![CDATA[<=]]> #{now}
             </if>
         </where>
         GROUP BY march