pipIrr-SV.git - Gitblit

			@@ -231,7 +231,6 @@
			return rsVo ;
			}


			/**
			* 根据指定条件获取交易记录
			* @param vo
			@@ -291,7 +290,7 @@
			* @param queryVo
			* @return
			*/
			public QueryResultVo<List<VoActiveCardNew>> getActiveCards(QoActiveCard queryVo) {
			public QueryResultVo<List<VoActiveCard>> getActiveCards(QoActiveCard queryVo) {
			//完善查询充值记录的起止时间
			String activeTimeStart = queryVo.activeTimeStart;
			String activeTimeStop = queryVo.activeTimeStop;
			@@ -308,7 +307,7 @@

			Long itemTotal = seCardOperateMapper.getActiveCardRecordCount(params);

			QueryResultVo<List<VoActiveCardNew>> rsVo = new QueryResultVo<>() ;
			QueryResultVo<List<VoActiveCard>> rsVo = new QueryResultVo<>() ;

			rsVo.pageSize = queryVo.pageSize ;
			rsVo.pageCurr = queryVo.pageCurr ;
			@@ -351,6 +350,38 @@
			}

			/**
			* 根据指定条件获取IC卡注销记录
			* @param queryVo
			* @return
			*/
			public QueryResultVo<List<VoOperate>> getCommonOperations(QoCommonOperate queryVo) {
			//完善查询充值记录的起止时间
			String timeStart = queryVo.getTimeStart();
			String timeStop = queryVo.getTimeStop();
			if(timeStart != null) {
			timeStart = timeStart + " 00:00:00";
			queryVo.setTimeStart(timeStart);
			}
			if(timeStop != null) {
			timeStop = timeStop + " 23:59:59";
			queryVo.setTimeStop(timeStop);
			}

			Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);

			Long itemTotal = Optional.ofNullable(seCardOperateMapper.getCommonOperationRecordCount(params)).orElse(0L);

			QueryResultVo<List<VoOperate>> rsVo = new QueryResultVo<>() ;

			rsVo.pageSize = queryVo.pageSize ;
			rsVo.pageCurr = queryVo.pageCurr ;

			rsVo.calculateAndSet(itemTotal, params);
			rsVo.obj = seCardOperateMapper.getCommonOperations(params);
			return rsVo ;
			}

			/**
			* 根据指定条件获取收据列表
			* @param queryVo
			* @return