|
@@ -133,7 +133,7 @@ public class HelpActivityController extends BaseController {
|
133
|
133
|
helpActivity.setCityId(cityId);
|
134
|
134
|
// 活动暂且定位为未开始
|
135
|
135
|
helpActivity.setActivityStatus(1);
|
136
|
|
- helpActivity.setStatus(0);
|
|
136
|
+ helpActivity.setStatus(1);
|
137
|
137
|
helpActivity.setWeight(0);
|
138
|
138
|
helpActivity.setIsMain(false);
|
139
|
139
|
taHelpActivityService.helpActivityAdd(helpActivity, orgId);
|
|
@@ -235,14 +235,16 @@ public class HelpActivityController extends BaseController {
|
235
|
235
|
@ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
|
236
|
236
|
@ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
|
237
|
237
|
@ApiImplicitParam(dataTypeClass = String.class, name = "helpActivityId", paramType = "query", value = "助力ID"),
|
|
238
|
+ @ApiImplicitParam(dataTypeClass = String.class, name = "tel", paramType = "query", value = "tel"),
|
238
|
239
|
@ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query", value = "status: helpSucceed助力成功,helpUnderway进行中,helpUnfinished助力失败")
|
239
|
240
|
})
|
240
|
241
|
@RequestMapping(value = "admin/helpRecord", method = RequestMethod.GET)
|
241
|
242
|
public ResponseBean helpRecord(@RequestParam(value = "helpActivityId", required = false) Integer helpActivityId,
|
242
|
243
|
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
|
243
|
244
|
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
|
244
|
|
- @RequestParam(value = "status", required = false) String status) {
|
245
|
|
- ResponseBean helpRecord = taHelpActivityService.helpRecord(helpActivityId, status, pageNum, pageSize);
|
|
245
|
+ @RequestParam(value = "status", required = false) String status,
|
|
246
|
+ @RequestParam(value = "tel", required = false) String tel) {
|
|
247
|
+ ResponseBean helpRecord = taHelpActivityService.helpRecord(helpActivityId, status, pageNum, pageSize,tel);
|
246
|
248
|
return helpRecord;
|
247
|
249
|
}
|
248
|
250
|
|
|
@@ -275,7 +277,7 @@ public class HelpActivityController extends BaseController {
|
275
|
277
|
}
|
276
|
278
|
|
277
|
279
|
/**
|
278
|
|
- * 导出数据 客户列表 公客/私客
|
|
280
|
+ * 导出数据 成功/进行/失败
|
279
|
281
|
*
|
280
|
282
|
* @param request
|
281
|
283
|
* @param response
|
|
@@ -286,7 +288,7 @@ public class HelpActivityController extends BaseController {
|
286
|
288
|
HttpServletResponse response,
|
287
|
289
|
@RequestParam(value = "tel", required = false) String tel,
|
288
|
290
|
@RequestParam(value = "helpActivityId", required = false) Integer helpActivityId,
|
289
|
|
- @RequestParam(value = "code", required = false) int code) throws IOException {
|
|
291
|
+ @RequestParam(value = "condition", required = false) String condition) throws IOException {
|
290
|
292
|
// response.setContentType("application/vnd.ms-excel");
|
291
|
293
|
response.setContentType("application/octet-stream");
|
292
|
294
|
response.setCharacterEncoding("utf-8");
|
|
@@ -303,8 +305,8 @@ public class HelpActivityController extends BaseController {
|
303
|
305
|
* 助力活动发起者
|
304
|
306
|
*/
|
305
|
307
|
// 设置读取的class
|
306
|
|
-
|
307
|
|
- if (1==code){
|
|
308
|
+ // code:helpSucceed助力成功,helpUnderway进行中,helpUnfinished助力失败
|
|
309
|
+ if ("helpSucceed".equals(condition)){
|
308
|
310
|
ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpInitiateRecordSucceed.class).registerWriteHandler(new CustomCellWriteHandler()).build();
|
309
|
311
|
// 设置 sheet, 同一个sheet只需要设置一次
|
310
|
312
|
WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
|
|
@@ -328,7 +330,7 @@ public class HelpActivityController extends BaseController {
|
328
|
330
|
pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
|
329
|
331
|
List<HelpProceedAndFinish> publicList = null;
|
330
|
332
|
do {
|
331
|
|
- publicList = taHelpActivityService.getHelpProceedAndFinishExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
|
|
333
|
+ publicList = taHelpActivityService.getHelpProceedAndFinishExportList(pageCode * pageSize, pageSize,tel,helpActivityId,condition);
|
332
|
334
|
excelWriter.write(publicList, writeSheet);
|
333
|
335
|
|
334
|
336
|
pageCode++;
|