胡轶钦 hace 5 años
padre
commit
8d1a3f871c

+ 3
- 0
src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java Ver fichero

85
 
85
 
86
     @TableField(exist = false)
86
     @TableField(exist = false)
87
     private String  appointmentName;
87
     private String  appointmentName;
88
+    @TableField(exist = false)
89
+    private String visitorNum;
88
 
90
 
89
     private String receiver;
91
     private String receiver;
90
 
92
 
91
     private String customerType;
93
     private String customerType;
92
 
94
 
93
     private Integer customerSource;
95
     private Integer customerSource;
96
+
94
 }
97
 }

+ 1
- 1
src/main/java/com.huiju.welcome/model/UsherRecordExcel.java Ver fichero

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

+ 1
- 1
src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java Ver fichero

694
                 item.setCustomerSource(customer.getSourceName());
694
                 item.setCustomerSource(customer.getSourceName());
695
                 item.setCustomerType(customer.getCustomerType());
695
                 item.setCustomerType(customer.getCustomerType());
696
                 item.setPersonName(customer.getPersonName());
696
                 item.setPersonName(customer.getPersonName());
697
-                item.setPersonNum(customer.getPersonNum());;
697
+                item.setPersonNum(customer.getVisitorNum());;
698
                 item.setPhone(customer.getPhone());
698
                 item.setPhone(customer.getPhone());
699
                 item.setPlateNumber(customer.getPlateNumber());
699
                 item.setPlateNumber(customer.getPlateNumber());
700
                 item.setReceiver(customer.getReceiver());
700
                 item.setReceiver(customer.getReceiver());

+ 6
- 2
src/main/resources/mapper/TaMainUsherRecordMapper.xml Ver fichero

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