合并

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

@@ -133,7 +133,7 @@ public class HelpActivityController extends BaseController {
         helpActivity.setCityId(cityId);
         // 活动暂且定位为未开始
         helpActivity.setActivityStatus(1);
-        helpActivity.setStatus(0);
+        helpActivity.setStatus(1);
         helpActivity.setWeight(0);
         helpActivity.setIsMain(false);
         taHelpActivityService.helpActivityAdd(helpActivity, orgId);
@@ -235,14 +235,16 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "helpActivityId", paramType = "query", value = "助力ID"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "tel", paramType = "query", value = "tel"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query", value = "status: helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败")
     })
     @RequestMapping(value = "admin/helpRecord", method = RequestMethod.GET)
     public ResponseBean helpRecord(@RequestParam(value = "helpActivityId", required = false) Integer helpActivityId,
                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                   @RequestParam(value = "status", required = false) String status) {
-        ResponseBean helpRecord = taHelpActivityService.helpRecord(helpActivityId, status, pageNum, pageSize);
+                                   @RequestParam(value = "status", required = false) String status,
+                                   @RequestParam(value = "tel", required = false) String tel) {
+        ResponseBean helpRecord = taHelpActivityService.helpRecord(helpActivityId, status, pageNum, pageSize,tel);
         return helpRecord;
     }
 
@@ -275,7 +277,7 @@ public class HelpActivityController extends BaseController {
     }
 
     /**
-     * 导出数据 客户列表 公客/私客
+     * 导出数据 成功/进行/失败
      *
      * @param request
      * @param response
@@ -286,7 +288,7 @@ public class HelpActivityController extends BaseController {
                                       HttpServletResponse response,
                                       @RequestParam(value = "tel", required = false) String tel,
                                       @RequestParam(value = "helpActivityId", required = false) Integer helpActivityId,
-                                      @RequestParam(value = "code", required = false) int code) throws IOException {
+                                      @RequestParam(value = "condition", required = false) String condition) throws IOException {
         //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -303,8 +305,8 @@ public class HelpActivityController extends BaseController {
          * 助力活动发起者
          */
         // 设置读取的class
-
-        if (1==code){
+       // code：helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败
+        if ("helpSucceed".equals(condition)){
             ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpInitiateRecordSucceed.class).registerWriteHandler(new CustomCellWriteHandler()).build();
             // 设置 sheet, 同一个sheet只需要设置一次
             WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
@@ -328,7 +330,7 @@ public class HelpActivityController extends BaseController {
             pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
             List<HelpProceedAndFinish> publicList = null;
             do {
-                publicList = taHelpActivityService.getHelpProceedAndFinishExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
+                publicList = taHelpActivityService.getHelpProceedAndFinishExportList(pageCode * pageSize, pageSize,tel,helpActivityId,condition);
                 excelWriter.write(publicList, writeSheet);
 
                 pageCode++;

src/main/java/com/huiju/estateagents/entity/HelpActivity.java

@@ -112,7 +112,7 @@ public class HelpActivity implements Serializable {
     /**
      * 活动状态
      */
-    private int activityStatus;
+    private Integer activityStatus;
     
     /**
      * Initiate 发起者  Booster 助力者

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

@@ -31,7 +31,7 @@ public interface HelpInitiateRecordMapper extends BaseMapper<HelpInitiateRecord>
      * @param status
      * @return
      */
-    IPage<HelpInitiateRecord> selectPageList(IPage<HelpInitiateRecord> pg, @Param("helpActivityId") Integer helpActivityId, @Param("status") String status);
+    IPage<HelpInitiateRecord> selectPageList(IPage<HelpInitiateRecord> pg, @Param("helpActivityId") Integer helpActivityId, @Param("status") String status,@Param("tel")String tel);
 
     /**
      * 助力成功记录导出
@@ -43,7 +43,16 @@ public interface HelpInitiateRecordMapper extends BaseMapper<HelpInitiateRecord>
 
     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);
+	/***
+	 * 助力 进行中/失败导出
+	 * @param i
+	 * @param pageSize
+	 * @param tel
+	 * @param helpActivityId
+	 * @param condition
+	 * @return
+	 */
+    List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(@Param("pageCode") int i, @Param("pageSize")Integer pageSize, @Param("tel")String tel, @Param("helpActivityId")Integer helpActivityId,@Param("condition")String condition);
 
     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/service/IHelpActivityService.java

@@ -52,7 +52,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param helpActivityId
      * @return
      */
-    ResponseBean helpRecord(Integer helpActivityId,String status,Integer pageNum,Integer pageSize);
+    ResponseBean helpRecord(Integer helpActivityId,String status,Integer pageNum,Integer pageSize,String tel);
 
     /**
      * 当前发起人的助力人数
@@ -97,7 +97,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param helpActivityId
      * @return
      */
-    List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId);
+    List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId,String condition);
 
     /**
      * 查询当前导出数据的总数

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

@@ -66,7 +66,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpRecord(Integer helpActivityId, String status,Integer pageNum,Integer pageSize) {
+    public ResponseBean helpRecord(Integer helpActivityId, String status,Integer pageNum,Integer pageSize,String tel) {
         ResponseBean responseBean = new ResponseBean<>();
         //  status: helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败
 
@@ -75,7 +75,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
         // 得到活动限制助力的总数
         int persionNumCount = helpActivity.getPersonNum();
         IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPageList(pg,helpActivityId,status);
+        IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPageList(pg,helpActivityId,status,tel);
 
         List<HelpInitiateRecord>  helpInitiateRecordList= list.getRecords();
         for (HelpInitiateRecord helpInitiateRecord : helpInitiateRecordList) {
@@ -163,8 +163,8 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId) {
-        List<HelpProceedAndFinish> lsit= helpInitiateRecordMapper.getHelpProceedAndFinishExportList(i,pageSize,tel,helpActivityId);
+    public List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId,String condition) {
+        List<HelpProceedAndFinish> lsit= helpInitiateRecordMapper.getHelpProceedAndFinishExportList(i,pageSize,tel,helpActivityId,condition);
         return lsit;
     }
 

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -14,14 +14,18 @@
             AND hi.verification !=''
         </if>
        <if test="status == 'helpUnderway'">
-           and (hi.verification = 'null' OR hi.verification = '')
+           and (hi.verification is null OR hi.verification = '')
            AND hi.`status` = 1
        </if>
 
-       <if test="status == 'helpUnfinished '">
-           and (hi.verification = 'null' OR hi.verification = '')
+       <if test="status == 'helpUnfinished'">
+           and (hi.verification is null
+           OR hi.verification = '')
            AND hi.`status` =  2
        </if>
+           <if test="tel != null and tel != ''">
+               AND hi.phone = #{tel}
+           </if>
        </where>
     </select>
 
@@ -34,6 +38,10 @@
     if(b.verification_status = 0, '未核销', if(b.verification_status = 1, '已核销', '未知')) as verificationStatus
     from ta_help_initiate_record b
     where b.help_activity_id =  #{helpActivityId}
+    and b.`status` =  0
+    <if test="tel != null and tel != ''">
+        AND b.phone = #{tel}
+    </if>
      order by b.create_date desc
      limit #{pageCode}, #{pageSize}
     </select>
@@ -45,6 +53,15 @@
     b.phone as phone
     from ta_help_initiate_record b
     where b.help_activity_id =  #{helpActivityId}
+    <if test="condition == 'helpSucceed'">
+        and b.status = 1
+    </if>
+    <if test="condition == 'helpUnfinished'">
+        and b.status = 2
+    </if>
+    <if test="tel != null and tel != ''">
+        AND b.phone = #{tel}
+    </if>
      order by b.create_date desc
      limit #{pageCode}, #{pageSize}
     </select>