From a7ebf0ce7082e68f4aaf8a7a0e3e5e6c48dfaadb Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 18 十月 2021 10:13:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseApplyMapper.xml | 6 ++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java | 21 +++++++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ExportDonatesDTO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/PageDonatesDTO.java | 3 +++
4 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ExportDonatesDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ExportDonatesDTO.java
index 751dab4..6380be4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ExportDonatesDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ExportDonatesDTO.java
@@ -3,6 +3,7 @@
import java.util.Date;
import java.util.List;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -31,9 +32,11 @@
private Integer isAnonymous;
@ApiModelProperty("签收时间-起")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signingAtBegin;
@ApiModelProperty("签收时间-止")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signingAtEnd;
@ApiModelProperty(value = "社区id", hidden = true)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/PageDonatesDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/PageDonatesDTO.java
index 530b42d..5b90338 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/PageDonatesDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/PageDonatesDTO.java
@@ -5,6 +5,7 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,9 +31,11 @@
private Integer isAnonymous;
@ApiModelProperty("签收时间-起")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signingAtBegin;
@ApiModelProperty("签收时间-止")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signingAtEnd;
@ApiModelProperty("小程序使用，1.个人中心捐赠记录 2.捐赠物品管理 3.爱心义仓捐赠列表")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java
index 167be9c..2e4c4a2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.converters.string.StringImageConverter;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.utlis.StringUtils;
import lombok.Data;
import java.net.URL;
@@ -98,4 +99,24 @@
*/
@ExcelProperty(value = "物品图片",index = 5)
private URL image;
+
+ public void setStatus(String status) {
+ if(StringUtils.isNotEmpty(status)){
+ if("-1".equals(status)){
+ status="已取消";
+ }else if("0".equals(status)){
+ status="待处理";
+ }
+ else if("1".equals(status)){
+ status="待领取";
+ }
+ else if("2".equals(status)){
+ status="已驳回";
+ }
+ else if("3".equals(status)){
+ status="已领取";
+ }
+ this.status=status;
+ }
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseApplyMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseApplyMapper.xml
index f2b4446..b267310 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseApplyMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseApplyMapper.xml
@@ -44,6 +44,12 @@
<if test="commonPage.userId !=null">
and t.apply_user_id = #{commonPage.userId}
</if>
+ <if test="commonPage.beginTime !=null">
+ and t.actual_time >=#{commonPage.beginTime}
+ </if>
+ <if test="commonPage.endTime !=null">
+ and #{commonPage.endTime} >=t.actual_time
+ </if>
</where>
order by t.actual_time desc
</select>
--
Gitblit v1.7.1