Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
+import com.huiju.estateagents.excel.HelpRecordExport;
 import com.huiju.estateagents.excel.PublicCustomerExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
     @GetMapping("/admin/HelpInitiateRecordSucceed/export")
     public void getCustomerExportList(HttpServletRequest request,
                                       HttpServletResponse response,
-                                      @RequestParam(value = "tel", required = false) Integer tel,
-                                      @RequestParam(value = "helpActivityId", required = false) Integer helpActivityId) throws IOException {
+                                      @RequestParam(value = "tel", required = false) String tel,
+                                      @RequestParam(value = "helpActivityId", required = false) Integer helpActivityId,
+                                      @RequestParam(value = "code", required = false) int code) throws IOException {
+        //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
-        response.setHeader("Content-disposition", "attachment;filename=助力活动发起者.xlsx");
+        response.setHeader("Content-disposition", "attachment;filename=助力活动发起人.xlsx");
 
         Integer orgId = getOrgId(request);
 
          * 助力活动发起者
          */
         // 设置读取的class
-        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpInitiateRecordSucceed.class).registerWriteHandler(new CustomCellWriteHandler()).build();
-        // 设置 sheet, 同一个sheet只需要设置一次
-        WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
-        Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
-        pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
-        List<HelpInitiateRecordSucceed> publicList = null;
-        do {
-            publicList = taHelpActivityService.getHelpInitiateRecordSucceedExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
-            excelWriter.write(publicList, writeSheet);
-
-            pageCode++;
-        } while (pageCode <= pageCount);
-
-        // finish 会帮忙关闭流
-        excelWriter.finish();
+
+        if (1==code){
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpInitiateRecordSucceed.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
+            Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpInitiateRecordSucceed> publicList = null;
+            do {
+                publicList = taHelpActivityService.getHelpInitiateRecordSucceedExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }else {
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpProceedAndFinish.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
+            Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpProceedAndFinish> publicList = null;
+            do {
+                publicList = taHelpActivityService.getHelpProceedAndFinishExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+
+    }
+
+    /**
+     * 导出数据 客户列表 公客/私客
+     *
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/admin/helpRecord/export")
+    public void gethelpRecordExport(HttpServletRequest request,
+                                      HttpServletResponse response,
+                                      @RequestParam(value = "helpRecordInitiateId", required = false) Integer helpRecordInitiateId) throws IOException {
+        //        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=助力活动发起人.xlsx");
+
+        Integer orgId = getOrgId(request);
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = 0;
+
+        /**
+         * 助力活动发起者
+         */
+        // 设置读取的class
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpRecordExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
+            Integer count = taHelpActivityService.getHelpRecord(helpRecordInitiateId);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpRecordExport> publicList = null;
+            do {
+                publicList = taHelpActivityService.getHelpRecordExportList(pageCode * pageSize, pageSize,helpRecordInitiateId);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
     }
     
     @ApiOperation(value = "微信端根据id查询活动助力详情", notes = "根据id查询活动助力详情")

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java

 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.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
      */
     @RequestMapping(value="/admin/taDrainageRecord/export",method= RequestMethod.GET)
     public void taDrainageRecordList(@RequestParam(value = "drainageId") Integer drainageId,
-                                             @RequestParam(value = "startTime",required = false) String startTime,
-                                             @RequestParam(value = "endTime",required = false) String endTime,
+                                             @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,
                                              HttpServletRequest request, HttpServletResponse response) throws IOException {
             //使用分页插件
             QueryWrapper<TaDrainageRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("drainage_id",drainageId);
             queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.gt(!StringUtils.isEmpty(startTime),"create_date",startTime);
-            queryWrapper.lt(!StringUtils.isEmpty(endTime),"create_date",endTime);
+            queryWrapper.gt(null != startTime,"create_date",startTime);
+            queryWrapper.lt(null != endTime,"create_date",endTime);
             queryWrapper.orderByDesc("create_date");
     
             List<TaDrainageRecord> list = iTaDrainageRecordService.list(queryWrapper);

src/main/java/com/huiju/estateagents/excel/HelpInitiateRecordSucceed.java

 package com.huiju.estateagents.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
 @Data
 public class HelpInitiateRecordSucceed {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      * 创建时间 也是助力发起时间
      */
     @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
     @ExcelProperty(value = "发起时间", index = 2)
-    private LocalDateTime createDate;
+    private Date createDate;
 
     /**
      * 人员姓名
      * 创建时间 也是助力发起时间
      */
     @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
     @ExcelProperty(value = "助力成功时间", index = 3)
-    private LocalDateTime succeedDate;
+    private Date succeedDate;
 
     /**
      * 核销状态

src/main/java/com/huiju/estateagents/excel/HelpProceedAndFinish.java

 package com.huiju.estateagents.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
 @Data
 public class HelpProceedAndFinish {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      * 创建时间 也是助力发起时间
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "发起时间", index = 1)
-    private LocalDateTime createDate;
+    @ExcelProperty(value = "发起时间", index = 2)
+    @DateTimeFormat("yyyy年MM月dd日")
+    private Date createDate;
 
-    /**
-     * 人员姓名
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "助力成功", index = 0)
-    private String name;
 
     /**
      * 人员手机号
     private String phone;
 
     /**
-     * 助力成功时间
-     */    /**
-     * 创建时间 也是助力发起时间
+     * 人员姓名
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "助力成功时间", index = 3)
-    private LocalDateTime succeedDate;
+    @ExcelProperty(value = "发起者", index = 0)
+    private String name;
 
 }

src/main/java/com/huiju/estateagents/excel/HelpRecordExport.java

+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 助力活动发起人员记录
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Data
+public class HelpRecordExport {
+
+    /**
+     * 创建时间 也是助力发起时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "助力时间", index = 2)
+    @DateTimeFormat("yyyy年MM月dd日")
+    private Date createDate;
+
+
+    /**
+     * 人员手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String phone;
+
+    /**
+     * 人员姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户名", index = 0)
+    private String name;
+
+}

src/main/java/com/huiju/estateagents/mapper/HelpInitiateRecordMapper.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
      * @param tel
      * @param helpActivityId
      */
+
+    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("tel") String tel, @Param("helpActivityId") Integer helpActivityId);
+
+    List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(@Param("pageCode") int i, @Param("pageSize")Integer pageSize, @Param("tel")String tel, @Param("helpActivityId")Integer helpActivityId);
+
     List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("tel") Integer tel, @Param("helpActivityId") Integer helpActivityId);
 	
 	/**

src/main/java/com/huiju/estateagents/mapper/HelpRecordMapper.java

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.excel.HelpRecordExport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 助力活动助力人员记录  Mapper 接口
 public interface HelpRecordMapper extends BaseMapper<HelpRecord> {
 
     IPage<HelpRecord> taHelpRecordDetails(IPage<HelpInitiateRecord> pg, @Param("helpRecordInitiateId") Integer helpRecordInitiateId);
+
+    /**
+     * 助力记录者
+     * @param i
+     * @param pageSize
+     * @param helpRecordInitiateId
+     * @return
+     */
+    List<HelpRecordExport> getHelpRecordExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("helpRecordInitiateId") Integer helpRecordInitiateId);
 }

src/main/java/com/huiju/estateagents/service/IHelpActivityService.java

 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
+import com.huiju.estateagents.excel.HelpRecordExport;
 
 import javax.xml.crypto.Data;
 import java.util.List;
      * @param helpActivityId
      * @return
      */
-    Integer getHelpInitiateRecordSucceed(Integer tel, Integer helpActivityId);
+    Integer getHelpInitiateRecordSucceed(String tel, Integer helpActivityId);
 
     /**
      * 导出助力成功数据
      * @param helpActivityId
      * @return
      */
-    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, Integer tel, Integer helpActivityId);
+    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, String tel, Integer helpActivityId);
+
+    /**
+     * 导出助力成功或者失败
+     * @param i
+     * @param pageSize
+     * @param tel
+     * @param helpActivityId
+     * @return
+     */
+    List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId);
+
+    /**
+     * 查询当前导出数据的总数
+     * @param helpRecordInitiateId
+     * @return
+     */
+    Integer getHelpRecord(Integer helpRecordInitiateId);
+
+    /**
+     * 查询当前助力者记录
+     * @param i
+     * @param pageSize
+     * @param helpRecordInitiateId
+     * @return
+     */
+    List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId);
 }

src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
+import com.huiju.estateagents.excel.HelpRecordExport;
 import com.huiju.estateagents.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
     }
 
     @Override
-    public Integer getHelpInitiateRecordSucceed(Integer tel, Integer helpActivityId) {
+    public Integer getHelpInitiateRecordSucceed(String tel, Integer helpActivityId) {
         QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery= new QueryWrapper<>();
         helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
-        helpInitiateRecordQuery.eq("phone",tel);
+        helpInitiateRecordQuery.eq(!StringUtils.isEmpty(tel), "phone",tel);
         return helpInitiateRecordMapper.selectCount(helpInitiateRecordQuery);
     }
 
     @Override
-    public List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, Integer tel, Integer helpActivityId) {
+    public List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, String tel, Integer helpActivityId) {
          List<HelpInitiateRecordSucceed> lsit= helpInitiateRecordMapper.getHelpInitiateRecordSucceedExportList(i,pageSize,tel,helpActivityId);
         return lsit;
     }
+
+    @Override
+    public List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId) {
+        List<HelpProceedAndFinish> lsit= helpInitiateRecordMapper.getHelpProceedAndFinishExportList(i,pageSize,tel,helpActivityId);
+        return lsit;
+    }
+
+    @Override
+    public Integer getHelpRecord(Integer helpRecordInitiateId) {
+        QueryWrapper<HelpRecord> helpInitiateRecordQuery= new QueryWrapper<>();
+        helpInitiateRecordQuery.eq("help_record_initiate_id",helpRecordInitiateId);
+        return helpRecordMapper.selectCount(helpInitiateRecordQuery);
+    }
+
+    @Override
+    public List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId) {
+        List<HelpRecordExport> lsit= helpRecordMapper.getHelpRecordExportList(i,pageSize,helpRecordInitiateId);
+        return lsit;
+    }
 }

src/main/resources/mapper/HelpInitiateRecordMapper.xml

 
     <select id="getHelpInitiateRecordSucceedExportList" resultType="com.huiju.estateagents.excel.HelpInitiateRecordSucceed">
     SELECT
-   b.*，
-    if(b.verification_status = 0, '未核销', if(b.verification_status = 1, '已核销', '未知')) as sex
-    from ta_help_initiate_record
-    where help_activity_id =  #{helpActivityId}
+    b.name as name,
+    b.create_date as createDate,
+    b.phone as phone,
+    b.succeed_date as succeedDate,
+    if(b.verification_status = 0, '未核销', if(b.verification_status = 1, '已核销', '未知')) as verificationStatus
+    from ta_help_initiate_record b
+    where b.help_activity_id =  #{helpActivityId}
+     order by b.create_date desc
+     limit #{pageCode}, #{pageSize}
+    </select>
+
+    <select id="getHelpProceedAndFinishExportList" resultType="com.huiju.estateagents.excel.HelpProceedAndFinish">
+    SELECT
+    b.name as name,
+    b.create_date as createDate,
+    b.phone as phone
+    from ta_help_initiate_record b
+    where b.help_activity_id =  #{helpActivityId}
      order by b.create_date desc
      limit #{pageCode}, #{pageSize}
     </select>

src/main/resources/mapper/HelpRecordMapper.xml

     select * from ta_help_record
     where help_record_initiate_id =#{helpRecordInitiateId}
 </select>
+
+    <select id="getHelpRecordExportList" resultType="com.huiju.estateagents.excel.HelpRecordExport">
+    SELECT
+    b.name as name,
+    b.create_date as createDate,
+    b.phone as phone
+    from ta_help_record b
+    where b.help_activity_id =  #{helpActivityId}
+     order by b.create_date desc
+     limit #{pageCode}, #{pageSize}
+    </select>
 </mapper>