feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>marketing</artifactId>
-	<version>v1.0.32</version>
+	<version>v1.0.33</version>
 	<name>marketing-cloud</name>
 	<description>新联康营销云</description>
 

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

@@ -236,7 +236,14 @@ public class ExtendContentController extends BaseController {
     @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.PUT)
     public ResponseBean extendContentUpdate(@PathVariable Integer id,
                                         @RequestBody ExtendContent extendContent,HttpServletRequest request){
+
         ResponseBean responseBean = new ResponseBean();
+        ExtendContent origin = iExtendContentService.getById(id);
+        if (null == origin) {
+            responseBean.addError("未找到更新内容");
+            return responseBean;
+        }
+        extendContent.setStatus(origin.getStatus());
         extendContent.setContentId(id);
         try {
             if (extendContent.getCityId() == null){

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

@@ -29,10 +29,7 @@ import com.yunzhi.marketing.service.ITaRecommendCustomerService;
 import com.yunzhi.marketing.service.TaChannelPersonService;
 import com.yunzhi.marketing.service.TaChannelService;
 import com.yunzhi.marketing.excel.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -525,20 +522,23 @@ public class TaRecommendCustomerController extends BaseController {
      * 经纪人列表
      *
      * @param name
+     * @param personId  经纪人ID
      * @param tel
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    @GetMapping("/admin/customer/agents")
+    @GetMapping("/{client}/customer/agents")
     public ResponseBean getIndependentAgents(HttpServletRequest request,
+                                             @PathVariable  String client,
                                              @RequestParam(value = "name", required = false) String name,
+                                             @RequestParam(value = "personId", required = false) String personId,
                                              @RequestParam(value = "tel", required = false) String tel,
                                              @RequestParam(value = "channelId", required = false) String channelId,
                                              @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
-            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber, pageSize, name, tel, channelId, getOrgId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber, pageSize, personId, name, tel, channelId, getOrgId(request)));
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/marketing/mapper/TaRecommendCustomerMapper.java

@@ -40,7 +40,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson> page, @Param("personId") String personId, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
 
     /**
      * 公客

src/main/java/com/yunzhi/marketing/service/ITaRecommendCustomerService.java

@@ -47,7 +47,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
-    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, String channelId, Integer orgId);
+    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String personId, String name, String tel, String channelId, Integer orgId);
 
 
     TaRecommendCustomer getCustomerDetail(String customerId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId);

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

@@ -1244,9 +1244,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, String channelId, Integer orgId) {
+    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String personId, String name, String tel, String channelId, Integer orgId) {
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
-        return taRecommendCustomerMapper.getIndependentAgents(page, name, tel, channelId, orgId);
+        return taRecommendCustomerMapper.getIndependentAgents(page, personId, name, tel, channelId, orgId);
     }
 
     @Override

src/main/java/com/yunzhi/marketing/xlk/vo/CustomerSignatoryVO.java

@@ -71,6 +71,10 @@ public class CustomerSignatoryVO implements Serializable {
      * 户型
      */
     private String houseType;
+    /**
+     * 户型
+     */
+    private String houseTypeName;
 
     /** 房屋信息 */
     private String houseInfo;

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -88,8 +88,11 @@ FROM
         ta_person a
         left join ta_channel_person tcp on a.person_id = tcp.person_id
         left join ta_channel tc on tc.channel_id = tcp.channel_id
-        <where>
-            a.person_type in in ('channel agent', 'estate agent')
+        <where> 1=1
+            <if test="personId != null and personId !=''">
+                and a.person_id = #{personId}
+            </if>
+            and a.person_type in ('channel agent', 'estate agent')
             and a.status >0
             <if test="name != null and name !=''">
                 and a.nickname = #{name}

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

@@ -19,17 +19,19 @@
             t.dividends_name,
             t.proportion,
             t.house_type,
+            m.apartment_name as house_type_name,
             t.house_info,
             p.`name` as recommend_name,
             p.tel as recommend_tel,
-            p.`name` as realty_consultant_name,
-            p.tel as realty_consultant_tel
+            pp.`name` as realty_consultant_name,
+            pp.tel as realty_consultant_tel
         FROM
             xlk_customer_signatory t
         LEFT JOIN ta_recommend_customer c ON t.customer_id = c.customer_id
         LEFT JOIN ta_building b on t.building_id = b.building_id
         LEFT JOIN ta_person p on t.recommend_person = p.person_id
         LEFT JOIN ta_person pp on t.realty_consultant = pp.person_id
+        LEFT JOIN ta_building_apartment m on m.building_id = t.building_id and m.apartment_id = t.house_type
         WHERE
         t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
@@ -45,5 +47,6 @@
         <if test="type != null and type != ''">
             and t.type = #{type}
         </if>
+        ORDER BY t.create_date DESC
     </select>
 </mapper>