From b81dcbba7174fc935cbe29d867f493d45cc701c5 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期四, 06 六月 2024 11:28:03 +0800 Subject: [PATCH] 修改农户模块添加接口 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java index 37a45ae..ce11f65 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java @@ -11,8 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Map; @@ -34,20 +32,16 @@ public QueryResultVo<List<VoRecharge>> getRecharges(QueryVo queryVo) { //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿 - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - - LocalDateTime rechargeTimeStart = queryVo.rechargeTimeStart; - LocalDateTime rechargeTimeStop = queryVo.rechargeTimeStop; + String rechargeTimeStart = queryVo.rechargeTimeStart; + String rechargeTimeStop = queryVo.rechargeTimeStop; if(rechargeTimeStart != null) { - rechargeTimeStart = LocalDateTime.parse(df.format(rechargeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + rechargeTimeStart = rechargeTimeStart + " 00:00:00"; queryVo.setRechargeTimeStart(rechargeTimeStart); } - if(rechargeTimeStop != null) { - rechargeTimeStop = LocalDateTime.parse(df.format(rechargeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + rechargeTimeStop = rechargeTimeStop + " 23:59:59"; queryVo.setRechargeTimeStop(rechargeTimeStop); } - Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); @@ -56,6 +50,7 @@ QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>() ; rsVo.pageSize = queryVo.pageSize ; rsVo.pageCurr = queryVo.pageCurr ; + rsVo.calculateAndSet(itemTotal, params); rsVo.obj = seRechargeMapper.getRecharges(params); return rsVo ; @@ -82,15 +77,15 @@ /** * 鏍规嵁姘村崱缂栧彿鍒犻櫎鍏呭�艰褰� - * @param cardNum + * @param cardId * @return */ - //public Integer deleteByCardId(Long cardId) { - // return seRechargeMapper.deleteByCardId(cardId); - //} - public Integer deleteByCardNum(String cardNum) { - return seRechargeMapper.deleteByCardNum(cardNum); + public Integer deleteByCardId(Long cardId) { + return seRechargeMapper.deleteByCardId(cardId); } + //public Integer deleteByCardNum(String cardNum) { + // return seRechargeMapper.deleteByCardNum(cardNum); + //} /** * 娣诲姞鍏呭�煎巻鍙茶〃 -- Gitblit v1.8.0