From 630cb0babb264657d8a07476e328654573620f8c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 15 一月 2022 13:41:47 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeNewV1InnerServiceSMOImpl.java |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeNewV1InnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeNewV1InnerServiceSMOImpl.java
index fd48510..fc3a894 100644
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeNewV1InnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeNewV1InnerServiceSMOImpl.java
@@ -16,6 +16,7 @@
 package com.java110.fee.smo.impl;
 
 
+import com.java110.dto.fee.PayFeeDto;
 import com.java110.fee.dao.IPayFeeNewV1ServiceDao;
 import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
 import com.java110.po.fee.PayFeePo;
@@ -64,25 +65,25 @@
        return saveFlag;
     }
 
-//    @Override
-//    public List<PayFeeNewDto> queryPayFeeNews(@RequestBody  PayFeeNewDto payFeeNewDto) {
-//
-//        //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
-//
-//        int page = payFeeNewDto.getPage();
-//
-//        if (page != PageDto.DEFAULT_PAGE) {
-//            payFeeNewDto.setPage((page - 1) * payFeeNewDto.getRow());
-//        }
-//
-//        List<PayFeeNewDto> payFeeNews = BeanConvertUtil.covertBeanList(payFeeNewV1ServiceDaoImpl.getPayFeeNewInfo(BeanConvertUtil.beanCovertMap(payFeeNewDto)), PayFeeNewDto.class);
-//
-//        return payFeeNews;
-//    }
-//
-//
-//    @Override
-//    public int queryPayFeeNewsCount(@RequestBody PayFeeNewDto payFeeNewDto) {
-//        return payFeeNewV1ServiceDaoImpl.queryPayFeeNewsCount(BeanConvertUtil.beanCovertMap(payFeeNewDto));    }
+    @Override
+    public List<PayFeeDto> queryPayFeeNews(@RequestBody  PayFeeDto payFeeNewDto) {
+
+        //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+        int page = payFeeNewDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            payFeeNewDto.setPage((page - 1) * payFeeNewDto.getRow());
+        }
+
+        List<PayFeeDto> payFeeNews = BeanConvertUtil.covertBeanList(payFeeNewV1ServiceDaoImpl.getPayFeeNewInfo(BeanConvertUtil.beanCovertMap(payFeeNewDto)), PayFeeDto.class);
+
+        return payFeeNews;
+    }
+
+
+    @Override
+    public int queryPayFeeNewsCount(@RequestBody PayFeeDto payFeeNewDto) {
+        return payFeeNewV1ServiceDaoImpl.queryPayFeeNewsCount(BeanConvertUtil.beanCovertMap(payFeeNewDto));    }
 
 }

--
Gitblit v1.8.0