From 080edcadaec99063016531f1aa3e623b062d3c9b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 15:22:32 +0800
Subject: [PATCH] 骑行记录表优化和导出
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 94 ++++++------------
/dev/null | 32 ------
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 60 ++---------
server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java | 27 ++--
server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java | 18 +++
server/services/src/main/java/com/doumee/service/business/MemberRidesService.java | 2
server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java | 24 +++-
server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java | 42 ++++++++
8 files changed, 137 insertions(+), 162 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java b/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java
index 9f48591..b851e02 100644
--- a/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java
@@ -6,9 +6,12 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.vo.GoodsorderExportVO;
+import com.doumee.dao.business.web.request.MemberRidesQuery;
+import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
-import com.doumee.dao.business.web.response.MemberRidesQuery;
import com.doumee.service.business.MemberRidesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -83,6 +86,19 @@
ExcelExporter.build(MemberRidesDTO.class).export(memberRidesService.findPage(pageWrap).getRecords(), "鐢ㄦ埛楠戣璁板綍琛�", response);
}
+ @ApiOperation("鐢ㄦ埛楠戣璁板綍瀵煎嚭excel")
+ @PostMapping("/exportMemberRidesExcel")
+ @RequiresPermissions("business:memberrides:exportExcel")
+ public void exportMemberRidesExcel (@RequestBody PageWrap<MemberRidesQuery> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(MemberRidesDTO.class).exportWithFirstAndEnd(memberRidesService.findPage(pageWrap).getRecords(),"鐢ㄦ埛楠戣璁板綍_"+System.currentTimeMillis(),"鐢ㄦ埛楠戣璁板綍_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+ }
+ @ApiOperation("杞﹁締鍙栬繕璁板綍瀵煎嚭excel")
+ @PostMapping("/exportBikeLogExcel")
+ @RequiresPermissions("business:memberrides:exportExcel")
+ public void exportBikeLogExcel (@RequestBody PageWrap<MemberRidesQuery> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(BikeLogDTO.class).exportWithFirstAndEnd(memberRidesService.findBikeLog(pageWrap).getRecords(),"杞﹁締鍙栬繕璁板綍_"+System.currentTimeMillis(),"杞﹁締鍙栬繕璁板綍_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+ }
+
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:memberrides:query")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
index dd62879..60fc871 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -6,6 +6,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+
import java.util.Date;
import java.math.BigDecimal;
@@ -20,168 +22,134 @@
public class MemberRides {
@ApiModelProperty(value = "缂栫爜")
- @ExcelColumn(name="缂栫爜")
private String id;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
- @ExcelColumn(name="鍒涘缓浜�")
private String creator;
@ApiModelProperty(value = "缂栬緫鏃堕棿")
- @ExcelColumn(name="缂栬緫鏃堕棿")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
- @ExcelColumn(name="缂栬緫浜�")
private String editor;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
@TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String info;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜")
- @ExcelColumn(name="鐢ㄦ埛缂栫爜")
private String memberId;
@ApiModelProperty(value = "鐢ㄦ埛OpenId")
- @ExcelColumn(name="鐢ㄦ埛OpenId")
+ @ExcelColumn(name="鐢ㄦ埛",index = 1,width = 10,align = HorizontalAlignment.CENTER)
@TableField(exist = false)
private String memberOpenid;
@ApiModelProperty(value = "杞﹁締缂栫爜")
- @ExcelColumn(name="杞﹁締缂栫爜")
+ @ExcelColumn(name="杞﹁締缂栫爜",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String bikeCode;
@ApiModelProperty(value = "褰撳墠璐︽埛浣欓")
- @ExcelColumn(name="褰撳墠璐︽埛浣欓")
private BigDecimal balance;
@ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜")
- @ExcelColumn(name="杞﹁締绫诲瀷缂栫爜")
private String paramId;
@ApiModelProperty(value = "杞﹁締绫诲瀷鍚嶇О")
- @ExcelColumn(name="杞﹁締绫诲瀷鍚嶇О")
+ @ExcelColumn(name="杞﹁締绫诲瀷",index = 3,width = 10,align = HorizontalAlignment.CENTER)
@TableField(exist = false)
private String paramName;
@ApiModelProperty(value = "绉熻溅绔欑偣缂栫爜")
- @ExcelColumn(name="绉熻溅绔欑偣缂栫爜")
+ @ExcelColumn(name="绉熻溅绔欑偣",index = 4,width = 10,align = HorizontalAlignment.CENTER)
private String rentSiteId;
@ApiModelProperty(value = "绉熻溅閿佸ご缂栫爜")
- @ExcelColumn(name="绉熻溅閿佸ご缂栫爜")
+ @ExcelColumn(name="绉熻溅閿佸叿",index = 5,width = 10,align = HorizontalAlignment.CENTER)
private String rentLockId;
@ApiModelProperty(value = "绉熻溅鏃堕棿")
- @ExcelColumn(name="绉熻溅鏃堕棿")
- //@JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="绉熻溅鏃堕棿",index = 6,width = 10,align = HorizontalAlignment.CENTER)
private Date rentDate;
@ApiModelProperty(value = "绉熻溅鎸囦护缂栫爜")
- @ExcelColumn(name="绉熻溅鎸囦护缂栫爜")
private String rentCommondD;
@ApiModelProperty(value = "杩樿溅绔欑偣缂栫爜")
- @ExcelColumn(name="杩樿溅绔欑偣缂栫爜")
+ @ExcelColumn(name="褰掕繕绔欑偣",index = 7,width = 10,align = HorizontalAlignment.CENTER)
private String backSiteId;
@ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
- @ExcelColumn(name="杩樿溅閿佸ご缂栫爜")
+ @ExcelColumn(name="褰掕繕閿佸叿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
private String backLockId;
@ApiModelProperty(value = "杩樿溅鏃堕棿")
- @ExcelColumn(name="杩樿溅鏃堕棿")
- //@JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="褰掕繕鏃堕棿",index = 9,width = 10,align = HorizontalAlignment.CENTER))
private Date backDate;
@ApiModelProperty(value = "杩樿溅鎸囦护缂栫爜")
- @ExcelColumn(name="杩樿溅鎸囦护缂栫爜")
private String backCommondId;
@ApiModelProperty(value = "璧锋浠�")
- @ExcelColumn(name="璧锋浠�")
private BigDecimal basePrice;
@ApiModelProperty(value = "璧锋浠锋椂闂�")
- @ExcelColumn(name="璧锋浠锋椂闂�")
private Integer baseTime;
@ApiModelProperty(value = "瓒呭嚭鍗曚环")
- @ExcelColumn(name="瓒呭嚭鍗曚环")
private BigDecimal unitPrice;
@ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅")
- @ExcelColumn(name="瓒呭嚭鏃堕棿鍗曚綅")
private Integer unitTime;
@ApiModelProperty(value = "楠戣浠锋牸")
- @ExcelColumn(name="楠戣浠锋牸")
private BigDecimal price;
@ApiModelProperty(value = "楠戣瀹為檯浠锋牸")
- @ExcelColumn(name="楠戣瀹為檯浠锋牸")
private BigDecimal actualPrice;
@ApiModelProperty(value = "楠戣璁¤垂鏃堕暱")
- @ExcelColumn(name="楠戣璁¤垂鏃堕暱")
+// @ExcelColumn(name="楠戣璁¤垂鏃堕暱",index = 1,width = 10,align = HorizontalAlignment.CENTER)
private Integer duration;
@ApiModelProperty(value = "缁撶畻鏃堕棿")
- @ExcelColumn(name="缁撶畻鏃堕棿")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date closeDate;
@ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�")
- @ExcelColumn(name="缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�")
private Integer closeStatus;
+ @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
+ private Integer status;
@ApiModelProperty(value = "鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
- @ExcelColumn(name="鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
private String ordreId;
@ApiModelProperty(value = "鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�")
- @ExcelColumn(name="鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�")
private Integer isStandard;
@ApiModelProperty(value = "璁′环鏂规缂栫爜(鍏宠仈pricing_detail)")
- @ExcelColumn(name="璁′环鏂规缂栫爜(鍏宠仈pricing_detail)")
private String pricingDetailId;
@ApiModelProperty(value = "鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�")
- @ExcelColumn(name="鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�")
private String isHoliday;
- @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
- @ExcelColumn(name="鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
- private Integer status;
@ApiModelProperty(value = "杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
- @ExcelColumn(name="杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
private Integer backType;
@ApiModelProperty(value = "杩樿溅鍘熷洜")
- @ExcelColumn(name="杩樿溅鍘熷洜")
private String backReason;
@ApiModelProperty(value = "杩樿溅澶囨敞")
- @ExcelColumn(name="杩樿溅澶囨敞")
private String backInfo;
@ApiModelProperty(value = "寮哄埗杩樿溅鎿嶄綔浜�(鍏宠仈system_user)")
- @ExcelColumn(name="寮哄埗杩樿溅鎿嶄綔浜�(鍏宠仈system_user)")
private String backUserid;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java b/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
new file mode 100644
index 0000000..9aa5f4d
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
@@ -0,0 +1,42 @@
+package com.doumee.dao.business.web.request;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("鍙栬溅杩樿溅璁板綍璇锋眰鍙傛暟")
+public class MemberRidesQuery {
+
+ @ApiModelProperty(value = "鐢ㄦ埛OpenID")
+ @ExcelColumn(name="鐢ㄦ埛",index = 1,width = 10,align = HorizontalAlignment.CENTER)
+ private String openid;
+
+ @ApiModelProperty(value = "杞﹁締缂栧彿")
+ @ExcelColumn(name="杞﹁締缂栧彿",index = 2,width = 10,align = HorizontalAlignment.CENTER)
+ private String bikeCode;
+
+ @ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�")
+ @ExcelColumn(name="缁撶畻鐘舵�� ", valueMapping = "0=鏈粨绠�;1=宸茬粨绠�;" ,index = 3,width = 10,align = HorizontalAlignment.CENTER)
+ private Integer closeStatus;
+
+ @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
+ @ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER)
+ private Integer status;
+
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿璧峰")
+ private Date rentDateStart;
+
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿缁撴潫")
+ private Date rentDateEnd;
+
+ @ApiModelProperty(value = "鏄惁褰掕繕 [杞﹁締鍙栬繕璁板綍(绔欑偣) 鍏ュ弬]")
+ private Boolean hasBack;
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
index 920336a..2f60567 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
@@ -3,6 +3,7 @@
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
import java.util.Date;
@@ -13,44 +14,42 @@
public class BikeLogDTO {
@ApiModelProperty(value = "鐢ㄦ埛OpenID")
+ @ExcelColumn(name="鐢ㄦ埛",index = 1,width = 10,align = HorizontalAlignment.CENTER)
private String openid;
@ApiModelProperty(value = "杞﹁締缂栧彿")
+ @ExcelColumn(name="杞﹁締缂栧彿",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String bikeCode;
@ApiModelProperty(value = "杞﹁締绫诲瀷")
+ @ExcelColumn(name="杞﹁締绫诲瀷",index = 3,width = 10,align = HorizontalAlignment.CENTER)
private String bikeType;
@ApiModelProperty(value = "绉熻溅绔欑偣缂栫爜")
+ @ExcelColumn(name="鍊熷嚭绔欑偣",index = 4,width = 10,align = HorizontalAlignment.CENTER)
private String rentSiteId;
- @ApiModelProperty(value = "绉熻溅绔欑偣缂栫爜")
- private String rentSiteName;
-
@ApiModelProperty(value = "绉熻溅閿佸ご缂栫爜")
+ @ExcelColumn(name="鍊熷嚭閿佸叿",index = 6,width = 10,align = HorizontalAlignment.CENTER)
private String rentLockId;
- @ApiModelProperty(value = "绉熻溅閿佸ご缂栫爜")
- private String rentLockName;
-
@ApiModelProperty(value = "楠戣鏃堕暱")
+ @ExcelColumn(name="楠戣鏃堕暱",index = 8,width = 10,align = HorizontalAlignment.CENTER)
private Integer rideTime;
- @ApiModelProperty(value = "绉熻溅鏃堕棿")
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿")
+ @ExcelColumn(name="鍊熷嚭鏃堕棿",index = 9,width = 10,align = HorizontalAlignment.CENTER)
private Date rentDate;
- @ApiModelProperty(value = "杩樿溅绔欑偣缂栫爜")
+ @ApiModelProperty(value = "杩樿溅绔欑偣")
+ @ExcelColumn(name="褰掕繕绔欑偣",index = 10,width = 10,align = HorizontalAlignment.CENTER)
private String backSiteId;
- @ApiModelProperty(value = "杩樿溅绔欑偣缂栫爜")
- private String backSiteName;
-
@ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
+ @ExcelColumn(name="褰掕繕閿佸叿",index = 12,width = 10,align = HorizontalAlignment.CENTER)
private String backLockId;
- @ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
- private String backLockName;
-
@ApiModelProperty(value = "杩樿溅鏃堕棿")
+ @ExcelColumn(name="杩樿溅鏃堕棿",index = 14,width = 10,align = HorizontalAlignment.CENTER)
private Date backDate;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java
index 5f4db32..9452341 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java
@@ -1,8 +1,10 @@
package com.doumee.dao.business.web.response;
import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
import java.util.Date;
@@ -10,32 +12,42 @@
* @author T14
*/
@Data
+@ApiModel("楠戣璁板綍杩斿洖")
public class MemberRidesDTO {
@ApiModelProperty(value = "鐢ㄦ埛OpenID")
+ @ExcelColumn(name="鐢ㄦ埛",index = 1,width = 10,align = HorizontalAlignment.CENTER)
private String openid;
@ApiModelProperty(value = "杞﹁締缂栧彿")
+ @ExcelColumn(name="杞﹁締缂栧彿",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String bikeCode;
- @ApiModelProperty(value = "鏄惁缁撶畻")
- private Integer status;
-
@ApiModelProperty(value = "杞﹁締绫诲瀷")
- @ExcelColumn(name="杞﹁締绫诲瀷")
+ @ExcelColumn(name="杞﹁締绫诲瀷",index = 3,width = 10,align = HorizontalAlignment.CENTER)
private String bikeType;
+ @ExcelColumn(name="缁撶畻鐘舵�� ", valueMapping = "0=鏈粨绠�;1=宸茬粨绠�;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER)
+ private Integer closeStatus;
+
+ @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
+ @ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,index = 5,width = 10,align = HorizontalAlignment.CENTER)
+ private Integer status;
+
@ApiModelProperty(value = "楠戣鏃堕暱")
+ @ExcelColumn(name="楠戣鏃堕暱锛堝垎)",index = 6,width = 10,align = HorizontalAlignment.CENTER)
private Integer rideTime;
@ApiModelProperty(value = "璁¤垂鏃堕暱")
+ @ExcelColumn(name="璁¤垂鏃堕暱锛堝垎)",index = 7,width = 10,align = HorizontalAlignment.CENTER)
private Integer duration;
- @ApiModelProperty(value = "绉熻溅鏃堕棿")
+ @ApiModelProperty(value = "绉熻溅鏃堕棿"))
+ @ExcelColumn(name="绉熻溅鏃堕棿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
private Date rentDate;
@ApiModelProperty(value = "杩樿溅鏃堕棿")
- @ExcelColumn(name="杩樿溅鏃堕棿")
+ @ExcelColumn(name="杩樿溅鏃堕棿",index = 9,width = 10,align = HorizontalAlignment.CENTER)
private Date backDate;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesQuery.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesQuery.java
deleted file mode 100644
index fd1b7f6..0000000
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesQuery.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.doumee.dao.business.web.response;
-
-import com.doumee.core.annotation.excel.ExcelColumn;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author T14
- */
-@Data
-public class MemberRidesQuery {
-
- @ApiModelProperty(value = "鐢ㄦ埛OpenID")
- private String openid;
-
- @ApiModelProperty(value = "杞﹁締缂栧彿")
- private String bikeCode;
-
- @ApiModelProperty(value = "鏄惁缁撶畻")
- private Integer status;
-
- @ApiModelProperty(value = "鍊熷嚭鏃堕棿璧峰")
- private Date rentDateStart;
-
- @ApiModelProperty(value = "鍊熷嚭鏃堕棿缁撴潫")
- private Date rentDateEnd;
-
- @ApiModelProperty(value = "鏄惁褰掕繕 [杞﹁締鍙栬繕璁板綍(绔欑偣) 鍏ュ弬]")
- private Boolean hasBack;
-}
diff --git a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
index 53c11c8..c1e0be0 100644
--- a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
@@ -3,9 +3,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
-import com.doumee.dao.business.web.response.MemberRidesQuery;
import java.util.List;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 4d28930..25de87e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -1,9 +1,6 @@
package com.doumee.service.business.impl;
import com.doumee.core.constants.Constants;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
@@ -14,9 +11,9 @@
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
-import com.doumee.dao.business.web.response.MemberRidesQuery;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.MemberRidesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -107,35 +104,15 @@
return memberRidesMapper.selectList(wrapper);
}
+ /**
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return
+ */
@Override
public PageData<MemberRidesDTO> findPage(PageWrap<MemberRidesQuery> pageWrap) {
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.orderByDesc(MemberRides::getCreateDate);
- queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
- .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
- .leftJoin(Goodsorder.class,Goodsorder::getId,MemberRides::getOrdreId)
- .eq(BaseParam::getType, Constants.THREE)
- .like(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),MemberRides::getBikeCode,pageWrap.getModel().getBikeCode())
- .between((Objects.nonNull(pageWrap.getModel().getRentDateStart())&&Objects.nonNull(pageWrap.getModel().getRentDateEnd())),
- MemberRides::getRentDate,
- pageWrap.getModel().getRentDateStart(),pageWrap.getModel().getRentDateEnd());
- if (Objects.nonNull(pageWrap.getModel().getStatus())
- && Constants.GOODSORDER_STATUS.CLOSE.getKey().equals(pageWrap.getModel().getStatus())){
- queryWrapper.eq(Goodsorder::getStatus,pageWrap.getModel().getStatus());
- }else if (Objects.nonNull(pageWrap.getModel().getStatus())
- && !Constants.GOODSORDER_STATUS.CLOSE.getKey().equals(pageWrap.getModel().getStatus())){
- queryWrapper.ne(Goodsorder::getStatus,pageWrap.getModel().getStatus());
- }
- queryWrapper.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
- .selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
- .selectAs(Goodsorder::getStatus,MemberRidesDTO::getStatus)
- .selectAs(BaseParam::getName,MemberRidesDTO::getBikeType)
- .selectAs(MemberRides::getDuration,MemberRidesDTO::getDuration)
- .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
- .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
+ MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
IPage<MemberRidesDTO> memberRidesDTOIPage = memberRidesJoinMapper.selectJoinPage(page, MemberRidesDTO.class, queryWrapper);
if (!CollectionUtils.isEmpty(memberRidesDTOIPage.getRecords())){
memberRidesDTOIPage.getRecords().forEach(s->{
@@ -153,41 +130,11 @@
return memberRidesMapper.selectCount(wrapper);
}
+
@Override
public PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap) {
-
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.orderByDesc(MemberRides::getCreateDate);
- queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
- .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
- .eq(BaseParam::getType, Constants.THREE)
- .like(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),MemberRides::getBikeCode,pageWrap.getModel().getBikeCode())
- .between((Objects.nonNull(pageWrap.getModel().getRentDateStart())&&Objects.nonNull(pageWrap.getModel().getRentDateEnd())),
- MemberRides::getRentDate,
- pageWrap.getModel().getRentDateStart(),pageWrap.getModel().getRentDateEnd());
- if (Objects.nonNull(pageWrap.getModel().getHasBack())
- && pageWrap.getModel().getHasBack()){
- queryWrapper.isNotNull(MemberRides::getBackDate);
- }else if (Objects.nonNull(pageWrap.getModel().getStatus())
- && !pageWrap.getModel().getHasBack()){
- queryWrapper.isNull(MemberRides::getBackDate);
- }
- queryWrapper.orderByDesc(MemberRides::getCreateDate);
- queryWrapper.leftJoin("locks rl on rl.id = t.rent_lock_id and rl.site_id = t.rent_site_id")
- .leftJoin("sites rs on rs.id = rl.site_id")
- .leftJoin("locks bl on bl.id = t.rent_lock_id and bl.site_id = t.rent_site_id")
- .leftJoin("sites bs on bs.id = rl.site_id");
- queryWrapper.selectAs(Member::getOpenid,BikeLogDTO::getOpenid)
- .selectAs(MemberRides::getBikeCode,BikeLogDTO::getBikeCode)
- .selectAs(BaseParam::getName,BikeLogDTO::getBikeType)
- .selectAs(MemberRides::getRentDate,BikeLogDTO::getRentDate)
- .selectAs(MemberRides::getBackDate,BikeLogDTO::getBackDate)
- .select("rs.Name as rentSiteName, rl.name as rentLockName")
- .select("bs.Name as backSiteName, bl.name as backLockName");
-
+ MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
if (!CollectionUtils.isEmpty(bikeLogDTOIPage.getRecords())){
bikeLogDTOIPage.getRecords().forEach(s->{
@@ -199,6 +146,29 @@
return PageData.from(bikeLogDTOIPage);
}
+ private MPJLambdaWrapper<MemberRides> initQueryParamByModel(MemberRidesQuery model) {
+ MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(model);
+ queryWrapper.orderByDesc(MemberRides::getCreateDate);
+ queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
+ .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
+ .eq(BaseParam::getType, Constants.THREE)
+ .like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
+ .like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode());
+ queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
+ queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
+ queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
+ queryWrapper.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
+ .selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
+ .selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
+ .selectAs(MemberRides::getStatus,MemberRidesDTO::getStatus)
+ .selectAs(BaseParam::getName,MemberRidesDTO::getBikeType)
+ .selectAs(MemberRides::getDuration,MemberRidesDTO::getDuration)
+ .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
+ .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
+ return queryWrapper;
+ }
+
@Override
public String getOnlineBike(String memberId){
MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
--
Gitblit v1.9.3