excel &list

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

@@ -6,6 +6,7 @@ import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
@@ -19,6 +20,7 @@ import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
@@ -301,6 +303,55 @@ public class TaMainUsherRecordController extends BaseController {
             e.printStackTrace();
         }
     }
+
+    /**
+     * 导出接口的参数必须要跟列表查询的参数一致
+     */
+    @RequestMapping(value="/excel/usherListExcel",method= RequestMethod.GET)
+    public void exportCustomerExcel(@RequestParam(value = "personName" ,required = false)String personName,
+                                    @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 = "receiver" ,required = false)String receiver,
+                                    @RequestParam(value = "phone" ,required = false)String phone,
+                               HttpServletResponse response) {
+        List<UsherRecordExcel> result = iTaMainUsherRecordService.getCustomersEqualCustomerPageExcel(personName,phone,receiver,customerType,customerSource,startTime,endTime);
+
+        try {
+            ServletOutputStream out = response.getOutputStream();
+
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
+            String fileName = LocalDateTime.now().format(formatter);
+
+            response.setContentType("multipart/form-data");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename="+fileName+".xlsx");
+            ExcelWriter writer = new ExcelWriter(out, ExcelTypeEnum.XLSX, true);
+            Sheet sheet1 = new Sheet(1, 0, CustomerExcel.class);
+            writer.write(result, sheet1);
+            writer.finish();
+
+            out.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @RequestMapping(value="/usherRecords",method= RequestMethod.GET)
+    public ResponseBean usherRecords(@RequestParam(defaultValue = "1") int pageNum,
+                                 @RequestParam(defaultValue = "10") int pageSize,
+                                     @RequestParam(value = "personName" ,required = false)String personName,
+                                     @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 = "receiver" ,required = false)String receiver,
+                                     @RequestParam(value = "phone" ,required = false)String phone){
+        ResponseBean result = new ResponseBean();
+        result.addSuccess(iTaMainUsherRecordService.usherRecords(personName,phone,receiver,customerType,customerSource,startTime,endTime,pageNum,pageSize));
+        return result;
+    }
     
     /**
      * 修改对象

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

@@ -6,6 +6,7 @@ import com.huiju.welcome.model.TaCustomer;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**

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

@@ -32,4 +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);
 }

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

@@ -80,6 +80,9 @@ public class TaMainUsherRecord implements Serializable {
     @TableField(exist = false)
     private boolean newCustomer;
 
+    @TableField(exist = false)
+    private String SourceName;
+
     private String receiver;
 
     private String customerType;

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

@@ -0,0 +1,37 @@
+package com.huiju.welcome.model;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class UsherRecordExcel extends BaseRowModel {
+
+
+    @ExcelProperty(value = "客户类型" ,index = 0)
+    String customerType;
+
+    @ExcelProperty(value = "姓名" ,index = 1)
+    String personName;
+
+    @ExcelProperty(value = "手机号码" ,index = 2)
+    String phone;
+
+    @ExcelProperty(value = "来访人数" ,index = 3)
+    Integer personNum;
+
+    @ExcelProperty(value = "到访时间" ,index = 4)
+    LocalDateTime visiteDate;
+
+    @ExcelProperty(value = "客户来源" ,index = 5)
+    String customerSource;
+
+    @ExcelProperty(value = "车牌号码" ,index = 6)
+    String plateNumber;
+
+    @ExcelProperty(value = "接待人" ,index = 7)
+    String receiver;
+
+}

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

@@ -48,6 +48,7 @@ public interface ITaCustomerService extends IService<TaCustomer> {
 
     List<CustomerExcel> getCustomersEqualCustomerPage(String customerName, String phone, String platNumber, Integer agentUserId);
 
+
     IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhoneOrReceiver, String identity, Integer consultantType);
 	
 	IPage<TaCustomer> getAttributionList(int pageNumber, int pageSize);

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

@@ -4,11 +4,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.common.base.ResponseBean;
-import com.huiju.welcome.model.TaCustomer;
-import com.huiju.welcome.model.TaFirstUsherRecord;
-import com.huiju.welcome.model.TaMainUsherRecord;
-import com.huiju.welcome.model.TaPerson;
+import com.huiju.welcome.model.*;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -53,4 +51,8 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
     TaMainUsherRecord newRecordByFirstUsher(TaFirstUsherRecord taFirstUsherRecord, TaCustomer taCustomer);
 
     TaMainUsherRecord mergeAndDelete(TaMainUsherRecord source, TaMainUsherRecord target);
+
+    List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, String 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);
 }

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

@@ -591,6 +591,7 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         return result;
     }
 
+
     private String getItemNameOfDict(List<SysDict> dict, Integer id) {
         if (null == dict || null == id) return null;
 

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

@@ -679,4 +679,37 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
         return taMainUsherRecord;
     }
+
+    @Override
+    public List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, String customerSource, LocalDateTime startTime,LocalDateTime endTime) {
+        List<UsherRecordExcel> result = new ArrayList<>();
+        List<TaMainUsherRecord> customers = taMainUsherRecordMapper.getCustomersEqualCustomerPageExcel(personName,phone,receiver,customerType,customerSource,startTime,endTime);
+
+        if (null != customers) {
+            for (int i = 0; i < customers.size(); i ++) {
+                TaMainUsherRecord customer = customers.get(i);
+
+                UsherRecordExcel item = new UsherRecordExcel();
+                item.setCustomerSource(customer.getSourceName());
+                item.setCustomerType(customer.getCustomerType());
+                item.setPersonName(customer.getPersonName());
+                item.setPersonNum(customer.getPersonNum());;
+                item.setPhone(customer.getPhone());
+                item.setPlateNumber(customer.getPlateNumber());
+                item.setReceiver(customer.getReceiver());
+                item.setVisiteDate(customer.getVisiteDate());
+                result.add(item);
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public  IPage<TaMainUsherRecord> usherRecords(String personName, String phone, String receiver, String customerType, String 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);
+        return taMainUsherRecordMapper.usherRecords(page,personName,phone,receiver,customerType,customerSource,startTime,endTime);
+    }
 }

src/main/resources/mapper/TaCustomerMapper.xml

@@ -67,6 +67,28 @@
         order by consultant_id, create_date desc
     </select>
 
+    <select id="getCustomersEqualCustomerPage" resultType="com.huiju.welcome.model.TaCustomer">
+        select * from ta_customer t
+        <where>
+            t.status &gt; -1
+            <if test="customerName !=null and customerName != ''">
+                and t.customer_name LIKE CONCAT('%',#{customerName},'%')
+            </if>
+
+            <if test="phone !=null and phone != ''">
+                and t.phone LIKE CONCAT('%',#{phone},'%')
+            </if>
+
+            <if test="platNumber !=null and platNumber != ''">
+                and t.plate_number LIKE CONCAT('%',#{platNumber},'%')
+            </if>
+            <if test="agentUserId != null">
+                and t.consultant_id = #{agentUserId}
+            </if>
+        </where>
+        order by consultant_id, create_date desc
+    </select>
+
     <select id="getSomeCustMayBe" resultType="com.huiju.welcome.model.TaCustomer">
         SELECT
             *

src/main/resources/mapper/TaMainUsherRecordMapper.xml

@@ -52,4 +52,72 @@ WHERE
 	and customer_id = #{customerId}
 	LIMIT 1;
     </select>
+
+    <select id="getCustomersEqualCustomerPageExcel" resultType="com.huiju.welcome.model.TaMainUsherRecord">
+        SELECT
+        t.*,
+        b.label as sourceName
+        FROM
+        ta_main_usher_record t
+        LEFT JOIN sys_dict b ON t.customer_source = b.id
+        <where>
+            t.status = 1
+            <if test="personName !=null and personName != ''">
+                and t.personName LIKE CONCAT('%',#{personName},'%')
+            </if>
+            <if test="phone !=null and phone != ''">
+                and t.phone LIKE CONCAT('%',#{phone},'%')
+            </if>
+            <if test="receiver !=null and receiver != ''">
+                and t.receiver LIKE CONCAT('%',#{receiver},'%')
+            </if>
+            <if test="customerType !=null and customerType != ''">
+                and t.customer_type =#{customerType}
+            </if>
+            <if test="customerSource !=null and customerSource != ''">
+                and t.customer_source =#{customerSource}
+            </if>
+            <if test="startTime != null">
+                and t.visite_date &gt;= #{startTime}
+            </if>
+            <if test="endTime != null">
+                and t.visite_date &lt;= #{endTime}
+            </if>
+        </where>
+        order by t.visite_date desc
+    </select>
+
+    <select id="usherRecords" resultType="com.huiju.welcome.model.TaMainUsherRecord">
+        SELECT
+        t.*,
+        b.label as sourceName
+        FROM
+        ta_main_usher_record t
+        LEFT JOIN sys_dict b ON t.customer_source = b.id
+        <where>
+            t.status = 1
+            <if test="personName !=null and personName != ''">
+                and t.personName LIKE CONCAT('%',#{personName},'%')
+            </if>
+            <if test="phone !=null and phone != ''">
+                and t.phone LIKE CONCAT('%',#{phone},'%')
+            </if>
+            <if test="receiver !=null and receiver != ''">
+                and t.receiver LIKE CONCAT('%',#{receiver},'%')
+            </if>
+            <if test="customerType !=null and customerType != ''">
+                and t.customer_type =#{customerType}
+            </if>
+            <if test="customerSource !=null and customerSource != ''">
+                and t.customer_source =#{customerSource}
+            </if>
+            <if test="startTime != null">
+                and t.visite_date &gt;= #{startTime}
+            </if>
+            <if test="endTime != null">
+                and t.visite_date &lt;= #{endTime}
+            </if>
+        </where>
+        order by t.visite_date desc
+    </select>
 </mapper>