Merge remote-tracking branch 'origin/master'

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

@@ -3132,13 +3132,13 @@ public class CustomerController extends BaseController {
         House365RestResponse restResponse = new House365RestResponse();
         restResponse.setResult("1");
         UserEntity userEntity = (UserEntity) request.getSession().getAttribute(SessionConstants.THREAD_USER_KEY);
-        String type = request.getParameter("type") == null ? "" : request.getParameter("type");
         String userIds = request.getParameter("userIds");
         String customerIds = request.getParameter("customerIds") == null ? "" : request.getParameter("customerIds");
         String[] customerIdArray = customerIds.split(",");
         String[] userIdArray = userIds.split(",");
         try {
-
+            customer.batchTransferCreator(customerIdArray,userIdArray,userEntity,11);
+            restResponse.setMsg(customerIdArray.length + "组数据已经转移创建人完成");
         } catch (Exception e) {
             restResponse.setResult("0");
             restResponse.setMsg(e.getMessage());

house365-hgs-web/src/main/java/com/house365/web/util/UserUtil.java

@@ -98,6 +98,14 @@ public class UserUtil {
                         showWord = showWord + showUser.getRealName();
                     }
                     logShowList.add(showWord);
+                }else if(p.getType() == 11){
+                    //平台客户管理转移创建人
+                    String showWord = showTime + "  " + p.getCreateUserName() + " [转移线索]" + "给 ";
+                    UserEntity showUser = iuser.getById(Integer.valueOf(p.getNewValue()));
+                    if (null != showUser) {
+                        showWord = showWord + showUser.getRealName();
+                    }
+                    logShowList.add(showWord);
                 }
 //                else if (p.getType() == 10) {
 //                    //项目转移

house365-hgs-web/src/main/webapp/WEB-INF/views/customer/pages/transferCreator.jsp

@@ -21,7 +21,7 @@
         $('#custom-headers').multiSelect('deselect_all');
     }
     $(document).ready(function () {
-        $('#custom-headers').multiSelect({
+        var sh=$('#custom-headers').multiSelect({
             selectableHeader: "<input type='text' class='search-input span3' autocomplete='off' placeholder='请输入'>",
             selectionHeader: "<div class='search-input span3' style='height:50px;'>&nbsp;</div>",
             selectableFooter: "",
@@ -68,23 +68,6 @@
                     if ($(this).val() == values) {
                         select_text = $(this).text();
                         $(this).attr("selected", "selected");
-                    }else{
-                        $(this).removeAttr("selected");
-                    }
-                });
-
-                $(".ms-selectable span").each(function () {
-                    if($(this).text() == select_text){
-                        $(this).parent("li").hide();
-                    }else{
-                        $(this).parent("li").show();
-                    }
-                });
-                $(".ms-selection span").each(function () {
-                    if($(this).text() != select_text){
-                        $(this).parent("li").hide();
-                    }else{
-                        $(this).parent("li").show();
                     }
                 });
             },

house365-hgs-web/src/main/webapp/WEB-INF/views/platformmanagement/pages/myPlatformCustomer.jsp

@@ -432,9 +432,9 @@
                 否
             </option>
           </select>
-<%--            平台人：<input style="width: 8rem;border: 1px solid #d5d5d5;" type="text" id="search_LIKE_createrName"--%>
-<%--                        name="search_LIKE_createrName" value="${param['search_LIKE_createrName']}"--%>
-<%--                        class="m-wrap small" placeholder="请输入添加人姓名">&nbsp;--%>
+            平台人：<input style="width: 8rem;border: 1px solid #d5d5d5;" type="text" id="search_LIKE_createrName"
+                        name="search_LIKE_createrName" value="${param['search_LIKE_createrName']}"
+                        class="m-wrap small" placeholder="请输入添加人姓名">&nbsp;
             <div style="float: right">
                 <button type="button" class="btn btn-default"
                         onclick="$('#filterForm').submit();">搜索
@@ -956,7 +956,7 @@
                 alert("分派人员不可为空!");
                 return false;
             }
-
+            debugger;
             $("#custom-headers").find("option:selected").each(function () {
                 userIds = userIds + $(this).val() + ",";
             });
@@ -970,8 +970,7 @@
                 url: '/house365-hgs-web/customer/batchTransferCreator',
                 data: {
                     "userIds": userIds,
-                    "customerIds": customerIds,
-                    "type": 'transferCreator'
+                    "customerIds": customerIds
                 },
                 type: "GET",
                 success: function (data) {

house365-hgs-ws-interfaces/src/main/java/com/house365/ws/interfaces/server/ICustomer.java

@@ -270,4 +270,5 @@ public interface ICustomer extends IService {
 
     HResult deleteIdList(List<Integer> idList, int userId, String userName);
 
+    void batchTransferCreator(String[] customerIds, String[] userIds, UserEntity userEntity, int type) throws Exception;
 }

house365-hgs-ws/src/main/java/com/house365/ws/dao/mapper/CustomerMapper.java

@@ -95,4 +95,6 @@ public interface CustomerMapper {
     int updateIdList(List<Integer> idList);
 
     void updatePtCustomerStar(Map<String, Object> map);
+
+    void updatePtCustomerCreater(Map<String, Object> map);
 }

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

@@ -1602,6 +1602,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>
@@ -1698,6 +1703,7 @@
 
         ) bindTime
         FROM customer c
+        <include refid="customer.queryManagementPage"/>
         group by c.manager_id, c.phone
         <isNotEmpty prepend="ORDER BY" property="searchFilters.orderBy">
             <![CDATA[

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

@@ -727,6 +727,13 @@
         WHERE id = #{id}
     </update>
 
+    <update id="updatePtCustomerCreater" parameterType="map">
+        UPDATE customer
+        SET
+        creater = #{creater}
+        WHERE id = #{customerId}
+    </update>
+
     <select id="queryForAddHot" resultMap="infoMap" parameterType="map">
         SELECT id,phone FROM (
         SELECT

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

@@ -1602,6 +1602,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>
@@ -1698,6 +1703,7 @@
 
         ) bindTime
         FROM customer c
+        <include refid="customer.queryManagementPage"/>
         group by c.manager_id, c.phone
         <isNotEmpty prepend="ORDER BY" property="searchFilters.orderBy">
             <![CDATA[