From d276b2f67315e638b6596b48da1b6f9ac01dd69b Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期六, 27 一月 2024 08:58:28 +0800 Subject: [PATCH] 修改取水口查询ID类型 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 90 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 84 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java index e019024..b6b2a94 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java @@ -10,14 +10,10 @@ import com.dy.pipIrrGlobal.daoSe.SeClientMapper; import com.dy.pipIrrGlobal.pojoSe.SeCardOperate; import com.dy.pipIrrGlobal.pojoSe.SeClientCard; -import com.dy.pipIrrGlobal.voSe.VoRecharge; -import com.dy.pipIrrGlobal.voSe.VoTransaction; -import com.dy.pipIrrGlobal.voSe.VoTransactionStatistics; +import com.dy.pipIrrGlobal.voSe.*; import com.dy.pipIrrSell.cardOperate.dto.DtoRecharge; import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM; -import com.dy.pipIrrSell.cardOperate.qo.QoRecharge; -import com.dy.pipIrrSell.cardOperate.qo.QoTransaction; -import com.dy.pipIrrSell.cardOperate.qo.QoTransactionStatistics; +import com.dy.pipIrrSell.cardOperate.qo.*; import com.dy.pipIrrSell.clientCard.ClientCardSv; import com.dy.pipIrrSell.clientCard.LastOperateENUM; import com.dy.pipIrrSell.result.SellResultCode; @@ -385,4 +381,86 @@ return map_result; } + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰� + * @param queryVo + * @return + */ + public QueryResultVo<List<VoActiveCardNew>> getActiveCards(QoActiveCard queryVo) { + //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿 + String activeTimeStart = queryVo.activeTimeStart; + String activeTimeStop = queryVo.activeTimeStop; + if(activeTimeStart != null) { + activeTimeStart = activeTimeStart + " 00:00:00"; + queryVo.setActiveTimeStart(activeTimeStart); + } + if(activeTimeStop != null) { + activeTimeStop = activeTimeStop + " 23:59:59"; + queryVo.setActiveTimeStop(activeTimeStop); + } + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + + Long itemTotal = seCardOperateMapper.getActiveCardRecordCount(params); + + QueryResultVo<List<VoActiveCardNew>> rsVo = new QueryResultVo<>() ; + Integer pageCurr = 0; + Integer pageSize = 10000; + rsVo.pageCurr = 1; + rsVo.pageSize = 10000; + if(queryVo.pageSize != null && queryVo.pageCurr != null) { + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr; + pageSize = queryVo.pageSize ; + pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString()); + } + params.put("pageCurr", pageCurr); + params.put("pageSize", pageSize); + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = seCardOperateMapper.getActiveCards(params); + return rsVo ; + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇琛ュ崱璁板綍 + * @param queryVo + * @return + */ + public QueryResultVo<List<VoReissueCard>> getReissueCards(QoReissueCard queryVo) { + //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿 + String reissueCardTimeStart = queryVo.reissueCardTimeStart; + String reissueCardTimeStop = queryVo.reissueCardTimeStop; + if(reissueCardTimeStart != null) { + reissueCardTimeStart = reissueCardTimeStart + " 00:00:00"; + queryVo.setReissueCardTimeStart(reissueCardTimeStart); + } + if(reissueCardTimeStop != null) { + reissueCardTimeStop = reissueCardTimeStop + " 23:59:59"; + queryVo.setReissueCardTimeStop(reissueCardTimeStop); + } + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + + Long itemTotal = seCardOperateMapper.getReissueCardRecordCount(params); + + QueryResultVo<List<VoReissueCard>> rsVo = new QueryResultVo<>() ; + Integer pageCurr = 0; + Integer pageSize = 10000; + rsVo.pageCurr = 1; + rsVo.pageSize = 10000; + if(queryVo.pageSize != null && queryVo.pageCurr != null) { + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr; + pageSize = queryVo.pageSize ; + pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString()); + } + params.put("pageCurr", pageCurr); + params.put("pageSize", pageSize); + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = seCardOperateMapper.getReissueCards(params); + return rsVo ; + } } -- Gitblit v1.8.0