excel

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

@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -309,8 +310,8 @@ public class TaMainUsherRecordController extends BaseController {
      */
     @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 = "startTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Date startTime,
+                                    @RequestParam(value = "endTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Date endTime,
                                     @RequestParam(value = "customerType" ,required = false)String customerType,
                                     @RequestParam(value = "customerSource" ,required = false)Integer customerSource,
                                     @RequestParam(value = "receiver" ,required = false)String receiver,
@@ -328,7 +329,7 @@ public class TaMainUsherRecordController extends BaseController {
             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);
+            Sheet sheet1 = new Sheet(1, 0, UsherRecordExcel.class);
             writer.write(result, sheet1);
             writer.finish();
 
@@ -342,8 +343,8 @@ public class TaMainUsherRecordController extends BaseController {
     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 = "startTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
+                                     @RequestParam(value = "endTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
                                      @RequestParam(value = "customerType" ,required = false)String customerType,
                                      @RequestParam(value = "customerSource" ,required = false)Integer customerSource,
                                      @RequestParam(value = "receiver" ,required = false)String receiver,

src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java

@@ -37,7 +37,8 @@ public class AccessInterceptor implements HandlerInterceptor {
         "/camera",
         "/websocket",
          "/face",
-        "/miniapp/login"
+        "/miniapp/login",
+            "/excel/usherListExcel"
     };
 
     /*

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

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +33,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") 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);
+    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") Date startTime, @Param("endTime")Date 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")Date startTime,@Param("endTime")Date endTime);
 }

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

@@ -7,6 +7,7 @@ import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.*;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -52,7 +53,7 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
 
     TaMainUsherRecord mergeAndDelete(TaMainUsherRecord source, TaMainUsherRecord target);
 
-    List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, Integer customerSource, LocalDateTime startTime,LocalDateTime endTime);
+    List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, Integer customerSource, Date startTime,Date endTime);
 
-    IPage<TaMainUsherRecord> usherRecords(String personName, String phone, String receiver, String customerType, Integer customerSource, LocalDateTime startTime,LocalDateTime endTime,Integer pageNum,Integer pageSize);
+    IPage<TaMainUsherRecord> usherRecords(String personName, String phone, String receiver, String customerType, Integer customerSource, Date startTime, Date endTime, Integer pageNum, Integer pageSize);
 }

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

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -681,7 +682,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
 
     @Override
-    public List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, Integer customerSource, LocalDateTime startTime,LocalDateTime endTime) {
+    public List<UsherRecordExcel> getCustomersEqualCustomerPageExcel(String personName, String phone, String receiver, String customerType, Integer customerSource, Date startTime, Date endTime) {
         List<UsherRecordExcel> result = new ArrayList<>();
         List<TaMainUsherRecord> customers = taMainUsherRecordMapper.getCustomersEqualCustomerPageExcel(personName,phone,receiver,customerType,customerSource,startTime,endTime);
 
@@ -707,7 +708,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
 
     @Override
-    public  IPage<TaMainUsherRecord> usherRecords(String personName, String phone, String receiver, String customerType, Integer customerSource, LocalDateTime startTime,LocalDateTime endTime,Integer pageNum,Integer pageSize){
+    public  IPage<TaMainUsherRecord> usherRecords(String personName, String phone, String receiver, String customerType, Integer customerSource, Date startTime,Date 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

@@ -73,10 +73,10 @@ WHERE
             <if test="receiver !=null and receiver != ''">
                 and t.receiver LIKE CONCAT('%',#{receiver},'%')
             </if>
-            <if test="customerType !=null and customerType != '' and customerType = 'channel'">
+            <if test="customerType !=null and customerType != '' and customerType == 'channel'">
                 and t.customer_type =#{customerType}
             </if>
-            <if test="customerType !=null and customerType != '' and customerType != 'channel'">
+            <if test="customerType !=null and customerType != '' and customerType == 'self'">
                 and t.customer_type is null
             </if>
             <if test="customerSource !=null and customerSource != ''">
@@ -112,9 +112,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 == 'self'">
+                and t.customer_type is null
+            </if>
             <if test="customerSource !=null and customerSource != ''">
                 and t.customer_source =#{customerSource}
             </if>