Commit 457414c9 authored by gaoyuan's avatar gaoyuan

4.9.3需求

parent 61072c2d
...@@ -3132,13 +3132,13 @@ public class CustomerController extends BaseController { ...@@ -3132,13 +3132,13 @@ public class CustomerController extends BaseController {
House365RestResponse restResponse = new House365RestResponse(); House365RestResponse restResponse = new House365RestResponse();
restResponse.setResult("1"); restResponse.setResult("1");
UserEntity userEntity = (UserEntity) request.getSession().getAttribute(SessionConstants.THREAD_USER_KEY); 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 userIds = request.getParameter("userIds");
String customerIds = request.getParameter("customerIds") == null ? "" : request.getParameter("customerIds"); String customerIds = request.getParameter("customerIds") == null ? "" : request.getParameter("customerIds");
String[] customerIdArray = customerIds.split(","); String[] customerIdArray = customerIds.split(",");
String[] userIdArray = userIds.split(","); String[] userIdArray = userIds.split(",");
try { try {
customer.batchTransferCreator(customerIdArray,userIdArray,userEntity,11);
restResponse.setMsg(customerIdArray.length + "组数据已经转移创建人完成");
} catch (Exception e) { } catch (Exception e) {
restResponse.setResult("0"); restResponse.setResult("0");
restResponse.setMsg(e.getMessage()); restResponse.setMsg(e.getMessage());
......
...@@ -98,6 +98,14 @@ public class UserUtil { ...@@ -98,6 +98,14 @@ public class UserUtil {
showWord = showWord + showUser.getRealName(); showWord = showWord + showUser.getRealName();
} }
logShowList.add(showWord); 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) { // else if (p.getType() == 10) {
// //项目转移 // //项目转移
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
$('#custom-headers').multiSelect('deselect_all'); $('#custom-headers').multiSelect('deselect_all');
} }
$(document).ready(function () { $(document).ready(function () {
$('#custom-headers').multiSelect({ var sh=$('#custom-headers').multiSelect({
selectableHeader: "<input type='text' class='search-input span3' autocomplete='off' placeholder='请输入'>", selectableHeader: "<input type='text' class='search-input span3' autocomplete='off' placeholder='请输入'>",
selectionHeader: "<div class='search-input span3' style='height:50px;'>&nbsp;</div>", selectionHeader: "<div class='search-input span3' style='height:50px;'>&nbsp;</div>",
selectableFooter: "", selectableFooter: "",
...@@ -68,23 +68,6 @@ ...@@ -68,23 +68,6 @@
if ($(this).val() == values) { if ($(this).val() == values) {
select_text = $(this).text(); select_text = $(this).text();
$(this).attr("selected", "selected"); $(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();
} }
}); });
}, },
......
...@@ -432,9 +432,9 @@ ...@@ -432,9 +432,9 @@
</option> </option>
</select> </select>
<%-- 平台人:<input style="width: 8rem;border: 1px solid #d5d5d5;" type="text" id="search_LIKE_createrName"--%> 平台人:<input style="width: 8rem;border: 1px solid #d5d5d5;" type="text" id="search_LIKE_createrName"
<%-- name="search_LIKE_createrName" value="${param['search_LIKE_createrName']}"--%> name="search_LIKE_createrName" value="${param['search_LIKE_createrName']}"
<%-- class="m-wrap small" placeholder="请输入添加人姓名">&nbsp;--%> class="m-wrap small" placeholder="请输入添加人姓名">&nbsp;
<div style="float: right"> <div style="float: right">
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
onclick="$('#filterForm').submit();">搜索 onclick="$('#filterForm').submit();">搜索
...@@ -956,7 +956,7 @@ ...@@ -956,7 +956,7 @@
alert("分派人员不可为空!"); alert("分派人员不可为空!");
return false; return false;
} }
debugger;
$("#custom-headers").find("option:selected").each(function () { $("#custom-headers").find("option:selected").each(function () {
userIds = userIds + $(this).val() + ","; userIds = userIds + $(this).val() + ",";
}); });
...@@ -970,8 +970,7 @@ ...@@ -970,8 +970,7 @@
url: '/house365-hgs-web/customer/batchTransferCreator', url: '/house365-hgs-web/customer/batchTransferCreator',
data: { data: {
"userIds": userIds, "userIds": userIds,
"customerIds": customerIds, "customerIds": customerIds
"type": 'transferCreator'
}, },
type: "GET", type: "GET",
success: function (data) { success: function (data) {
......
...@@ -270,4 +270,5 @@ public interface ICustomer extends IService { ...@@ -270,4 +270,5 @@ public interface ICustomer extends IService {
HResult deleteIdList(List<Integer> idList, int userId, String userName); HResult deleteIdList(List<Integer> idList, int userId, String userName);
void batchTransferCreator(String[] customerIds, String[] userIds, UserEntity userEntity, int type) throws Exception;
} }
...@@ -95,4 +95,6 @@ public interface CustomerMapper { ...@@ -95,4 +95,6 @@ public interface CustomerMapper {
int updateIdList(List<Integer> idList); int updateIdList(List<Integer> idList);
void updatePtCustomerStar(Map<String, Object> map); void updatePtCustomerStar(Map<String, Object> map);
void updatePtCustomerCreater(Map<String, Object> map);
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1602,6 +1602,11 @@ ...@@ -1602,6 +1602,11 @@
AND c.phone = t.phone) AND c.phone = t.phone)
]]> ]]>
</isNotEmpty> </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> </isNotNull>
</dynamic> </dynamic>
</sql> </sql>
......
...@@ -727,6 +727,13 @@ ...@@ -727,6 +727,13 @@
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<update id="updatePtCustomerCreater" parameterType="map">
UPDATE customer
SET
creater = #{creater}
WHERE id = #{customerId}
</update>
<select id="queryForAddHot" resultMap="infoMap" parameterType="map"> <select id="queryForAddHot" resultMap="infoMap" parameterType="map">
SELECT id,phone FROM ( SELECT id,phone FROM (
SELECT SELECT
......
...@@ -1602,6 +1602,11 @@ ...@@ -1602,6 +1602,11 @@
AND c.phone = t.phone) AND c.phone = t.phone)
]]> ]]>
</isNotEmpty> </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> </isNotNull>
</dynamic> </dynamic>
</sql> </sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment