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

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -59,16 +59,16 @@ public class ActivityServiceImpl implements ActivityServiceI {
 		queryWrapper.eq("org_id",orgId);
 		queryWrapper.eq("person_id",person.getPersonId());
 		List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
-		//查询是否报名了分享活动
+		//查询是否报名了拼团活动
 		QueryWrapper<TaShareRecord> taShareRecordQueryWrapper = new QueryWrapper<>();
 		taShareRecordQueryWrapper.eq("org_id",orgId);
 		taShareRecordQueryWrapper.eq("person_id",person.getPersonId());
 		List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
 		//判断是否报名了助力活动
-		QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
-		helpRecordQueryWrapper.eq("org_id",orgId);
-		helpRecordQueryWrapper.eq("person_id",person.getPersonId());
-		List<HelpRecord> helpRecords = helpRecordMapper.selectList(helpRecordQueryWrapper);
+		QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
+		helpInitiateRecordListQueryWrapper.eq("org_id",orgId);
+		helpInitiateRecordListQueryWrapper.eq("person_id",person.getPersonId());
+		List<HelpInitiateRecord> HelpInitiateRecords = helpInitiateRecordMapper.selectList(helpInitiateRecordListQueryWrapper);
 		
 		//分页获取全部数据
 		Page pg = new Page(pageNumber,pageSize);
@@ -95,7 +95,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
 				List<TaShareRecord> taShareRecordsList = taShareRecordMapper.selectList(shareRecordQueryWrapper);
 				e.setSuccessNum(taShareRecordsList.size());
 			}else if (e.getType().equals("help")){
-				helpRecords.forEach(help -> {
+				HelpInitiateRecords.forEach(help -> {
 					if (e.getId().equals(help.getHelpActivityId())){
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -429,4 +429,22 @@ public class CommConstant {
 	public static final Object GROUP_ACTIVITY = "groupActivity";
 	public static final String TARGET_TYPE_H5 = "H5";
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
+    
+    /**
+     * 消息通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_NOTICE = "notice";
+    
+    /**
+     * 助力通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_HELP = "help-result";
+    
+    /**
+     * 拼团通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_GROUP = "group-result";
 }

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

@@ -110,7 +110,7 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, name = "endDate", paramType = "query", value = "活动结束时间"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "activityStatus", paramType = "query", value = "活动状态")
     })
-    @RequestMapping(value = "admin/helpActivity/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/helpActivity/list", method = RequestMethod.GET)
     public ResponseBean helpActivityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
@@ -125,11 +125,34 @@ public class HelpActivityController extends BaseController {
         return helpActivityList;
     }
 
+    /**
+     * 活动助力列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "活动助力列表 已开始 和 未开始", notes = "活动助力列表 已开始 和 未开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query", value = "城市"),
+    })
+    @RequestMapping(value = "/admin/helpActivityEffective/list", method = RequestMethod.GET)
+    public ResponseBean helpActivityEffectiveList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "cityId", required = false) Integer cityId,
+                                         HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId);
+        return helpActivityList;
+    }
+
     @ApiOperation(value = "活动助力新增", notes = "活动助力新增")
     @ApiImplicitParams({
             @ApiImplicitParam(dataType = "HelpActivity", name = "parameter", paramType = "body", value = "当前对象")
     })
-    @RequestMapping(value = "admin/helpActivity/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/helpActivity/add", method = RequestMethod.POST)
     public ResponseBean helpActivityAdd(@RequestBody String parameter, HttpServletRequest request) {
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
         ResponseBean responseBean = new ResponseBean();
@@ -348,7 +371,7 @@ public class HelpActivityController extends BaseController {
     }
 
     /**
-     * 助力活动发起人
+     * 助力活动查询当前助力者记录
      *
      * @param request
      * @param response
@@ -441,6 +464,11 @@ public class HelpActivityController extends BaseController {
                 helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
                 helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
                 List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
+                helpRecordList.forEach(e -> {
+                    if (e.getPersonId().equals(person.getPersonId())){
+                        map.put("isJoin",true);
+                    }
+                });
         
                 map.put("helpInitiateRecord",helpInitiateRecord);
                 map.put("helpRecordList",helpRecordList);
@@ -484,7 +512,7 @@ public class HelpActivityController extends BaseController {
     })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
-                                               @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                               @RequestParam(value = "buildingId",required = false) String buildingId,
                                                @RequestParam(value = "type",required = false)Integer type) {
             ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
                 return lsit;

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

@@ -132,7 +132,7 @@ public class TaBuildingDynamicController extends BaseController {
 
     /**
      * 活动列表
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @param request
      * @return
@@ -200,8 +200,23 @@ public class TaBuildingDynamicController extends BaseController {
                 QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
                 buildingDynamicQueryWrapper.in("dynamic_id",ids);
                 IPage<TaBuildingDynamic> buildingDynamicIPage = iBuildingDynamicService.page(page,buildingDynamicQueryWrapper);
+    
+                //查询是否报名了普通活动
+                QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id",getOrgId(request));
+                queryWrapper.eq("person_id",person.getPersonId());
+                List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+                
                 for(int j=0;j<buildingDynamicIPage.getRecords().size();j++){
                     iBuildingDynamicService.setExtendInfo(buildingDynamicIPage.getRecords().get(j),person);
+                    
+                    //是否已参与状态
+                    TaBuildingDynamic taBuildingDynamic = buildingDynamicIPage.getRecords().get(j);
+                    taActivityDynamicEnlists.forEach(dynamic -> {
+                        if (taBuildingDynamic.getDynamicId().equals(dynamic.getDynamicId())){
+                            taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                        }
+                    });
                 }
                 responseBean.addSuccess(buildingDynamicIPage);
             }else {
@@ -391,7 +406,8 @@ public class TaBuildingDynamicController extends BaseController {
         taMiniappQuery.eq("org_id",getOrgId(request));
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
         iBuildingDynamicService.save(dynamic);
-        TaMiniappQrcode taMiniappQrcode = miniAppService.createActivityQrcode(taMiniapp.getMiniappId(),CommConstant.ACTIVITY_QRCODE.replace("#0",dynamic.getDynamicId()).replace("#1","activity"));
+        // 生成二维码
+        TaMiniappQrcode taMiniappQrcode = miniAppService.createActivityQrcode(taMiniapp.getMiniappId());
         dynamic.setQrCode(taMiniappQrcode.getQrCode());
         iBuildingDynamicService.updateById(dynamic);
         responseBean.addSuccess(dynamic);

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

@@ -6,18 +6,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.TaApartmentImg;
-import com.huiju.estateagents.entity.TaDocumentImg;
-import com.huiju.estateagents.entity.TaDocumentVerify;
-import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.service.ITaDocumentImgService;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
 import com.huiju.estateagents.service.ITaPersonService;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -65,10 +65,41 @@ public class TaDocumentVerifyController extends BaseController {
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            @RequestParam(value ="name",required = false) String name,
                                            @RequestParam(value ="tel",required = false) String tel,
+                                           @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime startDate,
+                                           @RequestParam(value = "endDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime endDate,
                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel,getOrgId(request));
+            IPage<TaDocumentVerifyModel> result = iTaDocumentVerifyService.getAdminDocumentList(pageNum,pageSize,name,tel,getOrgId(request),startDate,endDate);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信查询我的审核列表
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify/list",method= RequestMethod.GET)
+    public ResponseBean wxDocumentVerifyList(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.eq("org_id",orgId);
+            queryWrapper.orderByAsc("verify_status");
+            List<TaDocumentVerify>result = iTaDocumentVerifyService.list(queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -84,7 +115,7 @@ public class TaDocumentVerifyController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
-    public ResponseBean wxDocumentVerifyAdd(@RequestBody List<TaDocumentImg>list, HttpServletRequest request){
+    public ResponseBean wxDocumentVerifyAdd(@RequestBody List<TaDocumentImg>list,@RequestParam(value ="documentTitle",required = false)String documentTitle, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);
@@ -99,6 +130,7 @@ public class TaDocumentVerifyController extends BaseController {
         documentVerify.setPersonId(person.getPersonId());
         documentVerify.setStatus(CommConstant.STATUS_NORMAL);
         documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
+        documentVerify.setDocumentTitle(documentTitle);
         try {
             if (iTaDocumentVerifyService.save(documentVerify)){
                 for(int i =0; i<list.size();i++){
@@ -148,15 +180,11 @@ public class TaDocumentVerifyController extends BaseController {
      * 微信查询对象
      * @return
      */
-    @RequestMapping(value="/wx/documentVerify",method= RequestMethod.GET)
-    public ResponseBean wxDocumentVerifyUpdate(HttpServletRequest request){
+    @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.GET)
+    public ResponseBean wxDocumentVerifyGetThis(@PathVariable Integer id,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);
+        TaDocumentVerify verify = iTaDocumentVerifyService.getById(id);
         if (null != verify) {
             QueryWrapper<TaDocumentImg> documentImgQueryWrapper = new QueryWrapper<>();
             documentImgQueryWrapper.eq("document_verify_id", verify.getDocumentVerifyId());
@@ -179,6 +207,7 @@ public class TaDocumentVerifyController extends BaseController {
     @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.PUT)
     public ResponseBean wxDocumentVerifyUpdate(@PathVariable Integer id,
                                                @RequestBody List<TaDocumentImg>list,
+                                               @RequestParam(value ="documentTitle",required = false)String documentTitle,
                                                HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
@@ -190,6 +219,9 @@ public class TaDocumentVerifyController extends BaseController {
         TaPerson person = taPersons.get(0);
         TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
         documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
+        if(!StringUtils.isEmpty(documentTitle)){
+            documentVerify.setDocumentTitle(documentTitle);
+        }
         try {
             if (iTaDocumentVerifyService.updateById(documentVerify)){
                 QueryWrapper<TaDocumentImg>queryWrapper = new QueryWrapper<>();
@@ -261,15 +293,13 @@ public class TaDocumentVerifyController extends BaseController {
      * @param id  实体ID
      */
     @RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.GET)
-    public ResponseBean documentVerifyGet(@PathVariable Integer id){
+    public ResponseBean documentVerifyGet(@PathVariable String id,
+                                          @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
-            QueryWrapper<TaDocumentImg>imgList = new QueryWrapper<>();
-            imgList.eq("document_verify_id",documentVerify.getDocumentVerifyId());
-            imgList.orderByAsc("sort");
-            List<TaDocumentImg>list = documentImgService.list(imgList);
-            documentVerify.setImgList(list);
+            IPage<TaDocumentVerify> documentVerify = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,id,getOrgId(request));
             responseBean.addSuccess(documentVerify);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -99,8 +99,9 @@ public class TaPersonController extends BaseController {
     @PutMapping("/wx/registerConsultant")
     public ResponseBean registerConsultant(HttpServletRequest request,@RequestParam String phone,@RequestParam String code) {
         ResponseBean responseBean = new ResponseBean();
-        if(smsUtils.checkCaptcha(phone,code)){
+        if(!smsUtils.checkCaptcha(phone,code)){
             responseBean.addError("验证码错误。");
+            return responseBean;
         }
         Integer orgId =getOrgId(request);
         String openid = getOpenId(request);

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

@@ -95,6 +95,7 @@ public class TaPointsExchangeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if (null != taPointsExchange.getStatus() && !taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taPointsExchange.setVerifyDate(LocalDateTime.now());
                 taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
             }
             if (iTaPointsExchangeService.updateById(taPointsExchange)){

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

@@ -157,4 +157,20 @@ public class TaPosterController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 查询对象
+     */
+    @RequestMapping(value = "/admin/used/poster", method = RequestMethod.GET)
+    public ResponseBean posterUsed(@RequestParam String targetId,@RequestParam String targetType ) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iPosterService.getUsedPostersForTarget(targetId,targetType));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPosterUsed;
+import com.huiju.estateagents.service.ITaPosterUsedService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-28
+ */
+@RestController
+@RequestMapping("/")
+public class TaPosterUsedController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPosterUsedController.class);
+
+    @Autowired
+    public ITaPosterUsedService iTaPosterUsedService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taPosterUsed",method= RequestMethod.GET)
+    public ResponseBean taPosterUsedList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaPosterUsed> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPosterUsed> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPosterUsed> result = iTaPosterUsedService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPosterUsedList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taPosterUsed 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPosterUsed",method= RequestMethod.POST)
+    public ResponseBean taPosterUsedAdd(@RequestBody TaPosterUsed taPosterUsed){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPosterUsedService.save(taPosterUsed)){
+                responseBean.addSuccess(taPosterUsed);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPosterUsedAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taPosterUsed/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taPosterUsedDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaPosterUsedService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPosterUsedDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taPosterUsed 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPosterUsed/{id}",method= RequestMethod.PUT)
+    public ResponseBean taPosterUsedUpdate(@PathVariable Integer id,
+                                        @RequestBody TaPosterUsed taPosterUsed){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPosterUsedService.updateById(taPosterUsed)){
+                responseBean.addSuccess(taPosterUsed);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPosterUsedUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taPosterUsed/{id}",method= RequestMethod.GET)
+    public ResponseBean taPosterUsedGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPosterUsedService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPosterUsedDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -97,6 +97,29 @@ public class TaShareActivityController extends BaseController {
         return responseBean;
     }
 
+
+    /**
+     * 分页查询列表 已开始 和 未开始
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareActivityEffective/list",method= RequestMethod.GET)
+    public ResponseBean taShareActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value ="cityId",required = false)Integer cityId,
+                                            HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, getOrgId(request));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      * @param parameter 实体对象json格式
@@ -323,6 +346,11 @@ public class TaShareActivityController extends BaseController {
                 childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
                 childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
                 List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
+                shareChildRecordList.forEach(e -> {
+                    if (e.getPersonId().equals(person.getPersonId())){
+                        map.put("isJoin",true);
+                    }
+                });
                 map.put("shareChildRecordList",shareChildRecordList);
             }
     

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

@@ -130,6 +130,15 @@ public class TdBuildingTypeController extends BaseController {
     public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
+            queryWrapper.eq("status", 1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            Integer count = iTdBuildingTypeService.count(queryWrapper);
+            if (count != null && count > 0) {
+                responseBean.addError("已存在此类型");
+                return responseBean;
+            }
             tdBuildingType.setOrgId(getOrgId(request));
             if (iTdBuildingTypeService.save(tdBuildingType)){
                 responseBean.addSuccess(tdBuildingType);
@@ -186,6 +195,16 @@ public class TdBuildingTypeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
 
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
+            queryWrapper.eq("status", 1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            TdBuildingType buildingType = iTdBuildingTypeService.getOne(queryWrapper);
+            if (buildingType != null && buildingType.getBuildingTypeId().intValue() != id.intValue()) {
+                responseBean.addError("已存在此类型");
+                return responseBean;
+            }
+
             // 如果是删除，状态为 -1
             if ( null != tdBuildingType.getStatus() && -1 == tdBuildingType.getStatus().intValue()) {
                 List<TaBuilding> taBuildings = taBuildingMapper.selectBuildingByBuildingTypeId(tdBuildingType.getBuildingTypeId());

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

@@ -13,8 +13,10 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
@@ -60,6 +62,8 @@ public class TaDrainageRecordController extends BaseController {
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
+    @Autowired
+    private ITaDrainageService taDrainageService;
     /**
      * 分页查询列表
      * @param pageNum
@@ -263,10 +267,23 @@ public class TaDrainageRecordController extends BaseController {
             JSONObject jsonParse = JSONObject.parseObject(jsonString);
             TaDrainageRecord taDrainageRecord = new TaDrainageRecord();
             taDrainageRecord.setContent(jsonParse.getString("content"));
-            taDrainageRecord.setPhone(jsonParse.getString("phone"));
-            taDrainageRecord.setUserName(jsonParse.getString("userName"));
+            JSONArray jsonArray = jsonParse.getJSONArray("content");
+            jsonArray.forEach(e -> {
+                JSONObject jsonObject = (JSONObject)e;
+                if (jsonObject.getString("key").equals("phone")){
+                    taDrainageRecord.setPhone(jsonParse.getString("phone"));
+                }
+                if (jsonObject.getString("key").equals("userName")){
+                    taDrainageRecord.setUserName(jsonParse.getString("userName"));
+                }
+            });
+            
             taDrainageRecord.setCreateDate(LocalDateTime.now());
             taDrainageRecord.setDrainageId(taThirdPartyMiniappConfig.getTargetId());
+            taDrainageRecord.setOrgId(taThirdPartyMiniappConfig.getOrgId());
+            //获取buildingID
+            TaDrainage taDrainage = taDrainageService.getById(taThirdPartyMiniappConfig.getTargetId());
+            taDrainageRecord.setBuildingId(taDrainage.getBuildingId());
             if (iTaDrainageRecordService.save(taDrainageRecord)){
                 return ResponseBean.success(taDrainageRecord);
             }

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

@@ -64,6 +64,10 @@ public class TaDocumentVerify implements Serializable {
      */
     private Integer verifyStatus;
 
+    private String documentTitle;
+
+    private String rejectReason;
+
     @TableField(exist = false)
     private List<TaDocumentImg> imgList;
 

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

@@ -0,0 +1,32 @@
+package com.huiju.estateagents.entity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 资料审核 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+public class TaDocumentVerifyModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer totalSummit;
+
+    private LocalDateTime summitDate;
+
+    private Integer unverified;
+
+    private String name;
+
+    private String tel;
+
+    private String personId;
+
+
+
+
+}

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

@@ -1,10 +1,14 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -73,5 +77,6 @@ public class TaPoster implements Serializable {
      */
     private Integer orgId;
 
-
+    @TableField(exist = false)
+    private List<Integer> templateIds = new ArrayList<>();
 }

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

@@ -0,0 +1,34 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPosterUsed implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer posterId;
+
+    private Integer templateId;
+
+    private Integer orgId;
+
+    private LocalDateTime createDate;
+
+
+}

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

@@ -29,8 +29,8 @@ public class HelpInitiateRecordSucceed {
     /**
      * 创建时间 也是助力发起时间
      */
-    @ColumnWidth(15)
-    @DateTimeFormat("yyyy年MM月dd日")
+    @ColumnWidth(24)
+    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
     @ExcelProperty(value = "发起时间", index = 2)
     private Date createDate;
 
@@ -53,8 +53,8 @@ public class HelpInitiateRecordSucceed {
      */    /**
      * 创建时间 也是助力发起时间
      */
-    @ColumnWidth(15)
-    @DateTimeFormat("yyyy年MM月dd日")
+    @ColumnWidth(24)
+    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
     @ExcelProperty(value = "助力成功时间", index = 3)
     private Date succeedDate;
 

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

@@ -29,9 +29,9 @@ public class HelpProceedAndFinish {
     /**
      * 创建时间 也是助力发起时间
      */
-    @ColumnWidth(15)
+    @ColumnWidth(24)
     @ExcelProperty(value = "发起时间", index = 2)
-    @DateTimeFormat("yyyy年MM月dd日")
+    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
     private Date createDate;
 
 

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

@@ -21,9 +21,9 @@ public class HelpRecordExport {
     /**
      * 创建时间 也是助力发起时间
      */
-    @ColumnWidth(15)
+    @ColumnWidth(36)
     @ExcelProperty(value = "助力时间", index = 2)
-    @DateTimeFormat("yyyy年MM月dd日")
+    @DateTimeFormat("yyyy年MM月dd日 HH时mm分ss秒")
     private Date createDate;
 
 

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

@@ -43,4 +43,13 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @return
      */
     List<HelpActivity> selectWxhelpActivityAndGroup(Integer orgId);
+
+    /**
+     * 列表 已开始 和 未开始
+     * @param pg
+     * @param cityId
+     * @param orgId
+     * @return
+     */
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId);
 }

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

@@ -3,9 +3,12 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaDocumentVerifyModel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 资料审核  Mapper 接口
@@ -17,6 +20,8 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
 
-    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel,@Param("orgId")Integer orgId);
+    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("personId") String personId, @Param("orgId")Integer orgId);
+
+    IPage<TaDocumentVerifyModel> getAdminDocumentList(IPage<TaDocumentVerifyModel> page, @Param("name") String name, @Param("tel") String tel, @Param("orgId")Integer orgId, @Param("startDate")LocalDateTime startDate,@Param("endDate")LocalDateTime endDate);
 
 }

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

@@ -52,21 +52,19 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 总用户数
-     * @param personType
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(1) from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType}")
-    Integer selectUserCount(@Param("org") Integer orgId, @Param("personType") String personType);
+    @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent')")
+    Integer selectUserCount(@Param("org") Integer orgId);
 
     /**
      * 总注册数
-     * @param personType
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(1) from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType} and phone is not null")
-    Integer selectRegisteredCount(@Param("org") Integer orgId, @Param("personType") String personType);
+    @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent') and phone is not null")
+    Integer selectRegisteredCount(@Param("org") Integer orgId);
 
     /**
      * 根据时间段查询
@@ -115,11 +113,10 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      *
      *  据说 1 男  2 女
      *
-     * @param personType
      * @return
      */
-    @Select("select count(1) as sex_count from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType} and gender = #{gender}")
-    Integer selectSexUser(@Param("org") Integer orgId, @Param("personType") String personType, @Param("gender") Integer gender);
+    @Select("select count(1) as sex_count from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent')  and gender = #{gender}")
+    Integer selectSexUser(@Param("org") Integer orgId, @Param("gender") Integer gender);
 
 
     /**
@@ -140,10 +137,10 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
             "on a.city = b.id " +
             "WHERE " +
             "   a.org_id = #{org} " +
-            "	AND ifnull(a.person_type, '') != #{personType} " +
+            "	AND a.person_type IN ('customer','drift','estate agent')  " +
             "GROUP BY " +
             "	a.city ")
-    List<Map<String, Object>> selectCityUser(@Param("org") Integer orgId, @Param("personType") String personType);
+    List<Map<String, Object>> selectCityUser(@Param("org") Integer orgId);
 
 
     // ------------- 用户来源 start ------------

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPosterUsed;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-28
+ */
+@Mapper
+public interface TaPosterUsedMapper extends BaseMapper<TaPosterUsed> {
+
+}

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

@@ -131,5 +131,15 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId);
+
+    /**
+     * 列表  已开始 和 未开始
+     * @param pageNum
+     * @param pageSize
+     * @param cityId
+     * @param orgId
+     * @return
+     */
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId);
 }

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

@@ -44,8 +44,7 @@ public interface IMiniAppService {
     /**
      * 活动二维码生成
      * @param miniappId
-     * @param replace
      * @return
      */
-    TaMiniappQrcode createActivityQrcode(String miniappId, String replace);
+    TaMiniappQrcode createActivityQrcode(String miniappId);
 }

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

@@ -3,6 +3,9 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaDocumentVerifyModel;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -14,6 +17,8 @@ import com.huiju.estateagents.entity.TaDocumentVerify;
  */
 public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
 
-    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String name,String tel,Integer orgId);
+    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String personId,Integer orgId);
+
+    IPage<TaDocumentVerifyModel> getAdminDocumentList(Integer pageNum,Integer pageSize,String name, String tel,Integer orgId,  LocalDateTime startDate, LocalDateTime endDate);
 
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPosterUsed;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-28
+ */
+public interface ITaPosterUsedService extends IService<TaPosterUsed> {
+
+}

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

@@ -30,4 +30,14 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
      * @param endGroupActivityId
      */
     void updateEndActivity(List<Integer> endGroupActivityId);
+
+    /**
+     * 查询拼团  已开始 和 未开始
+     * @param pageNum
+     * @param pageSize
+     * @param cityId
+     * @param orgId
+     * @return
+     */
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId);
 }

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

@@ -17,5 +17,12 @@ import java.util.List;
 public interface TaPosterService extends IService<TaPoster> {
 
     List<TaPoster> getPostersForTarget(String targetId,String targetType);
-
+	
+	/**
+	 * 获取海报和已使用的海报模板
+	 * @param targetId
+	 * @param targetType
+	 * @return
+	 */
+	TaPoster getUsedPostersForTarget(String targetId, String targetType);
 }

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

@@ -29,13 +29,6 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
     @Override
     public ResponseBean extendContentAdd(ExtendContent extendContent) {
         ResponseBean responseBean= new ResponseBean<>();
-        if ("1".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_ACTIVITY);
-        }else if("2".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_PROJECT);
-        }else if ("3".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_NEWS);
-        }
         extendContentMapper.insert(extendContent);
         responseBean.addSuccess("成功");
         return  responseBean;

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

@@ -211,7 +211,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
         // 根据楼盘id查助力
         if ("1".equals(type)){
@@ -236,4 +236,13 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
         responseBean.addSuccess(HelpActivity);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean<>();
+        IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId);
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
 }

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

@@ -82,7 +82,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
         data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
 
-        sendMessage("notice", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_NOTICE, toUser, link, data);
     }
     
     @Override
@@ -92,7 +92,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
         data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
         
-        sendMessage("help.result", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_HELP, toUser, link, data);
     }
     
     @Override
@@ -102,7 +102,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
         data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
         
-        sendMessage("group.result", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_GROUP, toUser, link, data);
     }
 
     @Override
@@ -221,28 +221,29 @@ public class MiniAppServiceImpl implements IMiniAppService {
     }
 
     @Override
-    public TaMiniappQrcode createActivityQrcode(String miniappId, String replace) {
+    public TaMiniappQrcode createActivityQrcode(String miniappId) {
 
-        WxMaService wxService = wxUtils.getMiniApp(miniappId);
+        TaMiniappQrcode taQrcode = new TaMiniappQrcode();
+        taQrcode.setAppid(miniappId);
+        taQrcode.setCreateDate(LocalDateTime.now());
+        taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
+        taMiniappQrcodeMapper.insert(taQrcode);
+        //  使用serialNo作为场景值替换当前的ID
+        String replace = CommConstant.ACTIVITY_QRCODE.replace("#0",String.valueOf(taQrcode.getSerialNo())).replace("#1","activity");
 
+        WxMaService wxService = wxUtils.getMiniApp(miniappId);
         JSONObject params = JSONObject.parseObject(replace);
         String scene = params.getString("scene");
         String page = StringUtils.ifNull(params.getString("page"), "");
         String lineColorStr = StringUtils.ifNull(params.getString("line_color"), "{\"r\":0,\"g\":0,\"b\":0}");
         WxMaCodeLineColor lineColor = JSONObject.parseObject(lineColorStr, WxMaCodeLineColor.class);
-        TaMiniappQrcode taQrcode = new TaMiniappQrcode();
-        
         try {
-            // 使用ID作为场景值
+
             File qrFile = wxService.getQrcodeService().createWxaCodeUnlimit(scene, page, 430, true, lineColor, true);
             String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
-            
-            taQrcode.setAppid(miniappId);
-            taQrcode.setCreateDate(LocalDateTime.now());
-            taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
             taQrcode.setQrParams(replace);
             taQrcode.setQrCode(qrcode);
-            taMiniappQrcodeMapper.insert(taQrcode);
+            taMiniappQrcodeMapper.updateById(taQrcode);
             return  taQrcode;
         }catch (Exception e) {
             e.printStackTrace();

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

@@ -52,10 +52,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
         Map<String,Object> map = new HashMap<>();
 
         // 总用户数
-        Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
 
         // 注册数
-        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
 
         // 最近七天
         Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
@@ -71,8 +71,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
         // 性别比例
         // 1 男 2 女
-        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
-        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_FEMALE);
         Map<String, Object> selectSexMaleMap = new HashMap<>();
         selectSexMaleMap.put("name", "男");
         selectSexMaleMap.put("value", selectSexMale);
@@ -84,7 +84,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         selectSexUser.add(selectSexFemaleMap);
 
         // 城市比例
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId);
 
         // 转化率, 当前 默认项目收藏
         Map<String, Object> selectBuildingStatistical = taBuildingMapper.selectBuildingStatistical(orgId, "save");
@@ -235,10 +235,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
             case CommConstant.AUTHORIZATION_PHONE:
                 // 总用户数
-                Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+                Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
 
                 // 注册数
-                Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+                Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
                 Map<String, Object> userMap = new HashMap<>();
                 userMap.put("pvNum", selectUserCount);
                 userMap.put("registeredCount", selectRegisteredCount);
@@ -284,7 +284,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean selectUserCount(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         // 总用户数
-        Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserCount", selectUserCount);
         responseBean.addSuccess(map);
@@ -295,7 +295,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean selectRegisteredCount(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         // 注册数
-        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectRegisteredCount", selectRegisteredCount);
         responseBean.addSuccess(map);
@@ -319,8 +319,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
         // 性别比例
         // 1 男 2 女
-        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
-        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_FEMALE);
         Map<String, Object> selectSexMaleMap = new HashMap<>();
         selectSexMaleMap.put("name", "男");
         selectSexMaleMap.put("value", selectSexMale);
@@ -342,7 +342,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         ResponseBean responseBean = new ResponseBean();
 
         // 城市比例
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectCityUser", selectCityUser);
         responseBean.addSuccess(map);

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

@@ -134,6 +134,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
         buildingDynamicQueryWrapper.eq("status",1);
         TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        if (null == tabuildingDynamic){
+            return ResponseBean.error("当前活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         // 当前阅读量加1
         Integer saveNum = tabuildingDynamic.getPvNum() == null ? 1:tabuildingDynamic.getPvNum()+1;
         tabuildingDynamic.setPvNum(saveNum);
@@ -236,6 +239,10 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
             responseBean.addError("当前报名人数已满");
             return responseBean;
         }
+        if(null != buildingDynamic.getEnlistEnd() && buildingDynamic.getEnlistEnd().isBefore(LocalDateTime.now())){
+            responseBean.addError("当前活动已结束报名");
+            return responseBean;
+        }
         // 判断是否报名根据电话号码校验
         QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
         taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaDocumentVerifyModel;
 import com.huiju.estateagents.mapper.TaDocumentImgMapper;
 import com.huiju.estateagents.mapper.TaDocumentVerifyMapper;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
@@ -13,6 +14,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,9 +35,9 @@ public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMap
     TaDocumentImgMapper taDocumentImgMapper;
 
     @Override
-    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel,Integer orgId){
+    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String personId,Integer orgId){
         IPage<TaDocumentVerify>page = new Page<>(pageNum,pageSize);
-        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel,orgId);
+        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,personId,orgId);
         List<Integer> idList = new ArrayList<>();
         for (int i = 0; i<data.getRecords().size();i++){
             idList.add(data.getRecords().get(i).getDocumentVerifyId());
@@ -60,4 +62,11 @@ public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMap
         return data;
     }
 
+    @Override
+    public IPage<TaDocumentVerifyModel> getAdminDocumentList(Integer pageNum,Integer pageSize,String name, String tel, Integer orgId, LocalDateTime startDate, LocalDateTime endDate){
+        IPage<TaDocumentVerifyModel>page = new Page<>(pageNum,pageSize);
+        IPage<TaDocumentVerifyModel> data = documentVerifyMapper.getAdminDocumentList(page,name,tel,orgId,startDate,endDate);
+        return data;
+    }
+
 }

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

@@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPoster;
+import com.huiju.estateagents.entity.TaPosterUsed;
 import com.huiju.estateagents.mapper.TaPosterMapper;
+import com.huiju.estateagents.mapper.TaPosterUsedMapper;
 import com.huiju.estateagents.service.TaPosterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -26,6 +29,8 @@ public class TaPosterServiceImpl extends ServiceImpl<TaPosterMapper, TaPoster> i
     @Autowired
     TaPosterMapper taPosterMapper;
 
+    @Autowired
+    private TaPosterUsedMapper taPosterUsedMapper;
 
     @Override
     public List<TaPoster> getPostersForTarget(String targetId, String targetType){
@@ -37,5 +42,34 @@ public class TaPosterServiceImpl extends ServiceImpl<TaPosterMapper, TaPoster> i
         return data;
 
     }
-
+    
+    /**
+     * 获取海报和已使用的海报模板
+     *
+     * @param targetId
+     * @param targetType
+     * @return
+     */
+    @Override
+    public TaPoster getUsedPostersForTarget(String targetId, String targetType) {
+        QueryWrapper<TaPoster>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_id",targetId);
+        queryWrapper.eq("target_type",targetType);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        TaPoster taPoster =taPosterMapper.selectOne(queryWrapper);
+        if (null != taPoster){
+            //获取使用的模板集合
+            QueryWrapper<TaPosterUsed> usedQueryWrapper = new QueryWrapper<>();
+            usedQueryWrapper.eq("poster_id",taPoster.getPosterId());
+            usedQueryWrapper.eq("org_id",taPoster.getOrgId());
+            List<TaPosterUsed> taPosterUsedList = taPosterUsedMapper.selectList(usedQueryWrapper);
+            List<Integer> checkedList = new ArrayList<>();
+            taPosterUsedList.forEach(e -> {
+                checkedList.add(e.getTemplateId());
+            });
+            taPoster.setTemplateIds(checkedList);
+        }
+        return taPoster;
+    }
+    
 }

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaPosterUsed;
+import com.huiju.estateagents.mapper.TaPosterUsedMapper;
+import com.huiju.estateagents.service.ITaPosterUsedService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-28
+ */
+@Service
+public class TaPosterUsedServiceImpl extends ServiceImpl<TaPosterUsedMapper, TaPosterUsed> implements ITaPosterUsedService {
+
+}

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

@@ -73,4 +73,29 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
             taShareActivityMapper.updateEndGroupActivity(endGroupActivityId);
         }
     }
+
+    @Override
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        Page<TaShareActivity> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        QueryWrapper<TaShareActivity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("activity_status", 0, 1);
+        queryWrapper.eq(orgId != null, "org_id", orgId);
+        queryWrapper.eq(cityId != null, "city_id", cityId);
+        queryWrapper.orderByAsc("activity_status");
+        queryWrapper.orderByAsc("start_time");
+        IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
+
+        List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();
+        for (TaShareActivity taShareActivity : taShareActivities){
+            Integer participateNum = taShareActivityMapper.calParticipateNum(taShareActivity.getGroupActivityId());
+            taShareActivity.setParticipateNum(participateNum);
+        }
+        taNewsIPage.setRecords(taShareActivities);
+        responseBean.addSuccess(taNewsIPage);
+        return responseBean;
+    }
 }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -75,4 +75,23 @@
 					and org_id =#{orgId}
 			)
     </select>
+
+    <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">
+        SELECT
+        ha.*
+        FROM
+        ta_help_activity ha
+        <where>
+            <if test="cityId != null and cityId != ''">
+                and ha.city_id = #{cityId}
+            </if>
+            and ha.org_id=#{orgId}
+            and ha.activity_status in (0, 1)
+        </where>
+        GROUP BY ha.help_activity_id
+        order by ha.activity_status = 0 desc,
+        ha.activity_status = 1 desc,
+        ha.activity_status = 2 desc,
+        ha.start_date asc
+    </select>
 </mapper>

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -47,9 +47,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
+    AND b.verification !='null'
+    AND b.verification !=''
     <if test="tel != null and tel != ''">
-        AND b.phone = #{tel}
+        and  b.phone like concat('%',#{tel},'%')
     </if>
      order by b.create_date desc
      limit #{pageCode}, #{pageSize}
@@ -69,7 +70,7 @@
         and b.status = 2
     </if>
     <if test="tel != null and tel != ''">
-        AND b.phone = #{tel}
+        and  b.phone like concat('%',#{tel},'%')
     </if>
      order by b.create_date desc
      limit #{pageCode}, #{pageSize}

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -37,6 +37,7 @@
 
         SELECT
         tade.*,
+        (CASE tade.is_checkin WHEN 1 THEN '已签到' ELSE '未签到'END) as isCheckin,
         tp.NAME AS sharePersonName,
         tp.company AS orgName
         FROM

src/main/resources/mapper/TaBuildingMapper.xml

@@ -175,7 +175,7 @@
                 GROUP BY building_id
                 ) as tba ON tb.building_id = tba.building_id
             </if>
-
+            WHERE tb.org_id = #{orgId}
             ORDER BY tb.order_no DESC
     </select>
 

src/main/resources/mapper/TaDocumentVerifyMapper.xml

@@ -11,13 +11,46 @@
 	LEFT JOIN ta_person b ON a.person_id = b.person_id
 	where a.status = 1
 	and a.org_id = #{orgId}
-	    <if test="name != '' and name !=null">
-            and IFNULL(b.name,b.nickname) like CONCAT('%',#{name}, '%')
-         </if>
+	and a.person_id = #{personId}
+        order by a.verify_status asc,a.create_date desc
+    </select>
+
+    <select id="getAdminDocumentList" resultType="com.huiju.estateagents.entity.TaDocumentVerifyModel">
+        SELECT
+	t.*
+FROM
+	(
+SELECT
+	IFNULL( b.NAME, b.nickname ) AS name,
+	IFNULL( b.tel, b.phone ) AS tel,
+	a.person_id,
+	( SELECT c.create_date FROM ta_document_verify c WHERE c.person_id = a.person_id ORDER BY c.create_date DESC LIMIT 1 ) AS summit_date,
+	( SELECT COUNT( 1 ) FROM ta_document_verify d WHERE d.person_id = a.person_id and d.verify_status != 0) AS total_summit,
+	( SELECT COUNT( 1 ) FROM ta_document_verify e WHERE e.person_id = a.person_id AND e.verify_status = 0 ) AS unverified
+FROM
+	ta_document_verify a
+	LEFT JOIN ta_person b ON a.person_id = b.person_id
+	where a.org_id = #{orgId}
+GROUP BY
+	a.person_id
+	) t
+	<where>
+	    1=1
+        <if test="name != '' and name !=null">
+            and t.name like CONCAT('%',#{name}, '%')
+        </if>
         <if test="tel != '' and tel !=null">
-            and IFNULL(b.tel,b.phone) = #{tel}
+            and t.tel = #{tel}
+        </if>
+        <if test="startDate != null">
+            and t.summit_date &gt; #{startDate}
+        </if>
+        <if test="endDate != null">
+            and t.summit_date &lt; #{ednDate}
         </if>
-        order by a.create_date desc
+    </where>
+ORDER BY
+	t.unverified DESC,t.summit_date DESC
     </select>
 
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -157,7 +157,7 @@ FROM
         FROM
         ta_person tp
         where tp.org_id = #{org} AND
-          ifnull(tp.person_type, '') != #{personType}
+        tp.person_type IN ('customer','drift','estate agent')
 
         <if test="startDate != null or endDate != null">
             AND  tp.create_date BETWEEN #{startDate} and #{endDate}
@@ -196,7 +196,7 @@ FROM
             FROM
               ta_person tp
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-            where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+            where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
             <if test="buildingId != null and buildingId != ''">
                 and tpvr.building_id = #{buildingId}
             </if>
@@ -254,7 +254,7 @@ FROM
              LEFT JOIN
             ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record GROUP BY  person_id  ) as tpvr
             ON tp.person_id = tpvr.person_id
-             where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+             where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
              GROUP BY DATE_FORMAT( tpvr.max_visit_time , '%Y-%m-%d' )
         ) AS temp ON
         <if test="dateType == 'month'.toString()">
@@ -297,7 +297,7 @@ FROM
                         tp.create_date as create_date
                     FROM
                       ta_person tp
-                    where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
+                    where tp.person_type IN ('customer','drift','estate agent') and tp.org_id = #{orgId}
                     and tp.phone is NOT NULL
                     <if test="startDate != null or endDate != null">
                         AND tp.create_date BETWEEN #{startDate} and #{endDate}
@@ -335,7 +335,7 @@ FROM
                     tp.create_date as create_date
                 FROM
                  ta_person tp
-                where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
+                where tp.person_type IN ('customer','drift','estate agent') and tp.org_id = #{orgId}
                 <if test="startDate != null or endDate != null">
                     AND tp.create_date BETWEEN #{startDate} and #{endDate}
                 </if>
@@ -355,8 +355,7 @@ FROM
     <select id="selectUserSourcePie" resultType="integer">
         select count(1)
         FROM ta_person
-        WHERE org_id = #{org} AND
-          ifnull(person_type, '') != #{personType}
+        WHERE org_id = #{org} AND person_type IN ('customer','drift','estate agent')
         <if test="recommendPersonType != null and recommendPersonType != ''">
             and recommend_person_type = #{recommendPersonType}
         </if>
@@ -373,7 +372,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tpf.from_code and tps.phone is NOT NULL
             AND tps.org_id = #{org}
-            and ifnull(tps.person_type, '') != #{personType}
+            and tps.person_type IN ('customer','drift','estate agent')
             <if test="startDate != null or endDate != null">
                 and tps.create_date BETWEEN #{startDate} and #{endDate}
             </if>
@@ -389,7 +388,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tpf.from_code
             AND tps.org_id = #{org}
-            and ifnull(tps.person_type, '') != #{personType}
+            and tps.person_type IN ('customer','drift','estate agent')
             <if test="startDate != null or endDate != null">
                 and tps.create_date BETWEEN #{startDate} and #{endDate}
             </if>
@@ -401,7 +400,7 @@ FROM
         FROM td_person_from tpf
         LEFT JOIN ta_person tp
         ON tp.from_code = tpf.from_code
-        where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+        where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
         GROUP BY tpf.from_code
     </select>
 
@@ -445,7 +444,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
             AND tps.org_id = #{org}
-            and ifnull(tps.person_type, '') != 'Realty Consultant'
+            and tps.person_type IN ('customer','drift','estate agent')
             AND tps.create_date BETWEEN #{startDate} AND #{endDate}
 
             GROUP BY tpfs.from_code
@@ -463,7 +462,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
                 AND tps.org_id = #{org}
-                and ifnull(tps.person_type, '') != 'Realty Consultant'
+                and tps.person_type IN ('customer','drift','estate agent')
                 AND tps.create_date BETWEEN #{startDate} AND #{endDate}
                 and tps.phone is not null
             GROUP BY tpfs.from_code

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -56,7 +56,7 @@
             and  date_format(t.verify_date,'%Y-%m-%d') >= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
         </if>
         <if test="taPointsExchange.endVerifyDate != null and taPointsExchange.endVerifyDate != ''">
-            and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
+            and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.endVerifyDate},'%Y-%m-%d')
         </if>
         order by t.create_date desc
     </select>

src/main/resources/mapper/TaPosterUsedMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaPosterUsedMapper">
+
+</mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -205,33 +205,33 @@ FROM
 
     <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-        b.*
-        FROM
-        ta_person b
-        <where>
-            b.status > 0
-            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
-            <if test="name != null and name !=''">
-                and b.nickname like CONCAT('%',#{name}, '%')
-            </if>
-            <if test="tel != null and tel!=''">
-                and b.phone like CONCAT('%',#{tel}, '%')
-            </if>
-            <if test="entryType != null and entryType !=''">
-                and b.entry_type = #{entryType}
-            </if>
-            <if test="sex != null and sex !=''">
-                and b.sex = #{sex}
-            </if>
-            <if test="orgId != null">
-                and b.org_id = #{orgId}
-            </if>
-            <if test="consultTel != null and consultTel !=''">
-                and b.tel like CONCAT('%',#{consultTel}, '%')
-            </if>
-            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
-        </where>
-        order by b.create_date desc
+                b.*
+                FROM
+                ta_person b
+               <where>
+                    b.status > 0
+                   AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+                    <if test="name != null and name !=''">
+                        and b.nickname like CONCAT('%',#{name}, '%')
+                    </if>
+                    <if test="tel != null and tel!=''">
+                        and b.phone like CONCAT('%',#{tel}, '%')
+                    </if>
+                    <if test="entryType != null and entryType !=''">
+                        and b.entry_type = #{entryType}
+                    </if>
+                    <if test="sex != null and sex !=''">
+                        and b.sex = #{sex}
+                    </if>
+                    <if test="orgId != null">
+                       and b.org_id = #{orgId}
+                    </if>
+                    <if test="consultTel != null and consultTel !=''">
+                        and b.tel like CONCAT('%',#{consultTel}, '%')
+                    </if>
+                    and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+                </where>
+               order by b.create_date desc
     </select>
 
     <select id="getRecCustomerExport" resultType="com.huiju.estateagents.excel.ExcelRecommendCustomer">
@@ -409,7 +409,7 @@ FROM
         SELECT
           b.nickname as nickname,
           b.phone as phone,
-          if(b.sex = 1, '男', if(b.sex = 2, '女', '未知')) as sex
+          if(b.gender = 1, '男', if(b.gender = 2, '女', '未知')) as sex
         FROM
         ta_person b
         <where>