From a39807064a500875d89bc46edcd2d0b3654575a9 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期三, 24 七月 2024 15:14:46 +0800 Subject: [PATCH] 取水口日取水量漏损(历史) 取水口日取水量漏损(最新) 修改控制器报警与状态查询的排序、 修改农户日用水量统计的排序、日期类型 重构代码放置结构 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java | 57 +++++++++++++++++++++++++-------------------------------- 1 files changed, 25 insertions(+), 32 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java index 214c071..69f2e43 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java @@ -4,7 +4,6 @@ import com.dy.pipIrrGlobal.pojoSe.SeCardOperate; import com.dy.pipIrrGlobal.voSe.*; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -61,36 +60,6 @@ List<VoTradeDetails> getTransactions(Map<?, ?> params); /** - * 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗缁熻璁板綍鏁� - * @param params - * @return - */ - Long getTransactionStatisticsRecordCount(Map<?, ?> params); - - /** - * 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗缁熻璁板綍 - * @param params - * @return - */ - List<VoTransactionStatistics> getTransactionStatistics(Map<?, ?> params); - - /** - * 鏍瑰熀鎸囧畾鏉′欢鑾峰彇绗旀暟鍚堣銆佸疄鏀堕噾棰濆悎璁°�佽禒閫侀噾棰濆悎璁� - * @param params - * @return - */ - Map getTransactionStatisticsSums(Map<?, ?> params); - - /** - * 鑾峰彇鎸囧畾鏃ユ湡銆佹寚瀹氭敮浠樻柟寮忓疄鏀堕噾棰濆悎璁� - * @param tradeDate - * @param paymentId - * @return - */ - //Float getPaymentSums(Map<?, ?> params); - Float getPaymentSums(@Param("tradeDate") String tradeDate, @Param("paymentId") Long paymentId); - - /** * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰曟暟 * @param params * @return @@ -102,7 +71,7 @@ * @param params * @return */ - List<VoActiveCardNew> getActiveCards(Map<?, ?> params); + List<VoActiveCard> getActiveCards(Map<?, ?> params); /** @@ -118,6 +87,23 @@ * @return */ List<VoReissueCard> getReissueCards(Map<?, ?> params); + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍鏁伴噺 + * 娉ㄩ攢銆佹寕澶便�佸啿姝c�佽В閿侀�氱敤 + * @param params + * @return + */ + Long getCommonOperationRecordCount(Map<?, ?> params); + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍 + * 娉ㄩ攢銆佹寕澶便�佸啿姝c�佽В閿侀�氱敤 + * @param params + * @return + */ + List<VoOperate> getCommonOperations(Map<?, ?> params); + /** * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鍒楄〃鏁� @@ -139,4 +125,11 @@ * @return */ Double getTotalAmount(Map<?, ?> params); + + /** + * 鏍规嵁姘村崱缂栧彿鑾峰彇鍏舵寕澶辨椂閫�娆鹃噾棰濓紙琛ュ崱鏃跺垽鏂娇鐢級 + * @param cardNum + * @return + */ + Double getTradeAmountByCardNo(Long cardNum); } \ No newline at end of file -- Gitblit v1.8.0