feats

src/main/java/com/yunzhi/marketing/base/BaseController.java

@@ -137,9 +137,9 @@ public class BaseController {
         TaUser taUser = taUserService.getById(getUserId(request));
         List<Institution> list = iInstitutionService.getAllByUser(taUser);
         List<String> institutions = list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
-        if (institutions.contains(CommConstant.ROOT_INSTITUTION)) {
-            return null;
-        }
+//        if (institutions.contains(CommConstant.ROOT_INSTITUTION)) {
+//            return null;
+//        }
         return institutions;
     }
 

src/main/java/com/yunzhi/marketing/broker/controller/BkFirstScreenController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * <p>
@@ -85,10 +86,17 @@ public class BkFirstScreenController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean bkFirstScreenAdd(@ApiParam("保存内容") @RequestBody BkFirstScreen bkFirstScreen,
                                          HttpServletRequest request) throws Exception{
-
+        String uuid = UUID.randomUUID().toString().replaceAll("-","");
+        bkFirstScreen.setScreenId(uuid);
         bkFirstScreen.setInstitutionId(CommConstant.ROOT_INSTITUTION);
         bkFirstScreen.setOrgId(getOrgId(request).toString());
 
+        if (!StringUtils.isEmpty(bkFirstScreen.getPageParam())) {
+            if (bkFirstScreen.getPageParam().contains("{id}")) {
+                bkFirstScreen.setPageParam(bkFirstScreen.getPageParam().replace("{id}", uuid));
+            }
+        }
+
         if (iBkFirstScreenService.save(bkFirstScreen)){
             return ResponseBean.success(bkFirstScreen);
         }else {
@@ -122,6 +130,11 @@ public class BkFirstScreenController extends BaseController {
                                         @ApiParam("更新内容") @RequestBody BkFirstScreen bkFirstScreen) throws Exception{
 
         bkFirstScreen.setScreenId(id);
+        if (!StringUtils.isEmpty(bkFirstScreen.getPageParam())) {
+            if (bkFirstScreen.getPageParam().contains("{id}")) {
+                bkFirstScreen.setPageParam(bkFirstScreen.getPageParam().replace("{id}", id));
+            }
+        }
 
         if (iBkFirstScreenService.updateById(bkFirstScreen)){
             return ResponseBean.success(iBkFirstScreenService.getById(id));

src/main/java/com/yunzhi/marketing/broker/controller/BrokerController.java

@@ -11,6 +11,8 @@ import com.yunzhi.marketing.broker.vo.BrokerVO;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
+import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -34,6 +36,9 @@ public class BrokerController extends BaseController {
     @Autowired
     IBkInviteRecordService iBkInviteRecordService;
 
+    @Autowired
+    IChannelCustomerService iChannelCustomerService;
+
 
     @RequestMapping(value="/admin/broker",method= RequestMethod.GET)
     @ApiOperation(value="经纪人列表", notes = "经纪人列表", httpMethod = "GET", response = ResponseBean.class)
@@ -51,6 +56,24 @@ public class BrokerController extends BaseController {
     }
 
 
+    @RequestMapping(value="/admin/broker/customer",method= RequestMethod.GET)
+    @ApiOperation(value="经纪人客户列表", notes = "经纪人客户列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getCustomerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
+                                      @ApiParam("姓名") @RequestParam(value ="name", required = false) String name,
+                                      @ApiParam("推荐人") @RequestParam(value ="recommendPerson", required = false) String recommendPerson) throws Exception {
+
+        if (StringUtils.isEmpty(recommendPerson)) {
+            return ResponseBean.error("请选择推荐经纪人", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        IPage<ChannelCustomer> page = new Page<>(pageNum, pageSize);
+        IPage<ChannelCustomer> result = iChannelCustomerService.getPageByBroker(page, recommendPerson, name, phone);
+        return ResponseBean.success(result);
+    }
+
+
     @RequestMapping(value="/wx/broker",method= RequestMethod.GET)
     @ApiOperation(value="小程序端经纪人列表", notes = "小程序端经纪人列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getWxBrokerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,

src/main/java/com/yunzhi/marketing/broker/entity/BkFirstScreen.java

@@ -27,7 +27,7 @@ public class BkFirstScreen implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "ID")
-    @TableId(value = "screen_id", type = IdType.UUID)
+    @TableId(value = "screen_id", type = IdType.INPUT)
     private String screenId;
 
     @ApiModelProperty(value = "标题")

src/main/java/com/yunzhi/marketing/controller/ExtendContentController.java

@@ -97,7 +97,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
-            queryWrapper.in("institution_id",getInstitutionIds(request));
+            queryWrapper.in("institution_id", getInstitutionIds(request));
             queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -666,7 +666,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             return ResponseBean.error("已存在的客户报备失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-
         // 如果是全民经纪人
         if (CommConstant.PERSON_BROKER.equals(person.getPersonType())) {
             TaBuilding taBuilding = taBuildingMapper.selectById(buildingId);

src/main/java/com/yunzhi/marketing/xlk/mapper/ChannelCustomerMapper.java

@@ -60,4 +60,6 @@ public interface ChannelCustomerMapper extends BaseMapper<ChannelCustomer> {
     ChannelCustomer getMoreInfoById(@Param("channelCustomerId") String channelCustomerId, @Param("customerId") String customerId);
 
     List<ChannelCustomer> getRecommendedOrExpired(@Param("buildingId") String buildingId,@Param("phone") String phone);
+
+    IPage<ChannelCustomer> getPageByBroker(IPage<ChannelCustomer> page, @Param("recommendPerson") String recommendPerson, @Param("name") String name, @Param("phone") String phone);
 }

src/main/java/com/yunzhi/marketing/xlk/service/IChannelCustomerService.java

@@ -93,4 +93,6 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
      * @throws Exception
      */
     void updateBizNode(MarkingSignatoryCustomerDTO params, Integer bizStatus, String bizType) throws Exception;
+
+    IPage<ChannelCustomer> getPageByBroker(IPage<ChannelCustomer> page, String recommendPerson, String name, String phone);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -661,6 +661,11 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         }
     }
 
+    @Override
+    public IPage<ChannelCustomer> getPageByBroker(IPage<ChannelCustomer> page, String recommendPerson, String name, String phone) {
+        return baseMapper.getPageByBroker(page, recommendPerson, name, phone);
+    }
+
     private Integer intIfNvl(Integer i) {
         return i == null ? 0 : i;
     }

src/main/resources/mapper/xlk/ChannelCustomerMapper.xml

@@ -78,13 +78,14 @@
             b.avatarurl ,
             ifnull(c.`status`, 1) as customer_status,
             if(c.customer_id is null, "report", "customer") as type,
-            d.expiration_date,
+            IF(a.recommend_person_type = 'broker', m.expiration_days, d.expiration_date) as expiration_date,
             d.building_name
         FROM
             xlk_channel_customer a
         LEFT JOIN ta_person b ON a.person_id = b.person_id
         left join ta_recommend_customer c on a.customer_id = c.customer_id
         LEFT JOIN ta_building d on a.building_id = d.building_id
+        LEFT JOIN bk_agreement m ON a.building_id = m.building_id
         WHERE
         a.recommend_person = #{params.personId}
         and a.org_id = #{params.orgId}
@@ -221,4 +222,47 @@
                 )
             )
     </select>
+    <select id="getPageByBroker" resultType="com.yunzhi.marketing.xlk.entity.ChannelCustomer">
+        SELECT
+            t.channel_customer_id,
+            t.create_date,
+            t.org_id,
+            t.building_id,
+            fun_mix_str ( t.phone, 4 ) AS phone,
+            t.`name`,
+            t.picture,
+            t.sex,
+            t.person_id,
+            t.`status`,
+            t.channel_id,
+            t.recommend_person,
+            t.realty_consultant,
+            t.remark,
+            t.customer_id,
+            t.visit_date,
+            t.preparatory_date,
+            t.signed_date,
+            t.commission_date,
+            t.institution_id,
+            t.recommend_person_type,
+            t.total_commission,
+            t.unsettled_commission,
+            t.settled_commission,
+            s.building_name
+        FROM
+            xlk_channel_customer t
+                INNER JOIN ta_building s ON t.building_id = s.building_id
+        WHERE
+            t.recommend_person = #{recommendPerson}
+          <if test="name != null and name != ''">
+              AND t.`name` LIKE CONCAT( '%', #{name}, '%' )
+          </if>
+          <if test="phone != null and phone != ''">
+              AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+          </if>
+            AND t.`status` = 2
+--           AND t.`status` &gt; -1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>