瀏覽代碼

导出加秒

dingxin 5 年之前
父節點
當前提交
23dcc0b853

+ 4
- 4
src/main/java/com/huiju/estateagents/excel/HelpInitiateRecordSucceed.java 查看文件

@@ -29,8 +29,8 @@ public class HelpInitiateRecordSucceed {
29 29
     /**
30 30
      * 创建时间 也是助力发起时间
31 31
      */
32
-    @ColumnWidth(15)
33
-    @DateTimeFormat("yyyy年MM月dd日")
32
+    @ColumnWidth(24)
33
+    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
34 34
     @ExcelProperty(value = "发起时间", index = 2)
35 35
     private Date createDate;
36 36
 
@@ -53,8 +53,8 @@ public class HelpInitiateRecordSucceed {
53 53
      */    /**
54 54
      * 创建时间 也是助力发起时间
55 55
      */
56
-    @ColumnWidth(15)
57
-    @DateTimeFormat("yyyy年MM月dd日")
56
+    @ColumnWidth(24)
57
+    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
58 58
     @ExcelProperty(value = "助力成功时间", index = 3)
59 59
     private Date succeedDate;
60 60
 

+ 2
- 2
src/main/java/com/huiju/estateagents/excel/HelpProceedAndFinish.java 查看文件

@@ -29,9 +29,9 @@ public class HelpProceedAndFinish {
29 29
     /**
30 30
      * 创建时间 也是助力发起时间
31 31
      */
32
-    @ColumnWidth(15)
32
+    @ColumnWidth(24)
33 33
     @ExcelProperty(value = "发起时间", index = 2)
34
-    @DateTimeFormat("yyyy年MM月dd日")
34
+    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
35 35
     private Date createDate;
36 36
 
37 37
 

+ 2
- 2
src/main/java/com/huiju/estateagents/excel/HelpRecordExport.java 查看文件

@@ -21,9 +21,9 @@ public class HelpRecordExport {
21 21
     /**
22 22
      * 创建时间 也是助力发起时间
23 23
      */
24
-    @ColumnWidth(15)
24
+    @ColumnWidth(24)
25 25
     @ExcelProperty(value = "助力时间", index = 2)
26
-    @DateTimeFormat("yyyy年MM月dd日")
26
+    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
27 27
     private Date createDate;
28 28
 
29 29
 

+ 2
- 1
src/main/resources/mapper/HelpInitiateRecordMapper.xml 查看文件

@@ -47,7 +47,8 @@
47 47
     if(b.verification_status = 0, '未核销', if(b.verification_status = 1, '已核销', '未知')) as verificationStatus
48 48
     from ta_help_initiate_record b
49 49
     where b.help_activity_id =  #{helpActivityId}
50
-    and b.`status` =  0
50
+    AND b.verification !='null'
51
+    AND b.verification !=''
51 52
     <if test="tel != null and tel != ''">
52 53
         and  b.phone like concat('%',#{tel},'%')
53 54
     </if>