Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
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
haoban3.0
haoban-manage3.0
Commits
cd4065f6
Commit
cd4065f6
authored
Dec 26, 2022
by
徐高华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
like查询
parent
c0177124
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
64 additions
and
10 deletions
+64
-10
GroupChatPlanSearchQDTO.java
...ban/manage/api/dto/qdto/chat/GroupChatPlanSearchQDTO.java
+9
-0
GroupChatSearchQDTO.java
.../haoban/manage/api/dto/qdto/chat/GroupChatSearchQDTO.java
+9
-0
GroupChatUserSearchQDTO.java
...ban/manage/api/dto/qdto/chat/GroupChatUserSearchQDTO.java
+7
-0
GroupChatHmServiceImpl.java
...age/service/service/chat/impl/GroupChatHmServiceImpl.java
+4
-3
GroupChatPlanServiceImpl.java
...e/service/service/chat/impl/GroupChatPlanServiceImpl.java
+13
-0
GroupChatServiceImpl.java
...anage/service/service/chat/impl/GroupChatServiceImpl.java
+9
-0
GroupChatUserServiceImpl.java
...e/service/service/chat/impl/GroupChatUserServiceImpl.java
+7
-1
GroupChatMapper.xml
...ervice/src/main/resources/mapper/chat/GroupChatMapper.xml
+1
-1
GroupChatOwnerMapper.xml
...e/src/main/resources/mapper/chat/GroupChatOwnerMapper.xml
+1
-1
GroupChatPlanLogMapper.xml
...src/main/resources/mapper/chat/GroupChatPlanLogMapper.xml
+2
-2
GroupChatPlanMapper.xml
...ce/src/main/resources/mapper/chat/GroupChatPlanMapper.xml
+1
-1
GroupChatUserMapper.xml
...ce/src/main/resources/mapper/chat/GroupChatUserMapper.xml
+1
-1
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatPlanSearchQDTO.java
View file @
cd4065f6
...
@@ -26,6 +26,15 @@ public class GroupChatPlanSearchQDTO implements Serializable {
...
@@ -26,6 +26,15 @@ public class GroupChatPlanSearchQDTO implements Serializable {
private
String
storeId
;
private
String
storeId
;
private
Long
ownLogId
;
private
Long
ownLogId
;
private
List
<
String
>
creatorIdList
;
private
List
<
String
>
creatorIdList
;
private
String
wxChatId
;
public
String
getWxChatId
()
{
return
wxChatId
;
}
public
void
setWxChatId
(
String
wxChatId
)
{
this
.
wxChatId
=
wxChatId
;
}
public
List
<
String
>
getCreatorIdList
()
{
public
List
<
String
>
getCreatorIdList
()
{
return
creatorIdList
;
return
creatorIdList
;
...
...
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatSearchQDTO.java
View file @
cd4065f6
...
@@ -35,6 +35,15 @@ public class GroupChatSearchQDTO extends PageQo implements Serializable {
...
@@ -35,6 +35,15 @@ public class GroupChatSearchQDTO extends PageQo implements Serializable {
private
List
<
String
>
departmentIdList
;
private
List
<
String
>
departmentIdList
;
// 筛选激活或者开启联系我的群主
// 筛选激活或者开启联系我的群主
private
Integer
canUseFlag
;
private
Integer
canUseFlag
;
private
String
wxChatId
;
public
String
getWxChatId
()
{
return
wxChatId
;
}
public
void
setWxChatId
(
String
wxChatId
)
{
this
.
wxChatId
=
wxChatId
;
}
public
int
getIncludeOff
()
{
public
int
getIncludeOff
()
{
return
includeOff
;
return
includeOff
;
...
...
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatUserSearchQDTO.java
View file @
cd4065f6
...
@@ -16,6 +16,13 @@ public class GroupChatUserSearchQDTO implements Serializable {
...
@@ -16,6 +16,13 @@ public class GroupChatUserSearchQDTO implements Serializable {
private
String
searchParams
;
private
String
searchParams
;
// 群状态 1有效2已退群
// 群状态 1有效2已退群
private
Integer
status
=
1
;
private
Integer
status
=
1
;
private
String
wxChatId
;
public
String
getWxChatId
()
{
return
wxChatId
;
}
public
void
setWxChatId
(
String
wxChatId
)
{
this
.
wxChatId
=
wxChatId
;
}
public
Date
getStartDate
()
{
public
Date
getStartDate
()
{
return
startDate
;
return
startDate
;
}
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatHmServiceImpl.java
View file @
cd4065f6
...
@@ -83,9 +83,10 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
...
@@ -83,9 +83,10 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
public
Page
<
GroupChatHmBO
>
listPage
(
ChatHmSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
public
Page
<
GroupChatHmBO
>
listPage
(
ChatHmSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
String
wxEnterpriseId
=
qdto
.
getWxEnterpriseId
();
String
wxEnterpriseId
=
qdto
.
getWxEnterpriseId
();
String
enterpriseId
=
qdto
.
getEnterpriseId
();
String
enterpriseId
=
qdto
.
getEnterpriseId
();
if
(
StringUtils
.
isNotBlank
(
qdto
.
getSearchParams
()))
{
if
(
StringUtils
.
isNotBlank
(
qdto
.
getSearchParams
()))
{
qdto
.
setSearchParams
(
"%"
+
qdto
.
getSearchParams
()+
"%"
);
String
params
=
qdto
.
getSearchParams
();
qdto
.
setSearchParamsCode
(
qdto
.
getSearchParams
()+
"%"
);
qdto
.
setSearchParamsCode
(
params
+
"%"
);
qdto
.
setSearchParams
(
"%"
+
params
+
"%"
);
}
}
Long
linkId
=
qdto
.
getLinkId
();
Long
linkId
=
qdto
.
getLinkId
();
if
(
null
!=
linkId
)
{
if
(
null
!=
linkId
)
{
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java
View file @
cd4065f6
...
@@ -179,6 +179,10 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
...
@@ -179,6 +179,10 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
@Override
@Override
public
Page
<
GroupChatPlanBO
>
listPage
(
GroupChatPlanSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
public
Page
<
GroupChatPlanBO
>
listPage
(
GroupChatPlanSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
if
(
StringUtils
.
isNotBlank
(
qdto
.
getSearchParams
()))
{
String
params
=
qdto
.
getSearchParams
();
qdto
.
setSearchParams
(
"%"
+
params
+
"%"
);
}
PageHelper
.
startPage
(
basePageInfo
);
PageHelper
.
startPage
(
basePageInfo
);
List
<
TabGroupChatPlan
>
list
=
this
.
groupChatPlanMapper
.
list
(
qdto
);
List
<
TabGroupChatPlan
>
list
=
this
.
groupChatPlanMapper
.
list
(
qdto
);
Page
<
GroupChatPlanBO
>
retPage
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
list
,
GroupChatPlanBO
.
class
);
Page
<
GroupChatPlanBO
>
retPage
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
list
,
GroupChatPlanBO
.
class
);
...
@@ -389,6 +393,15 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
...
@@ -389,6 +393,15 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
@Override
@Override
public
Page
<
GroupChatPlanLogDTO
>
listLogPage
(
GroupChatPlanSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
public
Page
<
GroupChatPlanLogDTO
>
listLogPage
(
GroupChatPlanSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
PageHelper
.
startPage
(
basePageInfo
);
PageHelper
.
startPage
(
basePageInfo
);
if
(
StringUtils
.
isNotBlank
(
qdto
.
getSearchParams
()))
{
String
params
=
qdto
.
getSearchParams
();
qdto
.
setSearchParams
(
"%"
+
params
+
"%"
);
}
if
(
StringUtils
.
isNotBlank
(
qdto
.
getChatName
()))
{
String
params
=
qdto
.
getChatName
();
qdto
.
setChatName
(
"%"
+
params
+
"%"
);
qdto
.
setWxChatId
(
params
+
"%"
);
}
List
<
GroupChatPlanLogDTO
>
list
=
this
.
groupChatPlanLogMapper
.
listPlanLog
(
qdto
);
List
<
GroupChatPlanLogDTO
>
list
=
this
.
groupChatPlanLogMapper
.
listPlanLog
(
qdto
);
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
Set
<
String
>
clerkIdList
=
list
.
stream
().
filter
(
dto
->
StringUtils
.
isNotBlank
(
dto
.
getClerkId
()))
Set
<
String
>
clerkIdList
=
list
.
stream
().
filter
(
dto
->
StringUtils
.
isNotBlank
(
dto
.
getClerkId
()))
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java
View file @
cd4065f6
...
@@ -261,6 +261,11 @@ public class GroupChatServiceImpl implements GroupChatService {
...
@@ -261,6 +261,11 @@ public class GroupChatServiceImpl implements GroupChatService {
}
}
qdto
.
setDepartmentIdList
(
this
.
setDepartIdList
(
qdto
.
getWxEnterpriseId
(),
qdto
.
getDepartmentId
()));
qdto
.
setDepartmentIdList
(
this
.
setDepartIdList
(
qdto
.
getWxEnterpriseId
(),
qdto
.
getDepartmentId
()));
PageHelper
.
startPage
(
basePageInfo
);
PageHelper
.
startPage
(
basePageInfo
);
if
(
StringUtils
.
isNotBlank
(
qdto
.
getSearchParams
()))
{
String
params
=
qdto
.
getSearchParams
();
qdto
.
setWxChatId
(
params
+
"%"
);
qdto
.
setSearchParams
(
"%"
+
params
+
"%"
);
}
List
<
GroupChatDTO
>
list
=
this
.
groupChatMapper
.
list
(
qdto
);
List
<
GroupChatDTO
>
list
=
this
.
groupChatMapper
.
list
(
qdto
);
Page
<
GroupChatDTO
>
retPage
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
list
,
GroupChatDTO
.
class
);
Page
<
GroupChatDTO
>
retPage
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
list
,
GroupChatDTO
.
class
);
return
retPage
;
return
retPage
;
...
@@ -952,6 +957,10 @@ public class GroupChatServiceImpl implements GroupChatService {
...
@@ -952,6 +957,10 @@ public class GroupChatServiceImpl implements GroupChatService {
@Override
@Override
public
Page
<
GroupChatOwnerDTO
>
listOwnerPage
(
OwnerSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
public
Page
<
GroupChatOwnerDTO
>
listOwnerPage
(
OwnerSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
if
(
StringUtils
.
isNotBlank
(
qdto
.
getSearchParams
()))
{
String
params
=
qdto
.
getSearchParams
();
qdto
.
setSearchParams
(
"%"
+
params
+
"%"
);
}
qdto
.
setDepartmentIdList
(
this
.
setDepartIdList
(
qdto
.
getWxEnterpriseId
(),
qdto
.
getDepartmentId
()));
qdto
.
setDepartmentIdList
(
this
.
setDepartIdList
(
qdto
.
getWxEnterpriseId
(),
qdto
.
getDepartmentId
()));
PageHelper
.
startPage
(
basePageInfo
);
PageHelper
.
startPage
(
basePageInfo
);
List
<
GroupChatOwnerDTO
>
list
=
this
.
groupChatOwnerMapper
.
listOwner
(
qdto
);
List
<
GroupChatOwnerDTO
>
list
=
this
.
groupChatOwnerMapper
.
listOwner
(
qdto
);
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatUserServiceImpl.java
View file @
cd4065f6
...
@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.chat.impl;
...
@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.chat.impl;
import
java.util.List
;
import
java.util.List
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -18,11 +19,16 @@ import com.github.pagehelper.PageHelper;
...
@@ -18,11 +19,16 @@ import com.github.pagehelper.PageHelper;
public
class
GroupChatUserServiceImpl
implements
GroupChatUserService
{
public
class
GroupChatUserServiceImpl
implements
GroupChatUserService
{
@Autowired
@Autowired
private
GroupChatUserMapper
groupChatUserMapper
;
private
GroupChatUserMapper
groupChatUserMapper
;
@Override
@Override
public
Page
<
GroupChatUserDTO
>
listPage
(
GroupChatUserSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
public
Page
<
GroupChatUserDTO
>
listPage
(
GroupChatUserSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
PageHelper
.
startPage
(
basePageInfo
);
PageHelper
.
startPage
(
basePageInfo
);
if
(
StringUtils
.
isNotBlank
(
qdto
.
getSearchParams
()))
{
String
params
=
qdto
.
getSearchParams
();
qdto
.
setWxChatId
(
params
+
"%"
);
qdto
.
setSearchParams
(
"%"
+
params
+
"%"
);
}
List
<
GroupChatUserDTO
>
list
=
this
.
groupChatUserMapper
.
listPage
(
qdto
);
List
<
GroupChatUserDTO
>
list
=
this
.
groupChatUserMapper
.
listPage
(
qdto
);
Page
<
GroupChatUserDTO
>
retPage
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
list
,
GroupChatUserDTO
.
class
);
Page
<
GroupChatUserDTO
>
retPage
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
list
,
GroupChatUserDTO
.
class
);
return
retPage
;
return
retPage
;
...
...
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatMapper.xml
View file @
cd4065f6
...
@@ -285,7 +285,7 @@
...
@@ -285,7 +285,7 @@
and a.hm_add_status = #{hmAddStatus}
and a.hm_add_status = #{hmAddStatus}
</if>
</if>
<if
test=
"null != searchParams and ''!=searchParams "
>
<if
test=
"null != searchParams and ''!=searchParams "
>
and (a.name like
'%${searchParams}%' or a.wx_chat_id like '${searchParams}%'
)
and (a.name like
#{searchParams} or a.wx_chat_id like #{wxChatId}
)
</if>
</if>
<if
test=
"null != staffIdList and staffIdList.size>0"
>
<if
test=
"null != staffIdList and staffIdList.size>0"
>
and a.staff_id in
and a.staff_id in
...
...
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatOwnerMapper.xml
View file @
cd4065f6
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
</foreach>
</foreach>
</if>
</if>
<if
test=
"null != searchParams and ''!=searchParams "
>
<if
test=
"null != searchParams and ''!=searchParams "
>
and b.staff_name like
'%${searchParams}%'
and b.staff_name like
#{searchParams}
</if>
</if>
<if
test=
"status==1"
>
<if
test=
"status==1"
>
and b.status_flag = 1
and b.status_flag = 1
...
...
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanLogMapper.xml
View file @
cd4065f6
...
@@ -90,10 +90,10 @@
...
@@ -90,10 +90,10 @@
and a.own_log_id = #{ownLogId}
and a.own_log_id = #{ownLogId}
</if>
</if>
<if
test=
"null != searchParams and ''!=searchParams"
>
<if
test=
"null != searchParams and ''!=searchParams"
>
and c.staff_name like
'%${searchParams}%'
and c.staff_name like
#{searchParams}
</if>
</if>
<if
test=
"null !=chatName and '' !=chatName"
>
<if
test=
"null !=chatName and '' !=chatName"
>
and (d.name like
'%${chatName}%' or d.wx_chat_id like '%${chatName}%')
and (d.name like
#{chatName} or d.wx_chat_id like #{wxChatId}
</if>
</if>
<if
test=
"null !=sendStatus"
>
<if
test=
"null !=sendStatus"
>
and a.send_status = #{sendStatus}
and a.send_status = #{sendStatus}
...
...
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanMapper.xml
View file @
cd4065f6
...
@@ -182,7 +182,7 @@
...
@@ -182,7 +182,7 @@
and end_time
<![CDATA[<]]>
now()
and end_time
<![CDATA[<]]>
now()
</if>
</if>
<if
test=
"null != searchParams and '' != searchParams"
>
<if
test=
"null != searchParams and '' != searchParams"
>
and name like
'%${searchParams}%'
and name like
#{searchParams}
</if>
</if>
<if
test=
"null !=creatorIdList and creatorIdList.size>0"
>
<if
test=
"null !=creatorIdList and creatorIdList.size>0"
>
and creator_id in
and creator_id in
...
...
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatUserMapper.xml
View file @
cd4065f6
...
@@ -267,7 +267,7 @@
...
@@ -267,7 +267,7 @@
and a.user_quit_time
<![CDATA[>=]]>
#{startDate} and a.user_quit_time
<![CDATA[<=]]>
#{endDate}
and a.user_quit_time
<![CDATA[>=]]>
#{startDate} and a.user_quit_time
<![CDATA[<=]]>
#{endDate}
</if>
</if>
<if
test=
"null != searchParams and '' != searchParams"
>
<if
test=
"null != searchParams and '' != searchParams"
>
and (b.name like
'%${searchParams}%' or c.staff_name like '%${searchParams}%' or b.wx_chat_id like '${searchParams}%'
)
and (b.name like
#{searchParams} or c.staff_name like #{searchParams} or b.wx_chat_id like #{wxChatId}
)
</if>
</if>
</if>
</if>
<if
test=
"null != userType"
>
<if
test=
"null != userType"
>
...
...
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