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

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

@@ -1,6 +1,9 @@
 package com.huiju.estateagents.controller;
 
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +14,9 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaSharePersonFromMapper;
@@ -29,8 +35,10 @@ import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.swing.*;
+import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -468,17 +476,23 @@ public class TaBuildingDynamicController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
-            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID")
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID"),
+            @ApiImplicitParam(dataType = "String", name = "isCheckin", paramType = "query",value = "0未签到1签到"),
+            @ApiImplicitParam(dataType = "String", name = "name", paramType = "query",value = "用户姓名"),
+            @ApiImplicitParam(dataType = "String", name = "phone", paramType = "query",value = "手机号")
     })
     @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
     public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                     @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                     @RequestParam(value = "dynamicId",required = false)String dynamicId,
+                                    @RequestParam(value = "isCheckin",required = false)String isCheckin,
+                                    @RequestParam(value = "name",required = false)String name,
+                                    @RequestParam(value = "phone",required = false)String phone,
                                     HttpServletRequest request) {
         Page<TaActivityDynamicEnlist> page = new Page<>();
         page.setSize(pageSize);
         page.setCurrent(pageNum);
-        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId, getOrgId(request));
+        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId, getOrgId(request),isCheckin,name,phone);
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("list", signList);
@@ -512,6 +526,49 @@ public class TaBuildingDynamicController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 报名记录导出
+     *
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/admin/activityDynamicEnlist/export")
+    public void activityDynamicEnlistExport(HttpServletRequest request,
+                                      HttpServletResponse response,
+                                      @RequestParam(value = "dynamicId",required = false)String dynamicId,
+                                      @RequestParam(value = "isCheckin",required = false)String isCheckin,
+                                      @RequestParam(value = "name",required = false)String name,
+                                      @RequestParam(value = "phone",required = false)String phone) 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;
+
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TaActivityDynamicEnlistExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("报名记录").build();
+            Integer count = iBuildingDynamicService.getTaActivityDynamicEnlist(dynamicId,isCheckin,name,phone);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpInitiateRecordSucceed> publicList = null;
+            do {
+                publicList = iBuildingDynamicService.getTaActivityDynamicEnlistExport(pageCode * pageSize, pageSize,dynamicId,isCheckin,name,phone,getOrgId(request));
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+
 
 
 }

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

@@ -144,6 +144,32 @@ public class TaDocumentVerifyController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 微信查询对象
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify",method= RequestMethod.GET)
+    public ResponseBean wxDocumentVerifyUpdate(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String personId = getPersonId(request);
+        Integer orgId = getOrgId(request);
+        QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.eq("org_id", orgId);
+        TaDocumentVerify verify = iTaDocumentVerifyService.getOne(queryWrapper);
+        if (null != verify) {
+            QueryWrapper<TaDocumentImg> documentImgQueryWrapper = new QueryWrapper<>();
+            documentImgQueryWrapper.eq("document_verify_id", verify.getDocumentVerifyId());
+            documentImgQueryWrapper.eq("person_id", verify.getPersonId());
+            documentImgQueryWrapper.eq("org_id", orgId);
+            List<TaDocumentImg> documentImgList = documentImgService.list(documentImgQueryWrapper);
+            verify.setImgList(documentImgList);
+        }
+
+        responseBean.addSuccess(verify);
+        return responseBean;
+    }
+
     /**
      * 微信修改对象
      * @param id  实体ID

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

@@ -65,11 +65,6 @@ public class TaShareActivity implements Serializable {
      */
     private Integer groupBuyPeople;
 
-    /**
-     * 参与人数
-     */
-    private Integer joinPeople;
-
     /**
      * 所需积分
      */

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

@@ -60,6 +60,11 @@ public class TaShareRecord implements Serializable {
      */
     private String avatarurl;
 
+    /**
+     * 参与人数
+     */
+    private Integer joinPeople;
+
     /**
      * 拼团时间
      */

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

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class TaActivityDynamicEnlistExport implements Serializable {
+
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户姓名", index = 0)
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String phone;
+
+    /**
+     * 参与人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "参与人数", index = 2)
+    private Integer attendNum;
+
+    /**
+     * 报名时间
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报名时间", index = 3)
+    private Date createDate;
+
+    /**
+     * 推广人
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人", index = 4)
+    private String sharePersonName;
+
+    /**
+     * 公司
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "公司", index = 5)
+    private String orgName;
+
+    /**
+     * 公司
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "签到状态", index = 6)
+    private String isCheckin;
+
+
+
+}

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,7 +26,7 @@ public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDyna
      * @param dynamicId
      * @return
      */
-    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId);
+    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId,@Param("isCheckin") String isCheckin,@Param("name") String name,@Param("phone") String phone);
 
     /**
      * 查询活动已经报名的总人数
@@ -33,4 +34,16 @@ public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDyna
      * @return
      */
     Integer selectEnlistCount(@Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId);
+
+    /**
+     * 导出报名记录
+     * @param i
+     * @param pageSize
+     * @param dynamicId
+     * @param isCheckin
+     * @param name
+     * @param phone
+     * @return
+     */
+    List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("dynamicId") String dynamicId, @Param("isCheckin") String isCheckin, @Param("name") String name, @Param("phone") String phone,@Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/po/TaShareRecordPO.java

@@ -16,5 +16,4 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class TaShareRecordPO extends TaShareRecord {
     private Integer groupBuyPeople;
-    private Integer joinPeople;
 }

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -80,7 +81,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @param page
      * @return
      */
-    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId);
+    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId,String isCheckin,String name,String phone);
 
     IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
 
@@ -97,4 +98,26 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @param endActivityId
      */
     void updateEndActivity(List<String> endActivityId);
+
+    /**
+     * 报名记录导出当前总数
+     * @param dynamicId
+     * @param isCheckin
+     * @param name
+     * @param phone
+     * @return
+     */
+    Integer getTaActivityDynamicEnlist(String dynamicId, String isCheckin, String name, String phone);
+
+    /**
+     * 报名记录导出
+     * @param i
+     * @param pageSize
+     * @param dynamicId
+     * @param isCheckin
+     * @param name
+     * @param phone
+     * @return
+     */
+    List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(int i, Integer pageSize, String dynamicId, String isCheckin, String name, String phone,Integer orgId);
 }

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

@@ -70,7 +70,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
-		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
+		if (null != helpInitiateRecord.getEnlistNum() && helpInitiateRecord.getEnlistNum() >= helpActivity.getPersonNum()){
 			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
@@ -254,8 +255,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId, Integer orgId) {
-        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId, orgId);
+    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId, Integer orgId,String isCheckin,String name,String phone) {
+        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId, orgId,isCheckin,name,phone);
         return ResponseBean.success(signList);
     }
 
@@ -334,6 +335,21 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         }
     }
 
+    @Override
+    public Integer getTaActivityDynamicEnlist(String dynamicId, String isCheckin, String name, String phone) {
+        QueryWrapper<TaActivityDynamicEnlist> querTaActivityDynamicEnlist = new QueryWrapper<>();
+        querTaActivityDynamicEnlist.eq("dynamic_id",dynamicId);
+        querTaActivityDynamicEnlist.eq(!StringUtils.isEmpty(isCheckin),"is_checkin",isCheckin);
+        querTaActivityDynamicEnlist.eq(!StringUtils.isEmpty(name),"name",name);
+        querTaActivityDynamicEnlist.eq(!StringUtils.isEmpty(phone),"name",phone);
+        return taActivityDynamicEnlistMapper.selectCount(querTaActivityDynamicEnlist);
+    }
+
+    @Override
+    public List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(int i, Integer pageSize, String dynamicId, String isCheckin, String name, String phone,Integer orgId) {
+        return taActivityDynamicEnlistMapper.getTaActivityDynamicEnlistExport(i,pageSize,dynamicId,isCheckin,name,phone,orgId);
+    }
+
     @Override
     public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();

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

@@ -23,7 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -60,12 +62,14 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
             TaPerson taPerson = taPersonMapper.getById(taShareChildRecord.getPersonId());
             TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareChildRecord.getGroupActivityId());
 
+            TaShareRecord record = tashareRecordmapper.selectById(taShareChildRecord.getRecordId());
+
             if (taPerson.getPoints() == null || taPerson.getPoints() < taShareActivity.getIntegral()){
                 responseBean.addError("积分不足");
                 return responseBean;
             }
             //判断参团人数是否已满
-            if (taShareActivity.getGroupBuyPeople().equals(taShareActivity.getJoinPeople())){
+            if (taShareActivity.getGroupBuyPeople().equals(record.getJoinPeople())){
                 TaShareRecord taShareRecord = new TaShareRecord();
                 taShareRecord.setStatus(0);
                 taShareRecord.setRecordId(taShareChildRecord.getRecordId());
@@ -126,7 +130,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         
         //查看是否拼团成功
         TaShareActivity taShareActivity = activityMapper.selectById(taShareChildRecord.getGroupActivityId());
-        if (taShareActivity.getJoinPeople() >= taShareActivity.getGroupBuyPeople()){
+        if (taShareRecord.getJoinPeople() >= taShareActivity.getGroupBuyPeople()){
             return ResponseBean.error("拼团失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
@@ -150,7 +154,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         }
         
         //反更新人数
-        taShareActivity.setJoinPeople(taShareActivity.getJoinPeople()+1);
+        taShareRecord.setJoinPeople(taShareRecord.getJoinPeople()+1);
         activityMapper.updateById(taShareActivity);
     
         //成为团员
@@ -158,7 +162,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         taShareChildRecord.setStatus(CommConstant.STATUS_NORMAL);
         taShareChildRecord.setPersonId(person.getPersonId());
         taShareChildRecordMapper.insert(taShareChildRecord);
-        if (taShareActivity.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
+        if (taShareRecord.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
             //发送微信模板消息所有人都发送
             sendWxMessage(taShareRecord,orgId,taShareActivity);
             
@@ -169,7 +173,10 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
             taShareRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
         }
         tashareRecordmapper.updateById(taShareRecord);
-        return ResponseBean.success(taShareRecord);
+        Map<String,Object> map = new HashMap<>();
+        map.put("taShareChildRecord",taShareChildRecord);
+        map.put("taShareRecord",taShareRecord);
+        return ResponseBean.success(map);
     }
     
     /**

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

@@ -197,6 +197,7 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         //扣取积分,更新参团人数
         person.setPoints(person.getPoints() - taShareActivity.getIntegral());
         taPersonMapper.updateById(person);
+        taShareRecord.setJoinPeople(1);
         //保存拼团团长数据
         taShareRecord.setOrgId(orgId);
         taShareRecord.setPersonId(person.getPersonId());

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -11,13 +11,52 @@
                     ta_activity_dynamic_enlist tade
                     LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id AND tspf.target_type = 'dynamic_share' and tspf.status = 1 and tade.person_id = tspf.person_id
                     LEFT JOIN ta_person tp ON tspf.share_person = tp.user_id
-                WHERE
+                <where>
                     tade.dynamic_id = #{dynamicId}
-                AND tade.org_id = #{orgId}
+                    AND tade.org_id = #{orgId}
+
+                    <if test="name != null and name !=''">
+                        and tade.name like CONCAT('%',#{name}, '%')
+                    </if>
+                    <if test="isCheckin != null and isCheckin !=''">
+                        and tade.is_checkin like CONCAT('%',#{isCheckin}, '%')
+                    </if>
+                    <if test="phone != null and phone !=''">
+                        and tade.phone like CONCAT('%',#{phone}, '%')
+                    </if>
+                </where>
+
 
         </select>
 
         <select id="selectEnlistCount" resultType="Integer" >
             select ifnull(sum( attend_num ), 0) from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
         </select>
+
+    <select id="getTaActivityDynamicEnlistExport" resultType="com.huiju.estateagents.excel.TaActivityDynamicEnlistExport">
+
+        SELECT
+        tade.*,
+        tp.NAME AS sharePersonName,
+        tp.company AS orgName
+        FROM
+        ta_activity_dynamic_enlist tade
+        LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id AND tspf.target_type = 'dynamic_share' and tspf.status = 1 and tade.person_id = tspf.person_id
+        LEFT JOIN ta_person tp ON tspf.share_person = tp.user_id
+        <where>
+            tade.dynamic_id = #{dynamicId}
+            AND tade.org_id = #{orgId}
+
+            <if test="name != null and name !=''">
+                and tade.name like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="isCheckin != null and isCheckin !=''">
+                and tade.is_checkin like CONCAT('%',#{isCheckin}, '%')
+            </if>
+            <if test="phone != null and phone !=''">
+                and tade.phone like CONCAT('%',#{phone}, '%')
+            </if>
+        </where>
+        limit #{pageCode}, #{pageSize}
+    </select>
 </mapper>