4.9.3需求---平台创建人搜索

house365-hgs-web/src/main/java/com/house365/web/controller/CustomerManagementController.java

@@ -591,6 +591,12 @@ public class CustomerManagementController extends BaseController {
 
         model.addAttribute("actList", alist);
 
+        //平台创建人 ------> IM测试组组长及组员
+        Map<String, Object> paramMap = new HashMap<>( 10 );
+        paramMap.put( "deptUrlPath", "/1/2/69/70/71/556" );
+        List<UserEntity> createrList = user.queryByConditions( paramMap );
+        model.addAttribute("createrList", createrList);
+
         List<CustomerListVO> customers = new ArrayList<>();
         //用户标签
         List<LabelEntity> userLabelList = user.queryUserLabel(userEntity.getId());//标签库中当前用户创建的标签

house365-hgs-web/src/main/webapp/WEB-INF/views/customermanagement/pages/myCustomerNew.jsp

@@ -223,6 +223,7 @@
         padding: 0;
         width: 33%;
     }
+
     .pace {
         display: inline-block;
         -webkit-pointer-events: none;
@@ -588,6 +589,16 @@
                 活动名称：<input type="text" id="search_LIKE_sourceName" style="border: 1px solid #d5d5d5;" name="search_LIKE_sourceName" value="${param['search_LIKE_sourceName']}"
                 class="m-wrap small" placeholder="活动名称">&nbsp;&nbsp;&nbsp;&nbsp;
 
+                <c:if test="${city == 'nj'}">
+                    平台创建人：<select name="search_EQ_createrId" id="search_EQ_createrId" style="width: 10rem">
+                    <option value="">全部</option>
+                    <c:forEach items="${createrList}" var="creater">
+                        <option value="${creater.id}"
+                                <c:if test="${creater.id eq param['search_EQ_createrId']}">selected="selected"</c:if>>${creater.realName}</option>
+                    </c:forEach>
+                    </select>
+                </c:if>
+
             </c:if>
 
             <div style="float: right">
@@ -1045,7 +1056,8 @@
                                     </c:forEach>
                                 </div>
                             </div>
-                            <div class="mangerlist__record" onclick="showCustomerCallbackLogs('${customer.id}', '${customer.managerId}')">
+                            <div class="mangerlist__record"
+                                 onclick="showCustomerCallbackLogs('${customer.id}', '${customer.managerId}')">
                                 查看回访记录
                             </div>
                         </c:if>
@@ -1087,7 +1099,8 @@
                         </div>
                         <div style="display: table-cell;vertical-align: middle">
                             <c:if test="${customer.hasCustomerProjects}">
-                                <div class="mangerOperate__record" onclick="showCustomerProjects('${customer.id}','${customer.managerId}')"
+                                <div class="mangerOperate__record"
+                                     onclick="showCustomerProjects('${customer.id}','${customer.managerId}')"
                                      style="position: relative;">
                                     约看记录
                                     <c:if test="${customer.hasNewCustomerProjects}">
@@ -1653,6 +1666,8 @@
         $("#search_EQ_createSource").trigger('chosen:updated');
         $("#search_EQ_activeId").val("");
         $("#search_EQ_activeId").trigger('chosen:updated');
+        $("#search_EQ_createrId").val("");
+        $("#search_EQ_createrId").trigger('chosen:updated');
         // 重置回访状态下拉框
         $("#search_EQ_isBack").val("1");
         $("#search_EQ_isBack").trigger('chosen:updated');
@@ -1699,6 +1714,7 @@
     }
 
     var customerIdList = [];
+
     function addCustomerLabel() {
         var haslabel = "${haslabel}";
         if (haslabel != 1) {
@@ -1869,6 +1885,7 @@
 
     //全选
     var checkNum = 0;
+
     function checkAll(btn) {
         if (btn.checked) {
             for (var i = 0; i < document.getElementsByName('memberCheck').length; i++) {
@@ -2124,6 +2141,7 @@
 
     var curnet = "${sessionUser.cornet}";
     var initopen = 0;
+
     function callCustomer(memPhone, markedLabelId, managerId, customerId, buyIntention, abandon, isPeer, star) {
         //先将bat2样式清楚
         $(".bat2").removeAttr("style");
@@ -2253,6 +2271,7 @@
     var arr = new Array();
     var arr2 = new Array();
     var callId;
+
     function addCallBack(_customerId, _phone, _buyIntention, isPeer, markedLabelId, star) {
         $("#myModal").hide();
         $("#labelModel").hide();
@@ -2855,6 +2874,7 @@
         obj.innerHTML = content;
         console.info(obj)
     }
+
     function setCallbackContent2(template) {
         var content = $(template).text();
         var obj = document.getElementById("cusinfo");
@@ -3130,10 +3150,10 @@
     </div>
 </div>
 <script>
-    $(function(){
+    $(function () {
         setTimeout(function () {
             $(".pace").hide()
-        },1000)
+        }, 1000)
     })
 
 </script>

house365-hgs-ws/src/main/resources/development/mybatis/CustomerMergeMapper.xml

@@ -434,6 +434,9 @@
             AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0
             AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0
         </if>
+        <if test="createrId != null and createrId != '' ">
+            AND c.creater =#{createrId}
+        </if>
         <if test="orderBy != null and orderBy != '' ">
             order by ${orderBy}
         </if>
@@ -684,6 +687,9 @@
             AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0
             AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0
         </if>
+        <if test="createrId != null and createrId != '' ">
+            AND c.creater =#{createrId}
+        </if>
     </select>
 
 

house365-hgs-ws/src/main/resources/production/mybatis/CustomerMergeMapper.xml

@@ -333,7 +333,6 @@
                     or (customTimeTypeFive != null and customTimeTypeFive != '') or (customTimeTypeSix != null and customTimeTypeSix != '')">
             and t5.phone is not null
         </if>
-
         <if test="cityCode != null and cityCode != '' ">
             AND c.cityCode = #{cityCode}
         </if>
@@ -376,10 +375,6 @@
         <if test="bindTimeEnd != null and bindTimeEnd != '' ">
             AND c.bind_time &lt;=#{bindTimeEnd}
         </if>
-        <!--<if test="customerSourceType2 != null and customerSourceType2 != '' ">-->
-        <!--AND c.customer_source_type =#{customerSourceType2}-->
-        <!--</if>-->
-
         <if test="isNotBackFour != null and isNotBackFour != '' ">
             and datediff( CURRENT_DATE, c.last_call_time ) &gt;= 3
             AND datediff( CURRENT_DATE, c.last_call_time ) &lt;= 7
@@ -401,14 +396,12 @@
             AND c.last_call_time &gt;=#{customTimeStart}
             AND c.last_call_time &lt;=#{customTimeEnd}
         </if>
-
         <if test="isStar != null and isStar != '' ">
             AND c.starCustomer =1
         </if>
         <if test="isNotStar != null and isNotStar != '' ">
             AND c.starCustomer =0
         </if>
-
         <if test="starCustomer != null and starCustomer != '' ">
             AND c.starCustomer =#{starCustomer}
         </if>
@@ -419,7 +412,6 @@
         <if test="isActive != null and isActive != '' ">
             AND c.is_active = 1
         </if>
-
         <if test="isRecycled != null and isRecycled != '' ">
             AND c.isRecycled =#{isRecycled}
         </if>
@@ -438,15 +430,16 @@
         <if test='tabType =="2"'>
             and c.trace_status = 1
         </if>
-
         <if test='tabType =="0"'>
             AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0
             AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0
         </if>
+        <if test="createrId != null and createrId != '' ">
+            AND c.creater =#{createrId}
+        </if>
         <if test="orderBy != null and orderBy != '' ">
             order by ${orderBy}
         </if>
-
         limit #{PageNumber}, #{pageSize};
     </select>
 
@@ -694,8 +687,13 @@
             AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0
             AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0
         </if>
+        <if test="createrId != null and createrId != '' ">
+            AND c.creater =#{createrId}
+        </if>
     </select>
 
+
+
     <insert id="saveCustomerMerge" parameterType="com.house365.beans.entity.CustomerEntity">
           insert into   customer_merge
                 (id,name,phone,bak_phone1,bak_phone2,
@@ -737,7 +735,6 @@
         WHERE id = #{id}
     </update>
 
-
     <update id="updateCustomerMerge2" parameterType="com.house365.beans.entity.CustomerEntity">
         UPDATE customer_merge
         SET