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

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

@@ -137,22 +137,14 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query", value = "城市"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query", value = "项目"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query", value = "标题"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "startDate", paramType = "query", value = "活动开始时间"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "endDate", 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,
-                                         @RequestParam(value = "buildingId", required = false) String buildingId,
-                                         @RequestParam(value = "title", required = false) String title,
-                                         @RequestParam(value = "startDate", required = false) String startDate,
-                                         @RequestParam(value = "endDate", required = false) String endDate,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, orgId);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId);
         return helpActivityList;
     }
 

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

@@ -406,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/TaShareActivityController.java

@@ -107,13 +107,11 @@ public class TaShareActivityController extends BaseController {
     @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 ="buildingId",required = false) String buildingId,
-                                            @RequestParam(value ="activityName",required = false) String activityName,
                                             @RequestParam(value ="cityId",required = false)Integer cityId,
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, buildingId, activityName, null, null, cityId, getOrgId(request));
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, getOrgId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());

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/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

@@ -48,12 +48,8 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * 列表 已开始 和 未开始
      * @param pg
      * @param cityId
-     * @param buildingId
-     * @param title
-     * @param startDate
-     * @param endDate
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer orgId);
+    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/service/IHelpActivityService.java

@@ -137,12 +137,8 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param pageNum
      * @param pageSize
      * @param cityId
-     * @param buildingId
-     * @param title
-     * @param startDate
-     * @param endDate
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer orgId);
+    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/ITaShareActivityService.java

@@ -33,13 +33,9 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
      * 查询拼团  已开始 和 未开始
      * @param pageNum
      * @param pageSize
-     * @param buildingId
-     * @param activityName
-     * @param startTime
-     * @param endTime
      * @param cityId
      * @param orgId
      * @return
      */
-    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, String buildingId, String activityName, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId);
 }

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

@@ -234,10 +234,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer orgId) {
+    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, buildingId, title, startDate, endDate, orgId);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId);
         responseBean.addSuccess(result);
         return responseBean;
     }

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

@@ -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/TaBuildingDynamicServiceImpl.java

@@ -239,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/TaShareActivityServiceImpl.java

@@ -70,18 +70,14 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     }
 
     @Override
-    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, String buildingId, String activityName, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId) {
+    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.eq(buildingId != null, "building_id", buildingId);
-        queryWrapper.like(activityName != null, "activity_name", activityName);
         queryWrapper.in("activity_status", 0, 1);
-        queryWrapper.eq(startTime != null, "start_time", startTime);
-        queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
         queryWrapper.orderByAsc("activity_status");

src/main/resources/mapper/HelpActivityMapper.xml

@@ -104,28 +104,13 @@
 
     <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">
         SELECT
-        COUNT(hir.verification) as succeedCount,
         ha.*
         FROM
         ta_help_activity ha
-        LEFT JOIN ta_help_initiate_record hir ON ha.help_activity_id = hir.help_activity_id
-        AND (hir.verification is NULL or hir.verification != '')
         <where>
             <if test="cityId != null and cityId != ''">
                 and ha.city_id = #{cityId}
             </if>
-            <if test="buildingId != null and buildingId != ''">
-                and ha.building_id = #{buildingId}
-            </if>
-            <if test="title != null and title != ''">
-                and ha.title like CONCAT('%',#{title}, '%')
-            </if>
-            <if test="startDate != null and startDate != ''and startDate!='Invalid date'">
-                and date_format(ha.start_date,'%Y-%m-%d') = date_format( #{startDate}, '%Y-%m-%d' )
-            </if>
-            <if test="endDate != null and endDate != ''and endDate!='Invalid date'">
-                and date_format(ha.end_date,'%Y-%m-%d') = date_format( #{endDate}, '%Y-%m-%d' )
-            </if>
             and ha.org_id=#{orgId}
             and ha.activity_status in (0, 1)
         </where>

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -53,9 +53,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}
@@ -75,7 +76,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/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/TaRecommendCustomerMapper.xml

@@ -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>