From dc019b7ad174e1438439c5da7cbebb7be9bac8c4 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 10 Nov 2021 10:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ActivePointLogController.java  |  7 +++-
 .../esua/epdc/excel/ActivePointLogExcel.java  | 41 +++++++------------
 .../resources/mapper/ActivePointLogDao.xml    |  3 ++
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java
index 4d81bbeff..284f83122 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java
@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dao.ActivePointLogDao;
 import com.elink.esua.epdc.dto.ActivePointLogDTO;
 import com.elink.esua.epdc.dto.form.PointLogFormDTO;
 import com.elink.esua.epdc.excel.ActivePointLogExcel;
@@ -50,6 +51,9 @@ public class ActivePointLogController {
     @Autowired
     private ActivePointLogService activePointLogService;
 
+    @Autowired
+    private ActivePointLogDao activePointLogDao;
+
     @GetMapping("page")
     public Result<PageData<ActivePointLogDTO>> page(@RequestParam Map<String, Object> params) {
 //        PageData<ActivePointLogDTO> page = activePointLogService.page(params);
@@ -89,7 +93,8 @@ public class ActivePointLogController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<ActivePointLogDTO> list = activePointLogService.list(params);
+//        List<ActivePointLogDTO> list = activePointLogService.list(params);
+        List<ActivePointLogDTO> list = activePointLogDao.getPhrasePage(params);
         ExcelUtils.exportExcelToTarget(response, null, list, ActivePointLogExcel.class);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/excel/ActivePointLogExcel.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/excel/ActivePointLogExcel.java
index 3c7e92648..391f3ec4d 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/excel/ActivePointLogExcel.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/excel/ActivePointLogExcel.java
@@ -31,59 +31,46 @@ import java.util.Date;
 @Data
 public class ActivePointLogExcel {
 
-    @Excel(name = "行为id")
-    private String id;
-
-    @Excel(name = "用户id")
-    private String userId;
+//    @Excel(name = "行为id")
+//    private String id;
+//
+//    @Excel(name = "用户id")
+//    private String userId;
 
     @Excel(name = "用户姓名")
     private String userName;
 
-    @Excel(name = "用户部门ID")
-    private String deptId;
+//    @Excel(name = "用户部门ID")
+//    private String deptId;
 
-    @Excel(name = "用户部门名称")
+    @Excel(name = "用户部门")
     private String deptName;
 
     @Excel(name = "用户电话")
     private String mobile;
 
-    @Excel(name = "积分操作类型（0-减积分，1-加积分）")
-    private String operationType;
+    @Excel(name = "积分操作类型")
+    private String operationTypeName;
 
     @Excel(name = "积分")
     private Integer points;
 
-    @Excel(name = "操作编码")
-    private String operationCode;
+//    @Excel(name = "操作编码")
+//    private String operationCode;
 
     @Excel(name = "操作描述")
     private String operationDesc;
 
-    @Excel(name = "操作时间")
+    @Excel(name = "操作时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date operationTime;
 
     @Excel(name = "剩余积分")
     private String lavePoints;
 
-    @Excel(name = "删除标记 0：未删除，1：已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
 
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
+    @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
 
 
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
index 84e0e033b..91f7d4902 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
@@ -62,6 +62,9 @@
         <if test="operationDesc != null and operationDesc != ''">
             and OPERATION_DESC like '%' #{operationDesc} '%'
         </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( OPERATION_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
         order by UPDATED_TIME desc
     </select>