dingxin 5 lat temu
rodzic
commit
009304cc39

+ 87
- 22
src/main/java/com/huiju/estateagents/controller/HelpActivityController.java Wyświetl plik

@@ -9,11 +9,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
9 9
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
10 10
 import com.huiju.estateagents.base.BaseController;
11 11
 import com.huiju.estateagents.base.ResponseBean;
12
-import com.huiju.estateagents.entity.HelpActivity;
13
-import com.huiju.estateagents.entity.HelpInitiateRecord;
14
-import com.huiju.estateagents.entity.TaBuildingDynamic;
15
-import com.huiju.estateagents.entity.TaChannel;
12
+import com.huiju.estateagents.entity.*;
16 13
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
14
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
15
+import com.huiju.estateagents.excel.HelpRecordExport;
17 16
 import com.huiju.estateagents.excel.PublicCustomerExport;
18 17
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
19 18
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
@@ -246,11 +245,13 @@ public class HelpActivityController extends BaseController {
246 245
     @GetMapping("/admin/HelpInitiateRecordSucceed/export")
247 246
     public void getCustomerExportList(HttpServletRequest request,
248 247
                                       HttpServletResponse response,
249
-                                      @RequestParam(value = "tel", required = false) Integer tel,
250
-                                      @RequestParam(value = "helpActivityId", required = false) Integer helpActivityId) throws IOException {
248
+                                      @RequestParam(value = "tel", required = false) String tel,
249
+                                      @RequestParam(value = "helpActivityId", required = false) Integer helpActivityId,
250
+                                      @RequestParam(value = "code", required = false) int code) throws IOException {
251
+        //        response.setContentType("application/vnd.ms-excel");
251 252
         response.setContentType("application/octet-stream");
252 253
         response.setCharacterEncoding("utf-8");
253
-        response.setHeader("Content-disposition", "attachment;filename=助力活动发起.xlsx");
254
+        response.setHeader("Content-disposition", "attachment;filename=助力活动发起.xlsx");
254 255
 
255 256
         Integer orgId = getOrgId(request);
256 257
 
@@ -263,20 +264,84 @@ public class HelpActivityController extends BaseController {
263 264
          * 助力活动发起者
264 265
          */
265 266
         // 设置读取的class
266
-        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpInitiateRecordSucceed.class).registerWriteHandler(new CustomCellWriteHandler()).build();
267
-        // 设置 sheet, 同一个sheet只需要设置一次
268
-        WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
269
-        Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
270
-        pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
271
-        List<HelpInitiateRecordSucceed> publicList = null;
272
-        do {
273
-            publicList = taHelpActivityService.getHelpInitiateRecordSucceedExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
274
-            excelWriter.write(publicList, writeSheet);
275
-
276
-            pageCode++;
277
-        } while (pageCode <= pageCount);
278
-
279
-        // finish 会帮忙关闭流
280
-        excelWriter.finish();
267
+
268
+        if (1==code){
269
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpInitiateRecordSucceed.class).registerWriteHandler(new CustomCellWriteHandler()).build();
270
+            // 设置 sheet, 同一个sheet只需要设置一次
271
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
272
+            Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
273
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
274
+            List<HelpInitiateRecordSucceed> publicList = null;
275
+            do {
276
+                publicList = taHelpActivityService.getHelpInitiateRecordSucceedExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
277
+                excelWriter.write(publicList, writeSheet);
278
+
279
+                pageCode++;
280
+            } while (pageCode <= pageCount);
281
+
282
+            // finish 会帮忙关闭流
283
+            excelWriter.finish();
284
+        }else {
285
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpProceedAndFinish.class).registerWriteHandler(new CustomCellWriteHandler()).build();
286
+            // 设置 sheet, 同一个sheet只需要设置一次
287
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
288
+            Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
289
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
290
+            List<HelpProceedAndFinish> publicList = null;
291
+            do {
292
+                publicList = taHelpActivityService.getHelpProceedAndFinishExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
293
+                excelWriter.write(publicList, writeSheet);
294
+
295
+                pageCode++;
296
+            } while (pageCode <= pageCount);
297
+
298
+            // finish 会帮忙关闭流
299
+            excelWriter.finish();
300
+        }
301
+
302
+    }
303
+
304
+    /**
305
+     * 导出数据 客户列表 公客/私客
306
+     *
307
+     * @param request
308
+     * @param response
309
+     * @throws IOException
310
+     */
311
+    @GetMapping("/admin/helpRecord/export")
312
+    public void gethelpRecordExport(HttpServletRequest request,
313
+                                      HttpServletResponse response,
314
+                                      @RequestParam(value = "helpRecordInitiateId", required = false) Integer helpRecordInitiateId) throws IOException {
315
+        //        response.setContentType("application/vnd.ms-excel");
316
+        response.setContentType("application/octet-stream");
317
+        response.setCharacterEncoding("utf-8");
318
+        response.setHeader("Content-disposition", "attachment;filename=助力活动发起人.xlsx");
319
+
320
+        Integer orgId = getOrgId(request);
321
+
322
+        Integer pageCode = 0;
323
+        Integer pageSize = 100;
324
+        // 总页数
325
+        Integer pageCount = 0;
326
+
327
+        /**
328
+         * 助力活动发起者
329
+         */
330
+        // 设置读取的class
331
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpRecordExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
332
+            // 设置 sheet, 同一个sheet只需要设置一次
333
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
334
+            Integer count = taHelpActivityService.getHelpRecord(helpRecordInitiateId);
335
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
336
+            List<HelpRecordExport> publicList = null;
337
+            do {
338
+                publicList = taHelpActivityService.getHelpRecordExportList(pageCode * pageSize, pageSize,helpRecordInitiateId);
339
+                excelWriter.write(publicList, writeSheet);
340
+
341
+                pageCode++;
342
+            } while (pageCode <= pageCount);
343
+
344
+            // finish 会帮忙关闭流
345
+            excelWriter.finish();
281 346
     }
282 347
 }

+ 6
- 4
src/main/java/com/huiju/estateagents/excel/HelpInitiateRecordSucceed.java Wyświetl plik

@@ -1,6 +1,7 @@
1 1
 package com.huiju.estateagents.excel;
2 2
 
3 3
 import com.alibaba.excel.annotation.ExcelProperty;
4
+import com.alibaba.excel.annotation.format.DateTimeFormat;
4 5
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
5 6
 import com.baomidou.mybatisplus.annotation.IdType;
6 7
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -12,6 +13,7 @@ import lombok.experimental.Accessors;
12 13
 
13 14
 import java.io.Serializable;
14 15
 import java.time.LocalDateTime;
16
+import java.util.Date;
15 17
 
16 18
 /**
17 19
  * <p>
@@ -24,14 +26,13 @@ import java.time.LocalDateTime;
24 26
 @Data
25 27
 public class HelpInitiateRecordSucceed {
26 28
 
27
-    private static final long serialVersionUID = 1L;
28
-
29 29
     /**
30 30
      * 创建时间 也是助力发起时间
31 31
      */
32 32
     @ColumnWidth(15)
33
+    @DateTimeFormat("yyyy年MM月dd日")
33 34
     @ExcelProperty(value = "发起时间", index = 2)
34
-    private LocalDateTime createDate;
35
+    private Date createDate;
35 36
 
36 37
     /**
37 38
      * 人员姓名
@@ -53,8 +54,9 @@ public class HelpInitiateRecordSucceed {
53 54
      * 创建时间 也是助力发起时间
54 55
      */
55 56
     @ColumnWidth(15)
57
+    @DateTimeFormat("yyyy年MM月dd日")
56 58
     @ExcelProperty(value = "助力成功时间", index = 3)
57
-    private LocalDateTime succeedDate;
59
+    private Date succeedDate;
58 60
 
59 61
     /**
60 62
      * 核销状态

+ 8
- 15
src/main/java/com/huiju/estateagents/excel/HelpProceedAndFinish.java Wyświetl plik

@@ -1,6 +1,7 @@
1 1
 package com.huiju.estateagents.excel;
2 2
 
3 3
 import com.alibaba.excel.annotation.ExcelProperty;
4
+import com.alibaba.excel.annotation.format.DateTimeFormat;
4 5
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
5 6
 import com.baomidou.mybatisplus.annotation.IdType;
6 7
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -12,6 +13,7 @@ import lombok.experimental.Accessors;
12 13
 
13 14
 import java.io.Serializable;
14 15
 import java.time.LocalDateTime;
16
+import java.util.Date;
15 17
 
16 18
 /**
17 19
  * <p>
@@ -24,21 +26,14 @@ import java.time.LocalDateTime;
24 26
 @Data
25 27
 public class HelpProceedAndFinish {
26 28
 
27
-    private static final long serialVersionUID = 1L;
28
-
29 29
     /**
30 30
      * 创建时间 也是助力发起时间
31 31
      */
32 32
     @ColumnWidth(15)
33
-    @ExcelProperty(value = "发起时间", index = 1)
34
-    private LocalDateTime createDate;
33
+    @ExcelProperty(value = "发起时间", index = 2)
34
+    @DateTimeFormat("yyyy年MM月dd日")
35
+    private Date createDate;
35 36
 
36
-    /**
37
-     * 人员姓名
38
-     */
39
-    @ColumnWidth(15)
40
-    @ExcelProperty(value = "助力成功", index = 0)
41
-    private String name;
42 37
 
43 38
     /**
44 39
      * 人员手机号
@@ -48,12 +43,10 @@ public class HelpProceedAndFinish {
48 43
     private String phone;
49 44
 
50 45
     /**
51
-     * 助力成功时间
52
-     */    /**
53
-     * 创建时间 也是助力发起时间
46
+     * 人员姓名
54 47
      */
55 48
     @ColumnWidth(15)
56
-    @ExcelProperty(value = "助力成功时间", index = 3)
57
-    private LocalDateTime succeedDate;
49
+    @ExcelProperty(value = "发起者", index = 0)
50
+    private String name;
58 51
 
59 52
 }

+ 4
- 1
src/main/java/com/huiju/estateagents/mapper/HelpInitiateRecordMapper.java Wyświetl plik

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
6 6
 import com.baomidou.mybatisplus.core.metadata.IPage;
7 7
 import com.huiju.estateagents.entity.HelpInitiateRecord;
8 8
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
9
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
9 10
 import org.apache.ibatis.annotations.Mapper;
10 11
 import org.apache.ibatis.annotations.Param;
11 12
 
@@ -38,5 +39,7 @@ public interface HelpInitiateRecordMapper extends BaseMapper<HelpInitiateRecord>
38 39
      * @param tel
39 40
      * @param helpActivityId
40 41
      */
41
-    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("tel") Integer tel, @Param("helpActivityId") Integer helpActivityId);
42
+    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("tel") String tel, @Param("helpActivityId") Integer helpActivityId);
43
+
44
+    List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(@Param("pageCode") int i, @Param("pageSize")Integer pageSize, @Param("tel")String tel, @Param("helpActivityId")Integer helpActivityId);
42 45
 }

+ 12
- 0
src/main/java/com/huiju/estateagents/mapper/HelpRecordMapper.java Wyświetl plik

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 5
 import com.baomidou.mybatisplus.core.metadata.IPage;
6 6
 import com.huiju.estateagents.entity.HelpInitiateRecord;
7 7
 import com.huiju.estateagents.entity.HelpRecord;
8
+import com.huiju.estateagents.excel.HelpRecordExport;
8 9
 import org.apache.ibatis.annotations.Mapper;
9 10
 import org.apache.ibatis.annotations.Param;
10 11
 
12
+import java.util.List;
13
+
11 14
 /**
12 15
  * <p>
13 16
  * 助力活动助力人员记录  Mapper 接口
@@ -20,4 +23,13 @@ import org.apache.ibatis.annotations.Param;
20 23
 public interface HelpRecordMapper extends BaseMapper<HelpRecord> {
21 24
 
22 25
     IPage<HelpRecord> taHelpRecordDetails(IPage<HelpInitiateRecord> pg, @Param("helpRecordInitiateId") Integer helpRecordInitiateId);
26
+
27
+    /**
28
+     * 助力记录者
29
+     * @param i
30
+     * @param pageSize
31
+     * @param helpRecordInitiateId
32
+     * @return
33
+     */
34
+    List<HelpRecordExport> getHelpRecordExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("helpRecordInitiateId") Integer helpRecordInitiateId);
23 35
 }

+ 30
- 2
src/main/java/com/huiju/estateagents/service/IHelpActivityService.java Wyświetl plik

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
4 4
 import com.huiju.estateagents.base.ResponseBean;
5 5
 import com.huiju.estateagents.entity.HelpActivity;
6 6
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
7
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
8
+import com.huiju.estateagents.excel.HelpRecordExport;
7 9
 
8 10
 import javax.xml.crypto.Data;
9 11
 import java.util.List;
@@ -75,7 +77,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
75 77
      * @param helpActivityId
76 78
      * @return
77 79
      */
78
-    Integer getHelpInitiateRecordSucceed(Integer tel, Integer helpActivityId);
80
+    Integer getHelpInitiateRecordSucceed(String tel, Integer helpActivityId);
79 81
 
80 82
     /**
81 83
      * 导出助力成功数据
@@ -85,5 +87,31 @@ public interface IHelpActivityService extends IService<HelpActivity> {
85 87
      * @param helpActivityId
86 88
      * @return
87 89
      */
88
-    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, Integer tel, Integer helpActivityId);
90
+    List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, String tel, Integer helpActivityId);
91
+
92
+    /**
93
+     * 导出助力成功或者失败
94
+     * @param i
95
+     * @param pageSize
96
+     * @param tel
97
+     * @param helpActivityId
98
+     * @return
99
+     */
100
+    List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId);
101
+
102
+    /**
103
+     * 查询当前导出数据的总数
104
+     * @param helpRecordInitiateId
105
+     * @return
106
+     */
107
+    Integer getHelpRecord(Integer helpRecordInitiateId);
108
+
109
+    /**
110
+     * 查询当前助力者记录
111
+     * @param i
112
+     * @param pageSize
113
+     * @param helpRecordInitiateId
114
+     * @return
115
+     */
116
+    List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId);
89 117
 }

+ 25
- 3
src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java Wyświetl plik

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.StringUtils;
8 9
 import com.huiju.estateagents.entity.HelpActivity;
9 10
 import com.huiju.estateagents.entity.HelpInitiateRecord;
10 11
 import com.huiju.estateagents.entity.HelpRecord;
11 12
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
13
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
14
+import com.huiju.estateagents.excel.HelpRecordExport;
12 15
 import com.huiju.estateagents.mapper.HelpActivityMapper;
13 16
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
14 17
 import com.huiju.estateagents.mapper.HelpRecordMapper;
@@ -141,16 +144,35 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
141 144
     }
142 145
 
143 146
     @Override
144
-    public Integer getHelpInitiateRecordSucceed(Integer tel, Integer helpActivityId) {
147
+    public Integer getHelpInitiateRecordSucceed(String tel, Integer helpActivityId) {
145 148
         QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery= new QueryWrapper<>();
146 149
         helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
147
-        helpInitiateRecordQuery.eq("phone",tel);
150
+        helpInitiateRecordQuery.eq(!StringUtils.isEmpty(tel), "phone",tel);
148 151
         return helpInitiateRecordMapper.selectCount(helpInitiateRecordQuery);
149 152
     }
150 153
 
151 154
     @Override
152
-    public List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, Integer tel, Integer helpActivityId) {
155
+    public List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, String tel, Integer helpActivityId) {
153 156
          List<HelpInitiateRecordSucceed> lsit= helpInitiateRecordMapper.getHelpInitiateRecordSucceedExportList(i,pageSize,tel,helpActivityId);
154 157
         return lsit;
155 158
     }
159
+
160
+    @Override
161
+    public List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId) {
162
+        List<HelpProceedAndFinish> lsit= helpInitiateRecordMapper.getHelpProceedAndFinishExportList(i,pageSize,tel,helpActivityId);
163
+        return lsit;
164
+    }
165
+
166
+    @Override
167
+    public Integer getHelpRecord(Integer helpRecordInitiateId) {
168
+        QueryWrapper<HelpRecord> helpInitiateRecordQuery= new QueryWrapper<>();
169
+        helpInitiateRecordQuery.eq("help_record_initiate_id",helpRecordInitiateId);
170
+        return helpRecordMapper.selectCount(helpInitiateRecordQuery);
171
+    }
172
+
173
+    @Override
174
+    public List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId) {
175
+        List<HelpRecordExport> lsit= helpRecordMapper.getHelpRecordExportList(i,pageSize,helpRecordInitiateId);
176
+        return lsit;
177
+    }
156 178
 }

+ 18
- 4
src/main/resources/mapper/HelpInitiateRecordMapper.xml Wyświetl plik

@@ -27,10 +27,24 @@
27 27
 
28 28
     <select id="getHelpInitiateRecordSucceedExportList" resultType="com.huiju.estateagents.excel.HelpInitiateRecordSucceed">
29 29
     SELECT
30
-   b.*,
31
-    if(b.verification_status = 0, '未核销', if(b.verification_status = 1, '已核销', '未知')) as sex
32
-    from ta_help_initiate_record
33
-    where help_activity_id =  #{helpActivityId}
30
+    b.name as name,
31
+    b.create_date as createDate,
32
+    b.phone as phone,
33
+    b.succeed_date as succeedDate,
34
+    if(b.verification_status = 0, '未核销', if(b.verification_status = 1, '已核销', '未知')) as verificationStatus
35
+    from ta_help_initiate_record b
36
+    where b.help_activity_id =  #{helpActivityId}
37
+     order by b.create_date desc
38
+     limit #{pageCode}, #{pageSize}
39
+    </select>
40
+
41
+    <select id="getHelpProceedAndFinishExportList" resultType="com.huiju.estateagents.excel.HelpProceedAndFinish">
42
+    SELECT
43
+    b.name as name,
44
+    b.create_date as createDate,
45
+    b.phone as phone
46
+    from ta_help_initiate_record b
47
+    where b.help_activity_id =  #{helpActivityId}
34 48
      order by b.create_date desc
35 49
      limit #{pageCode}, #{pageSize}
36 50
     </select>

+ 11
- 0
src/main/resources/mapper/HelpRecordMapper.xml Wyświetl plik

@@ -5,4 +5,15 @@
5 5
     select * from ta_help_record
6 6
     where help_record_initiate_id =#{helpRecordInitiateId}
7 7
 </select>
8
+
9
+    <select id="getHelpRecordExportList" resultType="com.huiju.estateagents.excel.HelpRecordExport">
10
+    SELECT
11
+    b.name as name,
12
+    b.create_date as createDate,
13
+    b.phone as phone
14
+    from ta_help_record b
15
+    where b.help_activity_id =  #{helpActivityId}
16
+     order by b.create_date desc
17
+     limit #{pageCode}, #{pageSize}
18
+    </select>
8 19
 </mapper>