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

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -28,6 +28,7 @@ import com.huiju.estateagents.entity.SysMenu;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
 import com.huiju.estateagents.service.ITaRoleService;
 import org.slf4j.Logger;
@@ -82,6 +83,9 @@ public class TaUserController extends BaseController {
     @Autowired
     private ITaUserRoleService taUserRoleService;
 
+    @Autowired
+    private TaRoleMapper taRoleMapper;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -238,6 +242,12 @@ public class TaUserController extends BaseController {
             //获取所有菜单
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
+
+            allButtons.forEach(e -> {
+                List<TaRole> taRoles = taRoleMapper.getRolesByBtnId(e.getBtnId());
+                e.setRolesList(taRoles);
+            });
+
             userMap.put("taUser", taUser);
             userMap.put("menuList", allMenus);
             userMap.put("buttonList", allButtons);

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

@@ -183,11 +183,12 @@ public class TaChannelController extends BaseController {
     @RequestMapping(value="/admin/channel/broker",method= RequestMethod.GET)
     public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
                                            @RequestParam(value="phone",required = false) String phone,
+                                           @RequestParam(value="phone",required = false) Integer channelId,
                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            HttpServletRequest request){
         Integer orgid = getOrgId(request);
-        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize,orgid);
+        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize,orgid,channelId);
         return taPerson;
     }
 

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

@@ -521,9 +521,8 @@ public class TaRecommendCustomerController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ExcelRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("推荐客户").build();
-        List<ExcelRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode, pageSize);
+            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -552,7 +551,7 @@ public class TaRecommendCustomerController extends BaseController {
         // 总页数
         Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
         // 设置读取的class
-        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ExcelRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ReporRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
         List<ReporRecommendCustomer> recCustomerExport = null;
@@ -585,7 +584,7 @@ public class TaRecommendCustomerController extends BaseController {
         // 总页数
         Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
         // 设置读取的class
-        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ExcelRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AgentsRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("经纪人").build();
         List<AgentsRecommendCustomer> recCustomerExport = null;

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

@@ -52,4 +52,7 @@ public class SysButtonInMenu implements Serializable {
 
     @TableField(exist = false)
     private List<Integer> roles;
+
+    @TableField(exist = false)
+    private List<TaRole> rolesList;
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -151,7 +151,8 @@ public class AccessInterceptor implements HandlerInterceptor {
     
     //检验按钮权限
     private boolean checkButtonRole(HttpServletRequest request) {
-        if(StringUtils.isEmpty(request.getHeader("x-action"))){
+        String action = request.getHeader("x-action");
+        if(StringUtils.isEmpty(action)){
             return false;
         }
         //根据路径匹配code 一致继续 否则无权限
@@ -161,15 +162,16 @@ public class AccessInterceptor implements HandlerInterceptor {
         if (null == taButtonUriMap){
             return true;
         }
+    
         
-        if (!taButtonUriMap.getButtonCode().equals(request.getHeader("x-action"))){
+        if (!taButtonUriMap.getButtonCode().equals(action)){
             return false;
         }
         
         //根据code查询按钮权限
         Map map = JWTUtils.getUserIdAndOrgId(request);
         QueryWrapper<SysButtonInMenu> sysButtonInMenuQueryWrapper = new QueryWrapper<>();
-        sysButtonInMenuQueryWrapper.eq("code",request.getHeader("x-action"));
+        sysButtonInMenuQueryWrapper.eq("code",action);
         SysButtonInMenu sysButtonInMenu = sysButtonInMenuService.getOne(sysButtonInMenuQueryWrapper);
         if (null == sysButtonInMenu){
             return false;

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

@@ -180,7 +180,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param phone
      * @return
      */
-    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone,@Param("orgid") Integer orgid);
+    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone,@Param("orgid") Integer orgid,@Param("channelId") Integer channelId);
 
     /**
      * 渠道邀请经纪人

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

@@ -19,4 +19,11 @@ import java.util.List;
 public interface TaRoleMapper extends BaseMapper<TaRole> {
 
     List<TaRole> getRolesByUser(@Param("user") Integer userId);
+
+    /**
+     * 根据按钮ID查询出所有角色
+     * @param btnId
+     * @return
+     */
+    List<TaRole> getRolesByBtnId(@Param("btnId") Integer btnId);
 }

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

@@ -73,7 +73,7 @@ public interface ITaPersonService extends IService<TaPerson> {
      * @param phone
      * @return
      */
-    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid);
+    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid,Integer channelId);
 
     /**
      * 渠道下邀请经纪人

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

@@ -149,7 +149,7 @@ public class TaChatServiceImpl extends ServiceImpl<TaChatMapper, TaChat> impleme
 
                 miniAppService.sendNoticeMessage(to, link, StringUtils.ifNull(from.getName(), from.getNickname()), StringUtils.ifNull(from.getTel(), from.getPhone()), "给您发送了一条新消息, 请查收", LocalDateTime.now());
             } else {
-                taChat.setIsRead(CommConstant.MESSAGE_READED);
+//                taChat.setIsRead(CommConstant.MESSAGE_READED);
             }
         }
 

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

@@ -626,10 +626,10 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid) {
+    public ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid,Integer channelId) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
-        IPage<TaPerson> IPage = taPersonMapper.channelBrokerList(pg,name,phone,orgid);
+        IPage<TaPerson> IPage = taPersonMapper.channelBrokerList(pg,name,phone,orgid,channelId);
         List<TaPerson> taPersonList= IPage.getRecords();
         for (TaPerson taPerson:taPersonList){
             QueryWrapper<TaRecommendCustomer> taRecommendCustomerQuery= new QueryWrapper<>();

src/main/resources/mapper/TaBuildingMapper.xml

@@ -15,7 +15,7 @@
                 and  TO_DAYS(ta_building.opening_date ) = TO_DAYS(#{startDate})
             </if>
             <if test="buildingStatus != null and buildingStatus != ''">
-                and  ta_building.building_status = #{buildingStatus}
+                and  ta_building.status = #{buildingStatus}
             </if>
             <if test="marketStatus != null and marketStatus != ''">
                 and  ta_building.market_status =#{marketStatus}

src/main/resources/mapper/TaPersonMapper.xml

@@ -505,7 +505,8 @@ FROM
         rc.`name`,
         rc.phone,
         COUNT(rc.person_id) as recommendCount
-        from ta_person p
+        from ta_channel_person tch
+        left join  ta_person p on  tch.person_id = p.person_id
         LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id and rc.report_recommend_status = 1
         <where>
         <if test="name !=null and name !=''">
@@ -516,8 +517,9 @@ FROM
         </if>
             and p.person_type = 'estate agent'
             and p.org_id= #{orgid}
+            and tch.channel_id = #{channelId}
         </where>
-        GROUP BY p.person_id
+        GROUP BY tch.person_id
     </select>
 
     <select id="InviteClientsList" resultType="com.huiju.estateagents.entity.TaPerson">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -318,7 +318,7 @@ FROM
         </where>
 
         ORDER BY
-        create_date DESC
+        a.create_date DESC
     </select>
 
     <select id="getIndependentAgentsExport" resultType="com.huiju.estateagents.excel.AgentsRecommendCustomer">
@@ -326,8 +326,8 @@ FROM
         a.nickname as nickname,
         a.phone as phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女', '未知')) as gender,
-        a.personType as personType,
-        if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人')  as channelName
+        if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人') as personType,
+        tc.channel_name  as channelName
         FROM
         ta_person a
         left join ta_channel_person tcp on a.person_id = tcp.person_id

src/main/resources/mapper/TaRoleMapper.xml

@@ -10,4 +10,14 @@
         WHERE
             s.user_id = #{user}
     </select>
+
+    <select id="getRolesByBtnId" resultType="com.huiju.estateagents.entity.TaRole">
+        SELECT
+            t.*
+        FROM
+        ta_role_button trb left JOIN  ta_role t
+        ON trb.role_id = t.role_id
+        WHERE
+            trb.btn_id = #{btnId}
+    </select>
 </mapper>