bug 修复

src/main/java/com/yunzhi/marketing/xlk/controller/CustomerSignatoryController.java

@@ -7,6 +7,7 @@ import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
 import com.yunzhi.marketing.xlk.service.ICustomerSignatoryService;
+import com.yunzhi.marketing.xlk.vo.CustomerSignatoryVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -48,20 +49,20 @@ public class CustomerSignatoryController extends BaseController {
      * @param pageSize
      * @return
      */
-    @ApiOperation(value = "", notes = "")
-    @RequestMapping(value="/customerSignatory",method= RequestMethod.GET)
+    @ApiOperation(value = "获取成交或者签约数据", notes = "获取成交或者签约数据")
+    @RequestMapping(value="/admin/customerSignatory",method= RequestMethod.GET)
     public ResponseBean customerSignatoryList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              @RequestParam(value ="buildingId",required = false) String buildingId,
+                                              @RequestParam(value ="name",required = false) String name,
+                                              @RequestParam(value ="phone",required = false) String phone,
+                                              @RequestParam(value ="type",required = false) String type,
                                               @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<CustomerSignatory> pg = new Page<>(pageNum, pageSize);
-            LambdaQueryWrapper<CustomerSignatory> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(CustomerSignatory::getOrgId,getOrgId(request));
-            queryWrapper.orderByDesc(CustomerSignatory::getCreateDate);
-
-            IPage<CustomerSignatory> result = iCustomerSignatoryService.page(pg, queryWrapper);
+		    IPage<CustomerSignatoryVO> pg = new Page<>(pageNum, pageSize);
+            IPage<CustomerSignatoryVO> result = iCustomerSignatoryService.getCustomerSignatoryList(pg, buildingId,name,phone,type,getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -1,8 +1,11 @@
 package com.yunzhi.marketing.xlk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
+import com.yunzhi.marketing.xlk.vo.CustomerSignatoryVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +18,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CustomerSignatoryMapper extends BaseMapper<CustomerSignatory> {
 
+    IPage<CustomerSignatoryVO> getCustomerSignatoryList(IPage<CustomerSignatoryVO> pg, @Param("buildingId") String buildingId,@Param("name") String name,
+                                                        @Param("phone") String phone,@Param("type") String type, @Param("orgId") Integer orgId);
 }

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

@@ -1,7 +1,9 @@
 package com.yunzhi.marketing.xlk.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
+import com.yunzhi.marketing.xlk.vo.CustomerSignatoryVO;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
  */
 public interface ICustomerSignatoryService extends IService<CustomerSignatory> {
 
+    IPage<CustomerSignatoryVO> getCustomerSignatoryList(IPage<CustomerSignatoryVO> pg, String buildingId, String name, String phone, String type, Integer orgId);
 }

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

@@ -1,9 +1,11 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
 import com.yunzhi.marketing.xlk.mapper.CustomerSignatoryMapper;
 import com.yunzhi.marketing.xlk.service.ICustomerSignatoryService;
+import com.yunzhi.marketing.xlk.vo.CustomerSignatoryVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class CustomerSignatoryServiceImpl extends ServiceImpl<CustomerSignatoryMapper, CustomerSignatory> implements ICustomerSignatoryService {
 
+    @Override
+    public IPage<CustomerSignatoryVO> getCustomerSignatoryList(IPage<CustomerSignatoryVO> pg, String buildingId, String name, String phone, String type, Integer orgId) {
+        return this.baseMapper.getCustomerSignatoryList(pg,buildingId,name,phone,type,orgId);
+    }
 }

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

@@ -0,0 +1,97 @@
+package com.yunzhi.marketing.xlk.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yunzhi.marketing.entity.TaBuildingApartment;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 客户签约单 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-30
+ */
+@Data
+public class CustomerSignatoryVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String customerSignatoryId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 客户姓名
+     */
+    private String name;
+
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 业绩分成人
+     */
+    private String dividendsName;
+
+    /**
+     * 比例
+     */
+    private String proportion;
+
+    /**
+     * 户型
+     */
+    private String houseType;
+
+    /** 房屋信息 */
+    private String houseInfo;
+
+    /**
+     * 金额
+     */
+    private String price;
+
+
+    /** 类型 */
+    private String type ;
+
+    private String picture;
+
+    private String  sex;
+    private String  phone;
+    private String  buildingName;
+
+    private String recommendName;
+    private String recommendTel;
+    private String realtyConsultantName;
+    private String realtyConsultantTel;
+}

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

@@ -2,4 +2,48 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.xlk.mapper.CustomerSignatoryMapper">
 
+    <select id="getCustomerSignatoryList" resultType="com.yunzhi.marketing.xlk.vo.CustomerSignatoryVO">
+        SELECT
+            c.picture,
+            c.`name`,
+            c.sex,
+            c.phone,
+            b.building_name,
+            t.customer_signatory_id,
+            t.customer_id,
+            t.building_id,
+            t.price,
+            t.remark,
+            t.create_date,
+            t.type,
+            t.dividends_name,
+            t.proportion,
+            t.house_type,
+            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
+        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
+        WHERE
+        t.org_id = #{orgId}
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+            and p.nickname like concat('%', #{params.nickname}, '%')
+        </if>
+        <if test="name != null and name != ''">
+            and c.name like concat('%', #{name}, '%')
+        </if>
+        <if test="phone != null and phone != ''">
+            and c.phone like concat('%', #{phone}, '%')
+        </if>
+        <if test="type != null and type != ''">
+            and t.type = #{type}
+        </if>
+    </select>
 </mapper>