excel &list

src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java

@@ -312,7 +312,7 @@ public class TaMainUsherRecordController extends BaseController {
                                     @RequestParam(value = "startTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
                                     @RequestParam(value = "endTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
                                     @RequestParam(value = "customerType" ,required = false)String customerType,
-                                    @RequestParam(value = "customerSource" ,required = false)String customerSource,
+                                    @RequestParam(value = "customerSource" ,required = false)Integer customerSource,
                                     @RequestParam(value = "receiver" ,required = false)String receiver,
                                     @RequestParam(value = "phone" ,required = false)String phone,
                                HttpServletResponse response) {
@@ -345,7 +345,7 @@ public class TaMainUsherRecordController extends BaseController {
                                      @RequestParam(value = "startTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
                                      @RequestParam(value = "endTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
                                      @RequestParam(value = "customerType" ,required = false)String customerType,
-                                     @RequestParam(value = "customerSource" ,required = false)String customerSource,
+                                     @RequestParam(value = "customerSource" ,required = false)Integer customerSource,
                                      @RequestParam(value = "receiver" ,required = false)String receiver,
                                      @RequestParam(value = "phone" ,required = false)String phone){
         ResponseBean result = new ResponseBean();

src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java

@@ -32,6 +32,6 @@ public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
     List<TaMainUsherRecord> getLastList(@Param("personId") Integer personId, @Param("dt") LocalDateTime dt);
     IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,@Param("phone")String phone,@Param("platNumber")String platNumber,@Param("personName")String personName,@Param("appointment")Integer appointment);
     Integer getRecIdByCustomerIdCurrentDate(@Param("customerId")Integer customerId);
-    IPage<TaMainUsherRecord> usherRecords(IPage<TaMainUsherRecord>pg,@Param("personName") String personName, @Param("phone") String phone, @Param("receiver") String receiver, @Param("customerType") String customerType, @Param("customerSource") String customerSource, @Param("startTime")LocalDateTime startTime,@Param("endTime")LocalDateTime endTime);
-    List<TaMainUsherRecord> getCustomersEqualCustomerPageExcel(@Param("personName") String personName, @Param("phone") String phone, @Param("receiver") String receiver, @Param("customerType") String customerType, @Param("customerSource") String customerSource, @Param("startTime")LocalDateTime startTime,@Param("endTime")LocalDateTime endTime);
+    IPage<TaMainUsherRecord> usherRecords(IPage<TaMainUsherRecord>pg,@Param("personName") String personName, @Param("phone") String phone, @Param("receiver") String receiver, @Param("customerType") String customerType, @Param("customerSource") Integer customerSource, @Param("startTime")LocalDateTime startTime,@Param("endTime")LocalDateTime endTime);
+    List<TaMainUsherRecord> getCustomersEqualCustomerPageExcel(@Param("personName") String personName, @Param("phone") String phone, @Param("receiver") String receiver, @Param("customerType") String customerType, @Param("customerSource") Integer customerSource, @Param("startTime")LocalDateTime startTime,@Param("endTime")LocalDateTime endTime);
 }

src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java

@@ -81,7 +81,10 @@ public class TaMainUsherRecord implements Serializable {
     private boolean newCustomer;
 
     @TableField(exist = false)
-    private String SourceName;
+    private String sourceName;
+
+    @TableField(exist = false)
+    private String  appointmentName;
 
     private String receiver;
 

src/main/java/com.huiju.welcome/model/UsherRecordExcel.java

@@ -34,4 +34,7 @@ public class UsherRecordExcel extends BaseRowModel {
     @ExcelProperty(value = "接待人" ,index = 7)
     String receiver;
 
+    @ExcelProperty(value = "预约人",index = 8)
+    String appointmentName;
+
 }

src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java

@@ -52,7 +52,7 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
 
     TaMainUsherRecord mergeAndDelete(TaMainUsherRecord source, TaMainUsherRecord target);
 
-    List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, String customerSource, LocalDateTime startTime,LocalDateTime endTime);
+    List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, Integer customerSource, LocalDateTime startTime,LocalDateTime endTime);
 
-    IPage<TaMainUsherRecord> usherRecords(String personName, String phone, String receiver, String customerType, String customerSource, LocalDateTime startTime,LocalDateTime endTime,Integer pageNum,Integer pageSize);
+    IPage<TaMainUsherRecord> usherRecords(String personName, String phone, String receiver, String customerType, Integer customerSource, LocalDateTime startTime,LocalDateTime endTime,Integer pageNum,Integer pageSize);
 }

src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java

@@ -681,7 +681,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
 
     @Override
-    public List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, String customerSource, LocalDateTime startTime,LocalDateTime endTime) {
+    public List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, Integer customerSource, LocalDateTime startTime,LocalDateTime endTime) {
         List<UsherRecordExcel> result = new ArrayList<>();
         List<TaMainUsherRecord> customers = taMainUsherRecordMapper.getCustomersEqualCustomerPageExcel(personName,phone,receiver,customerType,customerSource,startTime,endTime);
 
@@ -706,7 +706,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
 
     @Override
-    public  IPage<TaMainUsherRecord> usherRecords(String personName, String phone, String receiver, String customerType, String customerSource, LocalDateTime startTime,LocalDateTime endTime,Integer pageNum,Integer pageSize){
+    public  IPage<TaMainUsherRecord> usherRecords(String personName, String phone, String receiver, String customerType, Integer customerSource, LocalDateTime startTime,LocalDateTime endTime,Integer pageNum,Integer pageSize){
         IPage<TaMainUsherRecord> page=new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);

src/main/resources/mapper/TaMainUsherRecordMapper.xml

@@ -56,10 +56,12 @@ WHERE
     <select id="getCustomersEqualCustomerPageExcel" resultType="com.huiju.welcome.model.TaMainUsherRecord">
         SELECT
         t.*,
-        b.label as sourceName
+        b.label AS sourceName,
+        c.person_name as appointmentName
         FROM
         ta_main_usher_record t
         LEFT JOIN sys_dict b ON t.customer_source = b.id
+        LEFT JOIN ta_visitor_appointment c ON t.appointment_id = c.appointment_id
         <where>
             t.status = 1
             <if test="personName !=null and personName != ''">
@@ -71,9 +73,12 @@ WHERE
             <if test="receiver !=null and receiver != ''">
                 and t.receiver LIKE CONCAT('%',#{receiver},'%')
             </if>
-            <if test="customerType !=null and customerType != ''">
+            <if test="customerType !=null and customerType != '' and customerType = 'channel'">
                 and t.customer_type =#{customerType}
             </if>
+            <if test="customerType !=null and customerType != '' and customerType != 'channel'">
+                and t.customer_type is null
+            </if>
             <if test="customerSource !=null and customerSource != ''">
                 and t.customer_source =#{customerSource}
             </if>
@@ -90,10 +95,12 @@ WHERE
     <select id="usherRecords" resultType="com.huiju.welcome.model.TaMainUsherRecord">
         SELECT
         t.*,
-        b.label as sourceName
+        b.label AS sourceName,
+        c.person_name as appointmentName
         FROM
         ta_main_usher_record t
         LEFT JOIN sys_dict b ON t.customer_source = b.id
+        LEFT JOIN ta_visitor_appointment c ON t.appointment_id = c.appointment_id
         <where>
             t.status = 1
             <if test="personName !=null and personName != ''">