From d3f5a984360ae152369e6edf743cf8ace4e1d8ec Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 28 八月 2025 14:23:08 +0800
Subject: [PATCH] 导出时间
---
framework/src/main/java/cn/lili/modules/order/order/entity/dto/PrizeGrantRecordExportDetailDtO.java | 2 ++
framework/src/main/java/cn/lili/modules/order/order/entity/dto/PrizeRecordExportDetailDTO.java | 2 ++
framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeRecordServiceImpl.java | 10 ++++++++--
framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeGrantRecordQuery.java | 11 +++++++++++
framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml | 6 ++++++
framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeRecordQuery.java | 11 +++++++++++
framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeGrantRecordServiceImpl.java | 9 ++++++++-
framework/src/main/resources/mapper/lmk/PrizeGrantRecordMapper.xml | 6 ++++++
8 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeGrantRecordQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeGrantRecordQuery.java
index 9f33d16..ef21145 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeGrantRecordQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeGrantRecordQuery.java
@@ -1,7 +1,12 @@
package cn.lili.modules.lmk.domain.query;
import cn.lili.base.AbsQuery;
+
+import java.util.Date;
import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.lang.NonNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -24,6 +29,12 @@
private String activityName;
//涓鐘舵��
private String grantStatus;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeRecordQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeRecordQuery.java
index 7d73c10..c91fd57 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeRecordQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeRecordQuery.java
@@ -1,7 +1,12 @@
package cn.lili.modules.lmk.domain.query;
import cn.lili.base.AbsQuery;
+
+import java.util.Date;
import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.lang.NonNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -26,5 +31,11 @@
private String prizeStatus;
private String distributeStatus;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeGrantRecordServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeGrantRecordServiceImpl.java
index 8868c61..848f588 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeGrantRecordServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeGrantRecordServiceImpl.java
@@ -24,6 +24,7 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -67,6 +68,11 @@
for (PrizeGrantRecordVO vo : list){
PrizeGrantRecordExportDetailDtO detailDtO = new PrizeGrantRecordExportDetailDtO();
BeanUtils.copyProperties(vo,detailDtO);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ // 灏咲ate绫诲瀷杞崲涓烘寚瀹氭牸寮忕殑瀛楃涓�
+ String createTimeStr = sdf.format(vo.getCreateTime());
+ // 璁剧疆鍒癉TO涓�
+ detailDtO.setCreateTime(createTimeStr);
exportDetailDtOS.add(detailDtO);
}
@@ -78,7 +84,7 @@
String[] headers = {
"鐢ㄦ埛鏄电О", "娲诲姩鍚�","鍟嗗搧鍚�",
"鍟嗗搧鍐呭","鍙戞斁鐘舵��"
- ,"鎻忚堪"
+ ,"鎻忚堪","鍙戝竷鏃堕棿"
};
for(int i= 0 ;i< headers.length;i++){
Cell cell = header.createCell(i);
@@ -99,6 +105,7 @@
}
row.createCell(5).setCellValue(dto.getDes());
+ row.createCell(6).setCellValue(dto.getCreateTime());
}
return workbook;
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeRecordServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeRecordServiceImpl.java
index 5b28dcf..d2bb6af 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeRecordServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeRecordServiceImpl.java
@@ -31,6 +31,7 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -76,6 +77,11 @@
for (PrizeRecordVO vo : list){
PrizeRecordExportDetailDTO detailDtO = new PrizeRecordExportDetailDTO();
BeanUtils.copyProperties(vo,detailDtO);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ // 灏咲ate绫诲瀷杞崲涓烘寚瀹氭牸寮忕殑瀛楃涓�
+ String createTimeStr = sdf.format(vo.getCreateTime());
+ // 璁剧疆鍒癉TO涓�
+ detailDtO.setCreateTime(createTimeStr);
exportDetailDTOS.add(detailDtO);
}
XSSFWorkbook workbook = new XSSFWorkbook();
@@ -85,7 +91,7 @@
Row header = sheet.createRow(0);
String[] headers = {
"鐢ㄦ埛鏄电О", "娲诲姩鍚�","涓鐘舵��",
- "涓鍐呭","濂栧搧鍙戞斁鐘舵��"
+ "涓鍐呭","濂栧搧鍙戞斁鐘舵��","鎶藉鏃堕棿"
};
for(int i= 0 ;i< headers.length;i++){
Cell cell = header.createCell(i);
@@ -113,7 +119,7 @@
}else {
row.createCell(4).setCellValue(PrizeDistributeStatusEnum.WAIT.getDescription());
}
-
+ row.createCell(5).setCellValue(dto.getCreateTime());
}
return workbook;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PrizeGrantRecordExportDetailDtO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PrizeGrantRecordExportDetailDtO.java
index 14360bc..508c119 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PrizeGrantRecordExportDetailDtO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PrizeGrantRecordExportDetailDtO.java
@@ -30,4 +30,6 @@
//鎻忚堪
private String des;
+ private String createTime;
+
}
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PrizeRecordExportDetailDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PrizeRecordExportDetailDTO.java
index 7fe71dd..64db8bf 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PrizeRecordExportDetailDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PrizeRecordExportDetailDTO.java
@@ -37,4 +37,6 @@
* @see PrizeDistributeStatusEnum
* */
private String distributeStatus;
+
+ private String createTime;
}
diff --git a/framework/src/main/resources/mapper/lmk/PrizeGrantRecordMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeGrantRecordMapper.xml
index e9e8ace..b936502 100644
--- a/framework/src/main/resources/mapper/lmk/PrizeGrantRecordMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/PrizeGrantRecordMapper.xml
@@ -54,6 +54,7 @@
LPGR.prize_content,
LPGR.grant_status,
LPGR.prize_num_id,
+ LPGR.create_time,
LPGR.des,
LPGR.id
FROM
@@ -69,6 +70,8 @@
<if test="query.grantStatus != null and query.grantStatus !=''">
AND LPGR.grant_status = #{query.grantStatus}
</if>
+ <if test="query.startTime != null">AND LPGR.create_time >= #{query.startTime}</if>
+ <if test="query.endTime != null">AND LPGR.create_time <= #{query.endTime}</if>
</select>
<select id="getExportData" resultMap="BaseResultMap">
SELECT
@@ -82,6 +85,7 @@
LPGR.grant_status,
LPGR.prize_num_id,
LPGR.des,
+ LPGR.create_time,
LPGR.id
FROM
lmk_prize_grant_record LPGR
@@ -96,5 +100,7 @@
<if test="query.grantStatus != null and query.grantStatus !=''">
AND LPGR.grant_status = #{query.grantStatus}
</if>
+ <if test="query.startTime != null">AND LPGR.create_time >= #{query.startTime}</if>
+ <if test="query.endTime != null">AND LPGR.create_time <= #{query.endTime}</if>
</select>
</mapper>
diff --git a/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml
index 4d42fa5..c8058e1 100644
--- a/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml
@@ -62,6 +62,7 @@
LPR.prize_num_id,
LPR.activity_prize_ref_id,
LPR.distribute_status,
+ LPR.create_time,
LPR.id
FROM
lmk_prize_record LPR
@@ -79,6 +80,8 @@
<if test="query.distributeStatus != null and query.distributeStatus !=''">
AND LPR.distribute_status = #{query.distributeStatus}
</if>
+ <if test="query.startTime != null">AND LPR.create_time >= #{query.startTime}</if>
+ <if test="query.endTime != null">AND LPR.create_time <= #{query.endTime}</if>
</select>
<select id="getByUserIdPage" resultMap="BaseResultMap">
SELECT
@@ -116,6 +119,7 @@
LPR.prize_num_id,
LPR.activity_prize_ref_id,
LPR.distribute_status,
+ LPR.create_time,
LPR.id
FROM
lmk_prize_record LPR
@@ -133,6 +137,8 @@
<if test="query.distributeStatus != null and query.distributeStatus !=''">
AND LPR.distribute_status = #{query.distributeStatus}
</if>
+ <if test="query.startTime != null">AND LPR.create_time >= #{query.startTime}</if>
+ <if test="query.endTime != null">AND LPR.create_time <= #{query.endTime}</if>
</select>
<resultMap id="getPrizeRecordListByTimeMap" type="cn.lili.modules.lmk.domain.vo.PrizeRecordTimeVO">
<result property="activityPrizeRefId" column="activity_prize_ref_id"/>
--
Gitblit v1.8.0