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

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -129,7 +129,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			List<TaBuildingReport> buildingReportList = tdReportList.stream().map(e -> {
 				TaBuildingReport taBuildingReport = new TaBuildingReport();
 				taBuildingReport.setOrgId(taOrg.getOrgId());
-				taBuildingReport.setReportCode(e.toString());
+				taBuildingReport.setReportCode(e.getReportCode());
 				taBuildingReport.setCreateDate(LocalDateTime.now());
 
 				return taBuildingReport;

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

@@ -433,6 +433,19 @@ public class TaPersonController extends BaseController {
         return ResponseBean.success(taPersonIPage);
     }
 
+    @GetMapping("/admin/building/consultant")
+    public ResponseBean getBuildingConsultantList(
+            Integer pageNumber,
+            Integer pageSize,
+            String buildingId
+    ) {
+        if (null == pageNumber) pageNumber = 1;
+        if (null == pageSize) pageSize = 10;
+
+        IPage<TaUser> taPersonIPage = taPersonService.getBuildingConsultantList(pageNumber,pageSize,buildingId);
+        return ResponseBean.success(taPersonIPage);
+    }
+
     @GetMapping("/admin/consultant/{id}")
     public ResponseBean getConsultant(@PathVariable String id) {
         TaPerson taPerson = taPersonService.getById(id);

src/main/java/com/huiju/estateagents/event/EventBus.java

@@ -42,7 +42,7 @@ public class EventBus extends ApplicationEvent {
 		DocumentVerify(7),
 
 		// 普通活动扫码签到
-		ActivityCheckin(20);
+		ActivityCheckin(8);
 
 		private Integer type;
 

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -1,7 +1,10 @@
 package com.huiju.estateagents.job;
 
 import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.center.sysUser.controller.SysUserController;
 import com.huiju.estateagents.service.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -19,6 +22,8 @@ import org.springframework.stereotype.Component;
 @EnableScheduling
 public class JudglActivityTimeJob extends BaseController {
 
+    private final Logger logger = LoggerFactory.getLogger(JudglActivityTimeJob.class);
+
     @Autowired
     private ITaBuildingDynamicService iTaBuildingDynamicService;
 
@@ -47,7 +52,8 @@ public class JudglActivityTimeJob extends BaseController {
     private void configureTasks() {
 
         //未开始活动更新为已开始
-        iTaBuildingDynamicService.updateUnStartActivity();
+        Integer count = iTaBuildingDynamicService.updateUnStartActivity();
+        logger.debug("JudglActivityTimeJob",count);
         //进行中活动更新为已结束
         iTaBuildingDynamicService.updateProcessingActivity();
 

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

@@ -75,7 +75,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
     /**
      * 更新未开始的活动
      */
-    void updateUnStartActivity();
+    Integer updateUnStartActivity();
 
     /**
      * 更新结束的活动

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

@@ -90,7 +90,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
     /**
      * 开始未进行的活动
      */
-    void updateUnStartActivity();
+    Integer updateUnStartActivity();
 
     /**
      * 结束过期的活动

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -42,6 +43,8 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone,Integer status,String buildingId,String personTags);
 
+    IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize,String buildingId);
+
     TaPerson newPersonByOpenid(String openid,Integer orgId);
 
     ResponseBean bindCard(String phone, String pass, String openid);

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

@@ -425,6 +425,24 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return taPersonMapper.getPersonList(page,personType,name,phone,status,buildingId,personTags);
     }
 
+    @Override
+    public IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize,String buildingId){
+        IPage<TaUser> page = new Page<>(pageNumber,pageSize);
+        QueryWrapper<TaPersonBuilding> personBuildingQueryWrapper = new QueryWrapper<>();
+        personBuildingQueryWrapper.eq("building_id",buildingId);
+        List<TaPersonBuilding> list = taPersonBuildingMapper.selectList(personBuildingQueryWrapper);
+        List<Integer>idLists = new ArrayList<>();
+        for(int i=0; i<list.size();i++){
+            if(null != list.get(i).getUserId()){
+                idLists.add(list.get(i).getUserId());
+            }
+        }
+        QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.in("user_id",idLists);
+        IPage<TaUser> data = taUserService.page(page,userQueryWrapper);
+        return data;
+    }
+
     @Override
     public TaPerson newPersonByOpenid(String openid,Integer orgId) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -3,17 +3,6 @@
 <mapper namespace="com.huiju.estateagents.mapper.HelpInitiateRecordMapper">
 
     <update id="updateHelpActivityProcessToEnd">
         update ta_help_initiate_record a
         left join ta_help_activity b on a.help_activity_id = b.help_activity_id
         set a.status = '2'

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -96,17 +96,17 @@
     </update>
 
     <update id="updateUnStartActivity">
-        update ta_building_dynamic t
+        update ta_building_dynamic
         set activity_status = 0
         where
-        t.activity_status = 1 and NOW() between  t.start_date and  t.end_date
+        NOW() &gt;= enlist_start and  NOW() &lt;= enlist_end and activity_status = 1
     </update>
 
     <update id="updateProcessingActivity">
-        update ta_building_dynamic t
+        update ta_building_dynamic
         set activity_status = 2
         where
-        t.activity_status =0 and NOW() > t.end_date
+        activity_status =0 and NOW() >= end_date
     </update>
 
     <select id="updateTaBuildingDynamic">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -50,16 +50,16 @@ FROM
             and a.building_id = #{building}
         </if>
         <if test="name != null and name !=''">
-            and a.name = #{name}
+            and a.name like CONCAT('%',#{name}, '%')
         </if>
         <if test="tel != null and tel!=''">
-            and a.phone = #{tel}
+            and a.phone like CONCAT('%',#{tel}, '%')
         </if>
         <if test="consultName != null and consultName !=''">
             and c.nickname like CONCAT('%',#{consultName}, '%')
         </if>
         <if test="consultTel != null and consultTel !=''">
-            and c.phone = #{consultTel}
+            and c.phone like CONCAT('%',#{consultTel}, '%')
         </if>
         <if test="entryType != null and entryType !=''">
             and a.entry_type = #{entryType}

src/main/resources/mapper/TaShareChildRecordMapper.xml

@@ -3,15 +3,6 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareChildRecordMapper">
 
     <update id="updateEndGroupActivity">
         update ta_share_child_record a
         LEFT JOIN ta_share_activity b on a.group_activity_id = b.group_activity_id
         set a.`status` = '2'

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -3,17 +3,6 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareRecordMapper">
 
     <update id="updateEndGroupActivity">
         update ta_share_record a
         LEFT JOIN ta_share_activity b on a.group_activity_id = b.group_activity_id
         set a.`status` = '2'