java110 лет назад: 3
Родитель
Сommit
fa419d4b9b

+ 2 - 2
java110-db/src/main/resources/mapper/report/ReportOrderStatisticsServiceDaoImplMapper.xml

@@ -182,7 +182,7 @@
     <select id="getOwnerReserveGoodsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from (
-            select t.owner_id,t.name, t.link,rg.goods_name goodName,count(1)
+            select t.owner_id,t.name, t.link,rg.goods_name goodName,count(1) frequency
             from building_owner t
             left join building_owner bom on t.owner_id = bom.owner_id and bom.status_cd = '0'
             left join reserve_goods_order rgo on (bom.link = rgo.person_tel or t.link = rgo.person_tel) and rgo.status_cd = '0'
@@ -203,7 +203,7 @@
         ) a
     </select>
     <select id="getOwnerReserveGoods" parameterType="Map" resultType="Map">
-        select t.owner_id,t.name, t.link,rg.goods_name goodName,count(1)
+        select t.owner_id,t.name, t.link,rg.goods_name goodName,count(1) frequency
         from building_owner t
         left join building_owner bom on t.owner_id = bom.owner_id and bom.status_cd = '0'
         left join reserve_goods_order rgo on (bom.link = rgo.person_tel or t.link = rgo.person_tel) and rgo.status_cd = '0'

+ 6 - 0
service-report/src/main/java/com/java110/report/smo/impl/ReportOrderStatisticsInnerServiceSMOImpl.java

@@ -145,6 +145,12 @@ public class ReportOrderStatisticsInnerServiceSMOImpl extends BaseServiceSMO imp
 
     @Override
     public List<Map> getOwnerReserveGoods(@RequestBody OwnerDto ownerDto) {
+        int page = ownerDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            ownerDto.setPage((page - 1) * ownerDto.getRow());
+        }
+
         List<Map> infos = reportOrderStatisticsServiceDaoImpl.getOwnerReserveGoods(BeanConvertUtil.beanCovertMap(ownerDto));
         return infos;
     }