胡轶钦 преди 5 години
родител
ревизия
8d1a3f871c

+ 3
- 0
src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java Целия файл

@@ -85,10 +85,13 @@ public class TaMainUsherRecord implements Serializable {
85 85
 
86 86
     @TableField(exist = false)
87 87
     private String  appointmentName;
88
+    @TableField(exist = false)
89
+    private String visitorNum;
88 90
 
89 91
     private String receiver;
90 92
 
91 93
     private String customerType;
92 94
 
93 95
     private Integer customerSource;
96
+
94 97
 }

+ 1
- 1
src/main/java/com.huiju.welcome/model/UsherRecordExcel.java Целия файл

@@ -20,7 +20,7 @@ public class UsherRecordExcel extends BaseRowModel {
20 20
     String phone;
21 21
 
22 22
     @ExcelProperty(value = "来访人数" ,index = 3)
23
-    Integer personNum;
23
+    String personNum;
24 24
 
25 25
     @ExcelProperty(value = "到访时间" ,index = 4)
26 26
     LocalDateTime visiteDate;

+ 1
- 1
src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java Целия файл

@@ -694,7 +694,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
694 694
                 item.setCustomerSource(customer.getSourceName());
695 695
                 item.setCustomerType(customer.getCustomerType());
696 696
                 item.setPersonName(customer.getPersonName());
697
-                item.setPersonNum(customer.getPersonNum());;
697
+                item.setPersonNum(customer.getVisitorNum());;
698 698
                 item.setPhone(customer.getPhone());
699 699
                 item.setPlateNumber(customer.getPlateNumber());
700 700
                 item.setReceiver(customer.getReceiver());

+ 6
- 2
src/main/resources/mapper/TaMainUsherRecordMapper.xml Целия файл

@@ -57,11 +57,13 @@ WHERE
57 57
         SELECT
58 58
         t.*,
59 59
         b.label AS sourceName,
60
-        c.person_name as appointmentName
60
+        c.person_name as appointmentName,
61
+        d.label as visitorNum
61 62
         FROM
62 63
         ta_main_usher_record t
63 64
         LEFT JOIN sys_dict b ON t.customer_source = b.id
64 65
         LEFT JOIN ta_visitor_appointment c ON t.appointment_id = c.appointment_id
66
+        LEFT JOIN sys_dict d ON d.id = t.person_num
65 67
         <where>
66 68
             t.status = 1
67 69
             <if test="personName !=null and personName != ''">
@@ -96,11 +98,13 @@ WHERE
96 98
         SELECT
97 99
         t.*,
98 100
         b.label AS sourceName,
99
-        c.person_name as appointmentName
101
+        c.person_name as appointmentName,
102
+        d.label as visitorNum
100 103
         FROM
101 104
         ta_main_usher_record t
102 105
         LEFT JOIN sys_dict b ON t.customer_source = b.id
103 106
         LEFT JOIN ta_visitor_appointment c ON t.appointment_id = c.appointment_id
107
+        LEFT JOIN sys_dict d ON d.id = t.person_num
104 108
         <where>
105 109
             t.status = 1
106 110
             <if test="personName !=null and personName != ''">