楚江ERP:查询客户组件新增来源字段（客户资信的排除已有客户资信的数据）

@@ -28,4 +28,10 @@ public class QueryCustomerSelectorVo extends PageVo implements BaseVo, Serializa
    */
    */
   @ApiModelProperty("状态")
   @ApiModelProperty("状态")
   private Boolean available;
   private Boolean available;
+
+  /**
+   * 来源
+   */
+  @ApiModelProperty("来源")
+  private String source;
 }
 }

@@ -30,30 +30,30 @@
 
 
     <sql id="CustomerDto_sql">
     <sql id="CustomerDto_sql">
         SELECT
         SELECT
-            id,
-            code,
-            name,
-            mnemonic_code,
-            contact,
-            telephone,
-            email,
-            zip_code,
-            fax,
-            city_id,
-            address,
-            settle_type,
-            credit_code,
-            tax_identify_no,
-            bank_name,
-            account_name,
-            account_no,
-            available,
-            description,
-            create_by,
-            create_time,
-            update_by,
-            update_time
-        FROM base_data_customer
+            c.id,
+            c.code,
+            c.name,
+            c.mnemonic_code,
+            c.contact,
+            c.telephone,
+            c.email,
+            c.zip_code,
+            c.fax,
+            c.city_id,
+            c.address,
+            c.settle_type,
+            c.credit_code,
+            c.tax_identify_no,
+            c.bank_name,
+            c.account_name,
+            c.account_no,
+            c.available,
+            c.description,
+            c.create_by,
+            c.create_time,
+            c.update_by,
+            c.update_time
+        FROM base_data_customer c
     </sql>
     </sql>
 
 
     <select id="query" resultMap="CustomerDto">
     <select id="query" resultMap="CustomerDto">
@@ -61,17 +61,17 @@
         <where>
         <where>
             <if test="vo != null">
             <if test="vo != null">
                 <if test="vo.code != null and vo.code != ''">
                 <if test="vo.code != null and vo.code != ''">
-                    AND code like CONCAT('%', #{vo.code}, '%')
+                    AND c.code like CONCAT('%', #{vo.code}, '%')
                 </if>
                 </if>
                 <if test="vo.name != null and vo.name != ''">
                 <if test="vo.name != null and vo.name != ''">
-                    AND name LIKE CONCAT('%', #{vo.name}, '%')
+                    AND c.name LIKE CONCAT('%', #{vo.name}, '%')
                 </if>
                 </if>
                 <if test="vo.available != null">
                 <if test="vo.available != null">
-                    AND available = #{vo.available}
+                    AND c.available = #{vo.available}
                 </if>
                 </if>
             </if>
             </if>
         </where>
         </where>
-        ORDER BY code
+        ORDER BY c.code
     </select>
     </select>
 
 
     <select id="getByName" resultMap="CustomerDto">
     <select id="getByName" resultMap="CustomerDto">
@@ -91,16 +91,24 @@
         <where>
         <where>
             <if test="vo != null">
             <if test="vo != null">
                 <if test="vo.code != null and vo.code != ''">
                 <if test="vo.code != null and vo.code != ''">
-                    AND code = #{vo.code}
+                    AND c.code = #{vo.code}
                 </if>
                 </if>
                 <if test="vo.name != null and vo.name != ''">
                 <if test="vo.name != null and vo.name != ''">
-                    AND name LIKE CONCAT('%', #{vo.name}, '%')
+                    AND c.name LIKE CONCAT('%', #{vo.name}, '%')
                 </if>
                 </if>
                 <if test="vo.available != null">
                 <if test="vo.available != null">
-                    AND available = #{vo.available}
+                    AND c.available = #{vo.available}
+                </if>
+                <if test="vo.source == 'CUSTOMER_CREDIT'">
+                    AND NOT EXISTS (
+                    SELECT 1
+                    FROM customer_credit cc
+                    WHERE cc.company_id = c.id
+                    AND cc.status != 'CANCEL'
+                    )
                 </if>
                 </if>
             </if>
             </if>
         </where>
         </where>
-        ORDER BY code
+        ORDER BY c.code
     </select>
     </select>
 </mapper>
 </mapper>