From 6b90436a61338d46282bf724e445e90af80461e1 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 27 十二月 2023 10:34:25 +0800
Subject: [PATCH] 2023-12-27 朱宝民 增加了交易记录查询 使分页具有兼容性
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java | 17 +
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java | 15 +
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java | 19 +-
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryOperate.java | 34 ++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 79 +++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java | 15 +
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java | 84 +++++++++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoOperate.java | 66 ++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java | 32 +--
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java | 44 +++++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java | 15 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java | 22 ++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java | 33 +--
13 files changed, 398 insertions(+), 77 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java
index a385e4a..e3a16e1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.pipIrrGlobal.voSe.VoClient;
+import com.dy.pipIrrGlobal.voSe.VoOperate;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -90,4 +91,25 @@
* @return
*/
List<Map<String, Object>> getWaterTypes();
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璐按姹囨�诲拰璐崱姹囨��
+ * @param params 缁熻鏉′欢
+ * @return 璐按閲戦銆佽喘鍗￠噾棰�
+ */
+ Map getSums(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鎿嶄綔璁板綍鏁�
+ * @param params 鏌ヨ鏉′欢
+ * @return 绗﹀悎鏉′欢鐨勮褰曟暟
+ */
+ Long getOperateRecordCount(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鎿嶄綔璁板綍
+ * @param params 鏌ヨ鏉′欢
+ * @return 绗﹀悎鏉′欢鐨勪氦鏄撹褰�
+ */
+ List<VoOperate> getOperates(Map<?, ?> params);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoOperate.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoOperate.java
new file mode 100644
index 0000000..711ea95
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoOperate.java
@@ -0,0 +1,66 @@
+package com.dy.pipIrrGlobal.voSe;
+
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2023-12-26 20:44
+ * @LastEditTime 2023-12-26 20:44
+ * @Description
+ */
+
+@Data
+@Schema(title = "鎿嶄綔璁板綍瑙嗗浘瀵硅薄")
+public class VoOperate implements BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(title = "鏉慖D")
+ private Long villageId;
+
+ @Schema(title = "鍖哄垝鍚嶇О涓�")
+ private String districtTitle;
+
+ @Schema(title = "鍐滄埛缂栧彿")
+ private String clientNum;
+
+ @Schema(title = "鍐滄埛濮撳悕")
+ private String name;
+
+ @Schema(title = "姘村崱缂栧彿")
+ private Long cardNum;
+
+ @Schema(title = "韬唤璇佸彿")
+ private String idCard;
+
+ @Schema(title = "鎵嬫満鍙�")
+ private String phone;
+
+ @Schema(title = "鍏呭�奸噾棰�")
+ private Float money;
+
+ @Schema(title = "璐崱閲戦")
+ private Integer cardCost;
+
+ @Schema(title = "鏀粯鏂瑰紡缂栧彿")
+ private Long paymentId;
+
+ @Schema(title = "鏀粯鏂瑰紡鍚嶇О")
+ private String paymentMethod;
+
+ @Schema(title = "涓氬姟绫诲瀷")
+ private String operateType;
+
+ @Schema(title = "浜ゆ槗鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date operateDt;
+
+ @Schema(title = "鎿嶄綔鍛�")
+ private String operatorName;
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
index 1853fa8..af1d534 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -398,4 +398,83 @@
<select id="getWaterTypes" resultType="java.util.Map">
SELECT id, typeName from se_water_type
</select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璐按姹囨�诲拰璐崱姹囨��-->
+ <select id="getSums" resultType="java.util.Map">
+ SELECT
+ SUM(money) AS money,
+ SUM(cardCost) AS cardCost
+ FROM v_operate
+ <where>
+ <if test = "villageId != null and villageId > 0">
+ AND villageId = ${villageId}
+ </if>
+
+ <if test = "paymentId != null and paymentId >0">
+ AND paymentId = ${paymentId}
+ </if>
+
+ <if test = "operateTimeStart != null and operateTimeStop != null">
+ AND operateDt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍鏁�-->
+ <select id="getOperateRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM v_operate
+ <where>
+ <if test = "villageId != null and villageId > 0">
+ AND villageId = ${villageId}
+ </if>
+
+ <if test = "paymentId != null and paymentId >0">
+ AND paymentId = ${paymentId}
+ </if>
+
+ <if test = "operateTimeStart != null and operateTimeStop != null">
+ AND operateDt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍-->
+ <select id="getOperates" resultType="com.dy.pipIrrGlobal.voSe.VoOperate">
+ SELECT
+ villageId,
+ districtTitle,
+ clientNum,
+ `name`,
+ cardNum,
+ idCard,
+ phone,
+ money,
+ cardCost,
+ paymentId,
+ paymentMethod,
+ operateType,
+ operateDt,
+ operatorName
+ FROM v_operate
+ <where>
+ <if test = "villageId != null and villageId > 0">
+ AND villageId = ${villageId}
+ </if>
+
+ <if test = "paymentId != null and paymentId >0">
+ AND paymentId = ${paymentId}
+ </if>
+
+ <if test = "operateTimeStart != null and operateTimeStop != null">
+ AND operateDt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
+ </if>
+ </where>
+ ORDER BY operateDt
+ <if test="pageCurr != null and pageSize != null">
+ LIMIT ${pageCurr}, ${pageSize}
+ </if>
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
index 26a5dc4..71bafef 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
@@ -47,14 +47,23 @@
public QueryResultVo<List<VoDivide>> getDivides(QueryVo queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ // 璁＄畻绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = prDivideMapper.getRecordCount(params);
QueryResultVo<List<VoDivide>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- //rsVo.pageCurr = queryVo.pageCurr ;
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+
+ 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);
- rsVo.pageCurr = pageCurr;
+ params.put("pageSize", pageSize);
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = prDivideMapper.getDivides(params);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
index 3cf24b1..2d55567 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
@@ -11,7 +11,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -39,29 +38,12 @@
public QueryResultVo<List<VoActiveCard>> getActiveCards(QueryVo queryVo) {
//瀹屽杽鏌ヨ寮�鍗¤褰曠殑璧锋鏃堕棿
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
- //LocalDateTime activeTimeStart = queryVo.activeTimeStart;
- //LocalDateTime activeTimeStop = queryVo.activeTimeStop;
-
- //if(activeTimeStart != null) {
- // activeTimeStart = LocalDateTime.parse(df.format(activeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- // queryVo.setActiveTimeStart(activeTimeStart);
- //}
-
- //if(activeTimeStop != null) {
- // activeTimeStop = LocalDateTime.parse(df.format(activeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- // queryVo.setActiveTimeStop(activeTimeStop);
- //}
-
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);
@@ -72,11 +54,18 @@
Long itemTotal = seActiveCardMapper.getRecordCount(params);
QueryResultVo<List<VoActiveCard>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- //rsVo.pageCurr = queryVo.pageCurr ;
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+ 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);
- rsVo.pageCurr = pageCurr;
+ params.put("pageSize", pageSize);
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seActiveCardMapper.getActiveCards(params);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java
index 179dcc9..1c83f8a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java
@@ -9,7 +9,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -28,15 +27,12 @@
public QueryResultVo<List<VoCancel>> getCancels(QueryVo queryVo) {
//瀹屽杽鏌ヨ娉ㄩ攢璁板綍鐨勮捣姝㈡椂闂�
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
String cancelTimeStart = queryVo.cancelTimeStart;
String cancelTimeStop = queryVo.cancelTimeStop;
if(cancelTimeStart != null) {
cancelTimeStart = cancelTimeStart + " 00:00:00";
queryVo.setCancelTimeStart(cancelTimeStart);
}
-
if(cancelTimeStop != null) {
cancelTimeStop = cancelTimeStop + " 23:59:59";
queryVo.setCancelTimeStop(cancelTimeStop);
@@ -47,11 +43,18 @@
Long itemTotal = seCancelMapper.getRecordCount(params);
QueryResultVo<List<VoCancel>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- //rsVo.pageCurr = queryVo.pageCurr ;
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+ 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);
- rsVo.pageCurr = pageCurr;
+ params.put("pageSize", pageSize);
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seCancelMapper.getCancels(params);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
index 2a064e4..f115542 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
@@ -40,6 +40,11 @@
public class ClientCtrl {
private final ClientSv clientSv;
+ /**
+ * 鑾峰彇鍐滄埛鍒楄〃
+ * @param vo
+ * @return
+ */
@Operation(summary = "鑾峰緱涓�椤靛啘鎴�", description = "杩斿洖涓�椤靛啘鎴锋暟鎹�")
@ApiResponses(value = {
@ApiResponse(
@@ -61,6 +66,37 @@
}
}
+ /**
+ * 鑾峰彇浜ゆ槗璁板綍
+ * @param vo
+ * @return
+ */
+ @Operation(summary = "鑾峰緱涓�椤典氦鏄撹褰�", description = "杩斿洖涓�椤典氦鏄撹褰�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaClient.class))}
+ )
+ })
+ @GetMapping(path = "getOperates")
+ @SsoAop()
+ public BaseResponse<Map> getOperates(QueryOperate vo){
+ try {
+ Map res = clientSv.getOperates(vo);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨ浜ゆ槗璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
+ * 鏍规嵁涓婚敭鑾峰彇涓�涓啘鎴峰璞�
+ * @param id
+ * @return
+ */
@Operation(summary = "鑾峰緱涓�涓啘鎴�", description = "杩斿洖涓�涓啘鎴锋暟鎹�")
@ApiResponses(value = {
@ApiResponse(
@@ -83,6 +119,12 @@
}
+ /**
+ * 娣诲姞涓�涓啘鎴峰璞�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
@Operation(summary = "娣诲姞鍐滄埛璁板綍", description = "娣诲姞鍐滄埛璁板綍")
@ApiResponses(value = {
@ApiResponse(
@@ -188,7 +230,7 @@
}
/**
- * 淇敼鍐滄埛瀵硅薄 铏氭嫙鍗″彿銆佺姝㈡爣蹇椼�侀�昏緫鍒犻櫎鏍囪瘑涓嶅弬涓庝慨鏀�
+ * 淇敼鍐滄埛瀵硅薄锛堣櫄鎷熷崱鍙枫�佺姝㈡爣蹇椼�侀�昏緫鍒犻櫎鏍囪瘑涓嶅弬涓庝慨鏀癸級
* @param po 鍐滄埛瀵硅薄
* @param bindingResult
* @return
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java
index f85e870..3d58466 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java
@@ -5,13 +5,16 @@
import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.pipIrrGlobal.voSe.VoClient;
+import com.dy.pipIrrGlobal.voSe.VoOperate;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
/**
* @author ZhuBaoMin
@@ -31,21 +34,26 @@
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛鏁版嵁
- * @param vo
+ * @param queryVo
* @return
*/
- public QueryResultVo<List<VoClient>> getClients(QueryVo vo){
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
+ public QueryResultVo<List<VoClient>> getClients(QueryVo queryVo){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
Long itemTotal = seClientMapper.getRecordCount(params);
QueryResultVo<List<VoClient>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = vo.pageSize ;
- //rsVo.pageCurr = vo.pageCurr ;
-
-
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+ 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);
- rsVo.pageCurr = pageCurr;
+ params.put("pageSize", pageSize);
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seClientMapper.getClients(params);
@@ -54,6 +62,64 @@
}
/**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍
+ * @param vo
+ * @return
+ */
+ public Map getOperates(QueryOperate vo){
+ // 琛ラ綈鏌ヨ鏃堕棿
+ String operateTimeStart = vo.operateTimeStart;
+ String operateTimeStop = vo.operateTimeStop;
+ if(operateTimeStart != null) {
+ operateTimeStart = operateTimeStart + " 00:00:00";
+ vo.setOperateTimeStart(operateTimeStart);
+ }
+ if(operateTimeStop != null) {
+ operateTimeStop = operateTimeStop + " 23:59:59";
+ vo.setOperateTimeStop(operateTimeStop);
+ }
+
+ // 鐢熸垚鏌ヨ鍙傛暟
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
+
+ // 鑾峰彇姹囨�荤殑璐按閲戦銆佽喘鍗￠噾棰�
+ Float money = 0f;
+ Float cardCost = 0f;
+ Map map_sum = Optional.ofNullable(seClientMapper.getSums(params)).orElse(new HashMap());
+ if(map_sum.size() > 0) {
+ money = Float.parseFloat(map_sum.get("money").toString());
+ cardCost = Float.parseFloat(map_sum.get("cardCost").toString());
+ }
+
+ // 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
+ Long itemTotal = seClientMapper.getOperateRecordCount(params);
+
+ Integer pageSize = vo.getPageSize();
+ // 璁＄畻鎬婚〉鏁�
+ Integer pageTotal ;
+ pageTotal = (int)Math.ceil((itemTotal==null?0.0D:itemTotal.doubleValue())/pageSize);
+
+ // 鏍规嵁褰撳墠椤电爜鍙婃瘡椤垫暟閲忚绠楀亸绉婚噺
+ Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+ params.put("pageCurr", pageCurr);
+
+ List<VoOperate> lit = seClientMapper.getOperates(params);
+ Map map_record = new HashMap();
+ map_record.put("itemTotal", itemTotal);
+ map_record.put("pageCurr", vo.pageCurr);
+ map_record.put("pageSize", pageSize);
+ map_record.put("pageTotal", pageTotal);
+ map_record.put("list", lit);
+
+ Map map_result = new HashMap();
+ map_result.put("money", money);
+ map_result.put("cardCost", cardCost);
+ map_result.put("records", map_record);
+
+ return map_result;
+ }
+
+ /**
* 鏍规嵁涓婚敭鑾峰彇鍐滄埛瀵硅薄
* @param id 鍐滄埛涓婚敭
* @return 鍐滄埛瀵硅薄
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryOperate.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryOperate.java
new file mode 100644
index 0000000..628bcd6
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryOperate.java
@@ -0,0 +1,34 @@
+package com.dy.pipIrrSell.client;
+
+import com.dy.common.webUtil.QueryConditionVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2023-12-26 21:00
+ * @LastEditTime 2023-12-26 21:00
+ * @Description
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(name = "浜ゆ槗鏌ヨ鏉′欢")
+public class QueryOperate extends QueryConditionVo {
+
+ @Schema(description = "鏉慖D")
+ public Long villageId;
+
+ @Schema(description = "鏀粯鏂瑰紡缂栧彿")
+ public Long paymentId;
+
+ @Schema(description = "浜ゆ槗鏌ヨ璧峰鏃堕棿")
+ public String operateTimeStart;
+
+ @Schema(description = "浜ゆ槗鏌ヨ鎴鏃堕棿")
+ public String operateTimeStop;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
index 56daf31..df6dc20 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
@@ -59,11 +59,18 @@
Long itemTotal = seLossMapper.getRecordCount(params);
QueryResultVo<List<VoLoss>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- //rsVo.pageCurr = queryVo.pageCurr ;
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+ 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);
- rsVo.pageCurr = pageCurr;
+ params.put("pageSize", pageSize);
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seLossMapper.getLosses(params);
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 b790900..10baa78 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,7 +11,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -33,43 +32,34 @@
public QueryResultVo<List<VoRecharge>> getRecharges(QueryVo queryVo) {
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
- //LocalDateTime rechargeTimeStart = queryVo.rechargeTimeStart;
- //LocalDateTime rechargeTimeStop = queryVo.rechargeTimeStop;
- //if(rechargeTimeStart != null) {
- // rechargeTimeStart = LocalDateTime.parse(df.format(rechargeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- // queryVo.setRechargeTimeStart(rechargeTimeStart);
- //}
- //
- //if(rechargeTimeStop != null) {
- // rechargeTimeStop = LocalDateTime.parse(df.format(rechargeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- // queryVo.setRechargeTimeStop(rechargeTimeStop);
- //}
-
String rechargeTimeStart = queryVo.rechargeTimeStart;
String rechargeTimeStop = queryVo.rechargeTimeStop;
if(rechargeTimeStart != null) {
rechargeTimeStart = rechargeTimeStart + " 00:00:00";
queryVo.setRechargeTimeStart(rechargeTimeStart);
}
-
if(rechargeTimeStop != null) {
rechargeTimeStop = rechargeTimeStop + " 23:59:59";
queryVo.setRechargeTimeStop(rechargeTimeStop);
}
-
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
Long itemTotal = seRechargeMapper.getRecordCount(params);
QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- //rsVo.pageCurr = queryVo.pageCurr ;
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+ 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);
- rsVo.pageCurr = pageCurr;
+ params.put("pageSize", pageSize);
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seRechargeMapper.getRecharges(params);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java
index 4d81693..ad5362a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java
@@ -47,11 +47,18 @@
Long itemTotal = seReversalMapper.getRecordCount(params);
QueryResultVo<List<VoReversal>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- //rsVo.pageCurr = queryVo.pageCurr ;
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+ 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);
- rsVo.pageCurr = pageCurr;
+ params.put("pageSize", pageSize);
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seReversalMapper.getReversals(params);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java
index c7d92c9..4e42110 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java
@@ -47,11 +47,18 @@
Long itemTotal = seUnlockMapper.getRecordCount(params);
QueryResultVo<List<VoUnlock>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- //rsVo.pageCurr = queryVo.pageCurr ;
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+ 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);
- rsVo.pageCurr = pageCurr;
+ params.put("pageSize", pageSize);
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seUnlockMapper.getUnlocks(params);
--
Gitblit v1.8.0