修改test數據庫

house365-hgs-ws/src/main/resources/test/ibatis/Customer.xml

@@ -1530,11 +1530,30 @@
                     starCustomer = 0
                     ]]>
                 </isNotEmpty>
+
+                <isNotEmpty prepend="AND" property="searchFilters.isPtStar">
+                    <![CDATA[
+                    star_pt_customer = 1
+                    ]]>
+                </isNotEmpty>
+                <isNotEmpty prepend="AND" property="searchFilters.isNotPtStar">
+                    <![CDATA[
+                    star_pt_customer = 0
+                    ]]>
+                </isNotEmpty>
                 <isNotEmpty prepend="AND" property="searchFilters.isShowInPlat">
                     <![CDATA[
 					c.is_show_in_plat $searchFilters.isShowInPlat.operation$ #searchFilters.isShowInPlat.value#
 		            ]]>
                 </isNotEmpty>
+                <isNotEmpty prepend="AND" property="searchFilters.actSources">
+                    <![CDATA[ c.act_source in ]]>
+
+					    <iterate prepend="" property="searchFilters.actSources.value" close=")" open="(" conjunction=",">
+                            <![CDATA[ #searchFilters.actSources.value[]# ]]>
+					    </iterate>
+
+                </isNotEmpty>
                 <isNotEmpty prepend="AND" property="searchFilters.starCustomer">
                     <![CDATA[
                     starCustomer $searchFilters.starCustomer.operation$ #searchFilters.starCustomer.value#
@@ -1545,14 +1564,6 @@
                     isHandover $searchFilters.isHandover.operation$ #searchFilters.isHandover.value#
                     ]]>
                 </isNotNull>
-                <isNotEmpty prepend="AND" property="searchFilters.actSources">
-                    <![CDATA[ c.act_source in ]]>
-
-                    <iterate prepend="" property="searchFilters.actSources.value" close=")" open="(" conjunction=",">
-                        <![CDATA[ #searchFilters.actSources.value[]# ]]>
-                    </iterate>
-
-                </isNotEmpty>
                 <isNotNull prepend="AND" property="searchFilters.isActive">
                     <![CDATA[
                     is_active = 1
@@ -1603,6 +1614,11 @@
                             AND c.phone = t.phone)
                     ]]>
                 </isNotEmpty>
+                <isNotEmpty prepend="AND" property="searchFilters.createrName">
+                    <![CDATA[
+					 c.creater in (select id from user u3 where u3.realName LIKE concat('', #searchFilters.createrName.value#, '%') )
+		            ]]>
+                </isNotEmpty>
             </isNotNull>
         </dynamic>
     </sql>
@@ -1642,7 +1658,7 @@
         update_time, updater, cityCode,cityName, biz_port,crmId,act_source_id, trace_status, remark, crm_sync,
         hotline_call_time,hotline_call_spend,ocean_date,is_delete,last_manager,bind_time, customer_source_type,
         customer_rel_id, isWaitCall, singupTime,marketActId, marketActName,is_peer, starCustomer, isHandover,
-        isRecycled,is_active
+        isRecycled,is_active,starCustomer AS star_pt_customer
         FROM customer_merge c
         <include refid="customer.queryManagementPage"/>
         <isNotEmpty prepend="ORDER BY" property="searchFilters.orderBy">
@@ -1656,13 +1672,15 @@
     </select>
 
     <!-- 平台客户查询 -->
-    <select id="getPlatformCustomerList" resultClass="com.house365.beans.entity.CustomerEntity">
+    <select id="getPlatformCustomerList" resultClass="com.house365.beans.entity.CustomerEntity"> 
         SELECT
         min( c.id ) id,
         (IFNULL((SELECT cm.NAME FROM customer_merge cm WHERE	cm.phone = c.phone AND cm.manager_id = c.manager_id AND cm.cityCode = #searchFilters.cityCode.value# AND cm.is_delete = 0 AND cm.STATUS IN ( 11, 0, 99 )),
         ( SELECT ct.NAME FROM customer ct WHERE ct.id = c.id ))) NAME,
         c.phone,
         (select u2.realName from user u2 where u2.id = c.creater) creater,
+        c.creater AS createrId,
+        c.star_pt_customer AS starPtCustomer,
         (
         IFNULL((SELECT min( ct.create_time ) FROM customer ct WHERE ct.phone = c.phone AND ct.manager_id = c.manager_id AND ct.cityCode = #searchFilters.cityCode.value# AND ct.is_delete = 0 AND ct.STATUS IN ( 11, 0, 99 )),
         (SELECT ct.create_time FROM customer ct WHERE ct.id = c.id))