需求86 客户投诉页面和列表调整

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/dataobject/customer/complaint/CustomerComplaintDO.java

@@ -113,5 +113,12 @@ public class CustomerComplaintDO extends BaseDO {
      */
     private String cancelReason;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "客户编号")
+    private String customerNumber;
 
 }

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/customer/CustomerComplaintMapper.java

@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultType;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -22,6 +23,14 @@ import java.util.List;
 @Mapper
 public interface CustomerComplaintMapper extends BaseMapperX<CustomerComplaintDO> {
 
+    @ResultType(CustomerComplaintDO.class)
+    @Select({
+        "SELECT cc.* , c.`name` as customer_name , c.number as customer_number FROM ecw_customer_complaint AS cc " +
+        "LEFT JOIN ecw_customer as c ON c.id = cc.customer_id " +
+        "WHERE cc.id = #{id} AND cc.deleted = 0"
+    })
+    CustomerComplaintDO selectOneById(@Param("id") Long id);
+
 
     @ResultType(CustomerComplaintRespVO.class)
     @Select({

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customer/complaint/CustomerComplaintServiceImpl.java

@@ -119,7 +119,7 @@ public class CustomerComplaintServiceImpl extends AbstractService<CustomerCompla
 
     @Override
     public CustomerComplaintDO getCustomerComplaint(Long id) {
-        return customerComplaintMapper.selectById(id);
+        return customerComplaintMapper.selectOneById(id);
     }
 
     @Override

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customer/vo/CustomerSelectReqVO.java

@@ -23,4 +23,7 @@ public class CustomerSelectReqVO extends PageParam {
     @ApiModelProperty(value = "客户等级")
     private Integer customerLevel;
 
+    @ApiModelProperty(value = "客户编号")
+    private String customerNumber;
+
 }

yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -942,6 +942,9 @@
         <if test="reqVO.customerType != null">
             AND a.type = #{reqVO.customerType}
         </if>
+        <if test="reqVO.customerNumber != null">
+            AND a.`number` like concat("%",concat(#{reqVO.customerNumber},"%"))
+        </if>
         <if test="reqVO.customerLevel != null">
             AND a.type = #{reqVO.customerLevel}
         </if>