Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
H
Hgs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
徐州
Hgs
Commits
772a9c84
Commit
772a9c84
authored
Jun 01, 2021
by
gaoyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
4.9.3需求---平台创建人搜索
parent
457414c9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
5 deletions
+37
-5
CustomerManagementController.java
...house365/web/controller/CustomerManagementController.java
+6
-0
myCustomerNew.jsp
.../WEB-INF/views/customermanagement/pages/myCustomerNew.jsp
+25
-5
CustomerMergeMapper.xml
...ain/resources/development/mybatis/CustomerMergeMapper.xml
+6
-0
CustomerMergeMapper.xml
...main/resources/production/mybatis/CustomerMergeMapper.xml
+0
-0
No files found.
house365-hgs-web/src/main/java/com/house365/web/controller/CustomerManagementController.java
View file @
772a9c84
...
...
@@ -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
View file @
772a9c84
...
...
@@ -216,13 +216,14 @@
}
/*.table td.mangerItem.mangerOperate {*/
/*width: 650px;*/
/*width: 650px;*/
/*}*/
.table
td
.mangerItem.mangerlist
{
overflow
:
hidden
;
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=
"活动名称"
>
<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
View file @
772a9c84
...
...
@@ -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
View file @
772a9c84
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment