dingxin 5 lat temu
rodzic
commit
23dcc0b853

+ 4
- 4
src/main/java/com/huiju/estateagents/excel/HelpInitiateRecordSucceed.java Wyświetl plik

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
     @ExcelProperty(value = "发起时间", index = 2)
34
     @ExcelProperty(value = "发起时间", index = 2)
35
     private Date createDate;
35
     private Date createDate;
36
 
36
 
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
     @ExcelProperty(value = "助力成功时间", index = 3)
58
     @ExcelProperty(value = "助力成功时间", index = 3)
59
     private Date succeedDate;
59
     private Date succeedDate;
60
 
60
 

+ 2
- 2
src/main/java/com/huiju/estateagents/excel/HelpProceedAndFinish.java Wyświetl plik

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

+ 2
- 2
src/main/java/com/huiju/estateagents/excel/HelpRecordExport.java Wyświetl plik

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

+ 2
- 1
src/main/resources/mapper/HelpInitiateRecordMapper.xml Wyświetl plik

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