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

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

@@ -237,6 +237,11 @@ public class TaBuildingDynamicController extends BaseController {
 
         // 携带的报名人数(是已经包括自己了)，不能超过活动总人数
 
+        // 检验 个人最大报名人数
+        if (taActivityDynamicEnlist.getAttendNum() > buildingDynamic.getMaxEnlistByPerson().intValue()) {
+            return ResponseBean.error("报名失败，超过活动报名的个人最大报名人数！", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         // 当前活动已报名的总人数
         Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), orgId);
         if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getEnlistNum().intValue()) {

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
@@ -184,6 +185,28 @@ public class TaNewsController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "资讯置顶", notes = "资讯置顶")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "newsId", paramType = "query",value = "资讯ID"),
+            @ApiImplicitParam(dataType = "Integer", name = "weight", paramType = "query",value = "权重")
+    })
+    @RequestMapping(value = "/admin/taNews/weight" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicWeight(@RequestParam Integer newsId,@RequestParam Integer weight,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        TaNews taNews = iTaNewsService.getById(newsId);
+        taNews.setWeight(weight);
+        taNews.setOrgId(getOrgId(request));
+        QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
+        newsQueryWrapper.eq("news_id",newsId);
+        if (iTaNewsService.updateById(taNews)){
+            responseBean.addSuccess("成功");
+        }else {
+            responseBean.addError("失败");
+        }
+        return responseBean;
+    }
+
+
     /**
      * 微信 根据id查询对象
      * @param id  实体ID

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

@@ -11,13 +11,11 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaChannel;
-import com.huiju.estateagents.entity.TaChannelPerson;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.*;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
@@ -40,6 +38,7 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -72,6 +71,10 @@ public class TaRecommendCustomerController extends BaseController {
     @Autowired
     private TaRecommendCustomerMapper taRecommendCustomerMapper;
 
+    @Autowired
+    private TaPersonBuildingMapper taPersonBuildingMapper;
+
+
     /**
      * 我的客户列表
      * @param pageNumber
@@ -257,9 +260,21 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex,
-                                         @RequestParam(value = "customerType") String customerType,
-                                         @RequestParam(value = "status",required = false) Integer status){ // public 公  private 私
+                                         @RequestParam(value = "customerType") String customerType,// public 公  private 私
+                                         @RequestParam(value = "status",required = false) Integer status){
         try{
+
+            // TODO 目前如果是公客，就取当前操作人员的 buildingId
+            if ("public".equals(customerType)) {
+                Map<String,Object> map = JWTUtils.getUserIdAndOrgId(request);
+                String userId = (String) map.get("userId");
+                QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("user_id", userId);
+                queryWrapper.orderByDesc("create_date");
+                queryWrapper.last("limit 1");
+                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
+                buildingId = personBuilding.getBuildingId();
+            }
             return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();

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

@@ -107,6 +107,11 @@ public class TaNews implements Serializable {
      */
     private Integer shareNum;
 
+    /**
+     * 权重
+     */
+    private Integer weight;
+
     /**
      * 类型
      */

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

@@ -266,4 +266,10 @@ public class TaPerson implements Serializable {
 
     @TableField(exist = false)
     private List<TaShareContent> shareContents;
+
+    /**
+     * 推广人
+     */
+    @TableField(exist = false)
+    private String sharePersonName;
 }

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

@@ -175,4 +175,10 @@ public class TaRecommendCustomer implements Serializable {
 
     @TableField(exist = false)
     private String recommendTel;
+
+    /**
+     * 推广人
+     */
+    @TableField(exist = false)
+    private String sharePersonName;
 }

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

@@ -44,7 +44,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("buildingId") String buildingId, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
 
     /**
      * 导出数据 获取推荐用户数据

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

@@ -33,7 +33,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage<TaRecommendCustomer> getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId);
+    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId);
 
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId);
 

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

@@ -72,7 +72,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
-        taNewsQueryWrapper.orderByDesc("create_date");
+        taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
         injectType(taNewsIPage.getRecords());

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

@@ -340,12 +340,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId){
+    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId){
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, building,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -151,7 +151,8 @@ FROM
         b.name as consultantName,
         b.tel as consultTel,
         c.nickname as recommendName,
-        c.tel as recommendTel
+        c.tel as recommendTel,
+        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{building} and tspf.is_first_time = 1) as sharePersonName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
@@ -204,7 +205,8 @@ FROM
 
     <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-        b.*
+        b.*,
+        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{buildingId} and tspf.is_first_time = 1) as sharePersonName
         FROM
         ta_person b
         <where>