Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
仟微科技
Link Wechat
提交
55d3c117
Link Wechat
项目概览
仟微科技
/
Link Wechat
通知
48
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Link Wechat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
55d3c117
编写于
6月 22, 2021
作者:
孙
孙喜旺
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
标签相关接口及方法修改,统一拦截批量新增方法
上级
d622ac7e
变更
25
隐藏空白更改
内联
并排
Showing
25 changed file
with
62 addition
and
74 deletion
+62
-74
linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeTagGroupController.java
...linkwechat/web/controller/wecom/WeTagGroupController.java
+2
-3
linkwe-ui/src/views/customerManage/tag.vue
linkwe-ui/src/views/customerManage/tag.vue
+3
-3
linkwe-wecom/src/main/java/com/linkwechat/wecom/aspectj/InsertAndUpdateAspect.java
...a/com/linkwechat/wecom/aspectj/InsertAndUpdateAspect.java
+5
-8
linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTagGroup.java
...src/main/java/com/linkwechat/wecom/domain/WeTagGroup.java
+1
-1
linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/tag/WeCropGroupTagDto.java
...om/linkwechat/wecom/domain/dto/tag/WeCropGroupTagDto.java
+1
-1
linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/tag/WeTagGroupVo.java
...java/com/linkwechat/wecom/domain/vo/tag/WeTagGroupVo.java
+1
-1
linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerMapper.java
...in/java/com/linkwechat/wecom/mapper/WeCustomerMapper.java
+1
-1
linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeFlowerCustomerRelMapper.java
...om/linkwechat/wecom/mapper/WeFlowerCustomerRelMapper.java
+2
-2
linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeFlowerCustomerTagRelMapper.java
...linkwechat/wecom/mapper/WeFlowerCustomerTagRelMapper.java
+1
-1
linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeTagGroupMapper.java
...in/java/com/linkwechat/wecom/mapper/WeTagGroupMapper.java
+1
-1
linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeTagMapper.java
...rc/main/java/com/linkwechat/wecom/mapper/WeTagMapper.java
+1
-1
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeFlowerCustomerRelService.java
...linkwechat/wecom/service/IWeFlowerCustomerRelService.java
+1
-1
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeFlowerCustomerTagRelService.java
...kwechat/wecom/service/IWeFlowerCustomerTagRelService.java
+1
-1
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeTagService.java
...main/java/com/linkwechat/wecom/service/IWeTagService.java
+1
-1
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCustomerServiceImpl.java
.../linkwechat/wecom/service/impl/WeCustomerServiceImpl.java
+6
-14
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeFlowerCustomerRelServiceImpl.java
...at/wecom/service/impl/WeFlowerCustomerRelServiceImpl.java
+2
-2
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeFlowerCustomerTagRelServiceImpl.java
...wecom/service/impl/WeFlowerCustomerTagRelServiceImpl.java
+2
-2
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeTagGroupServiceImpl.java
.../linkwechat/wecom/service/impl/WeTagGroupServiceImpl.java
+7
-7
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeTagServiceImpl.java
...a/com/linkwechat/wecom/service/impl/WeTagServiceImpl.java
+4
-4
linkwe-wecom/src/main/resources/mapper/wecom/WeCustomerMapper.xml
...ecom/src/main/resources/mapper/wecom/WeCustomerMapper.xml
+2
-2
linkwe-wecom/src/main/resources/mapper/wecom/WeFlowerCustomerRelMapper.xml
...main/resources/mapper/wecom/WeFlowerCustomerRelMapper.xml
+2
-2
linkwe-wecom/src/main/resources/mapper/wecom/WeFlowerCustomerTagRelMapper.xml
...n/resources/mapper/wecom/WeFlowerCustomerTagRelMapper.xml
+2
-2
linkwe-wecom/src/main/resources/mapper/wecom/WeTagGroupMapper.xml
...ecom/src/main/resources/mapper/wecom/WeTagGroupMapper.xml
+10
-9
linkwe-wecom/src/main/resources/mapper/wecom/WeTagMapper.xml
linkwe-wecom/src/main/resources/mapper/wecom/WeTagMapper.xml
+3
-2
linkwe-wecom/src/main/resources/mapper/wecom/WeUserMapper.xml
...we-wecom/src/main/resources/mapper/wecom/WeUserMapper.xml
+0
-2
未找到文件。
linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeTagGroupController.java
浏览文件 @
55d3c117
...
...
@@ -67,11 +67,10 @@ public class WeTagGroupController extends BaseController
{
//校验标签组名称与标签名称是否相同
if
(
StrUtil
.
isNotBlank
(
weTagGroup
.
getG
our
pName
())){
if
(
StrUtil
.
isNotBlank
(
weTagGroup
.
getG
rou
pName
())){
List
<
WeTag
>
weTags
=
weTagGroup
.
getWeTags
();
if
(
CollectionUtil
.
isNotEmpty
(
weTags
)){
if
(
weTags
.
stream
().
filter
(
m
->
m
.
getName
().
equals
(
weTagGroup
.
getGourpName
())).
findAny
().
isPresent
()){
if
(
weTags
.
stream
().
anyMatch
(
m
->
m
.
getName
().
equals
(
weTagGroup
.
getGroupName
()))){
return
AjaxResult
.
error
(
"标签组名称与标签名不可重复"
);
}
...
...
linkwe-ui/src/views/customerManage/tag.vue
浏览文件 @
55d3c117
...
...
@@ -16,7 +16,7 @@ export default {
dialogVisible
:
false
,
// 表单参数
form
:
{
g
our
pName
:
''
,
g
rou
pName
:
''
,
weTags
:
[],
},
// 添加标签输入框
...
...
@@ -25,7 +25,7 @@ export default {
newInputVisible
:
false
,
// 表单验证规则
rules
:
Object
.
freeze
({
g
our
pName
:
[{
required
:
true
,
message
:
'
必填项
'
,
trigger
:
'
blur
'
}],
g
rou
pName
:
[{
required
:
true
,
message
:
'
必填项
'
,
trigger
:
'
blur
'
}],
}),
// 选中数组
ids
:
[],
...
...
@@ -135,7 +135,7 @@ export default {
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"标签组"
align=
"center"
prop=
"g
our
pName"
/>
<el-table-column
label=
"标签组"
align=
"center"
prop=
"g
rou
pName"
/>
<el-table-column
label=
"标签"
align=
"center"
prop=
"weTags"
>
<template
slot-scope=
"scope"
>
<el-tag
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/aspectj/InsertAndUpdateAspect.java
浏览文件 @
55d3c117
...
...
@@ -8,6 +8,7 @@ import org.aspectj.lang.annotation.Aspect;
import
org.aspectj.lang.annotation.Before
;
import
org.aspectj.lang.annotation.Pointcut
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.core.annotation.Order
;
import
java.util.Collection
;
import
java.util.Date
;
...
...
@@ -21,11 +22,11 @@ import java.util.Iterator;
public
class
InsertAndUpdateAspect
{
@Pointcut
(
"execution(
public
* com.linkwechat.wecom.mapper.*Mapper.insert*(..)))"
)
@Pointcut
(
"execution( * com.linkwechat.wecom.mapper.*Mapper.insert*(..)))"
)
public
void
executeInsert
()
{
}
@Pointcut
(
"execution(
public
* com.linkwechat.wecom.mapper.*Mapper.update*(..)))"
)
@Pointcut
(
"execution( * com.linkwechat.wecom.mapper.*Mapper.update*(..)))"
)
public
void
executeUpdate
()
{
}
...
...
@@ -38,9 +39,7 @@ public class InsertAndUpdateAspect {
Object
arg
=
args
[
i
];
if
(
arg
instanceof
Collection
){
Collection
collection
=
(
Collection
)
arg
;
Iterator
iterator
=
collection
.
iterator
();
if
(
iterator
.
hasNext
()){
Object
next
=
iterator
.
next
();
for
(
Object
next
:
collection
)
{
isInsertBaseEntity
(
next
);
}
}
...
...
@@ -74,9 +73,7 @@ public class InsertAndUpdateAspect {
Object
arg
=
args
[
i
];
if
(
arg
instanceof
Collection
){
Collection
collection
=
(
Collection
)
arg
;
Iterator
iterator
=
collection
.
iterator
();
if
(
iterator
.
hasNext
()){
Object
next
=
iterator
.
next
();
for
(
Object
next
:
collection
)
{
if
(
next
instanceof
BaseEntity
)
{
BaseEntity
next1
=
(
BaseEntity
)
next
;
next1
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTagGroup.java
浏览文件 @
55d3c117
...
...
@@ -49,7 +49,7 @@ public class WeTagGroup extends BaseEntity
@ApiModelProperty
(
value
=
"分组名称"
)
@TableField
(
"group_name"
)
private
String
g
our
pName
;
private
String
g
rou
pName
;
@ApiModelProperty
(
value
=
"状态(0正常 1删除)"
)
@TableField
(
"del_flag"
)
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/tag/WeCropGroupTagDto.java
浏览文件 @
55d3c117
...
...
@@ -39,7 +39,7 @@ public class WeCropGroupTagDto {
public
static
WeCropGroupTagDto
transformAddTag
(
WeTagGroup
weTagGroup
){
WeCropGroupTagDto
weCropGroupTagDto
=
WeCropGroupTagDto
.
builder
()
.
group_id
(
weTagGroup
.
getGroupId
())
.
group_name
(
weTagGroup
.
getG
our
pName
())
.
group_name
(
weTagGroup
.
getG
rou
pName
())
.
build
();
List
<
WeTag
>
weTags
=
weTagGroup
.
getWeTags
();
if
(
CollectionUtil
.
isNotEmpty
(
weTags
)){
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/tag/WeTagGroupVo.java
浏览文件 @
55d3c117
...
...
@@ -30,7 +30,7 @@ public class WeTagGroupVo {
* 分组名称
*/
@ApiModelProperty
(
"分组名称"
)
private
String
g
our
pName
;
private
String
g
rou
pName
;
/** 创建时间 */
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerMapper.java
浏览文件 @
55d3c117
...
...
@@ -22,7 +22,7 @@ public interface WeCustomerMapper extends BaseMapper<WeCustomer>
* 批量新增
* @param customerList
*/
void
save
Batch
(
@Param
(
"weCustomerList"
)
List
<
WeCustomer
>
customerList
);
void
insert
Batch
(
@Param
(
"weCustomerList"
)
List
<
WeCustomer
>
customerList
);
/**
* 查询id企业微信客户
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeFlowerCustomerRelMapper.java
浏览文件 @
55d3c117
...
...
@@ -85,11 +85,11 @@ public interface WeFlowerCustomerRelMapper extends BaseMapper<WeFlowerCustomerRe
* @param weFlowerCustomerRel
* @return
*/
public
List
<
Map
<
String
,
Object
>>
getUserAddCustomerStat
(
WeFlowerCustomerRel
weFlowerCustomerRel
);
public
List
<
Map
<
String
,
Object
>>
getUserAddCustomerStat
(
@Param
(
"weFlowerCustomerRel"
)
WeFlowerCustomerRel
weFlowerCustomerRel
);
/**
* 批量新增
* @param customerRelList
*/
void
save
Batch
(
@Param
(
"customerRelList"
)
List
<
WeFlowerCustomerRel
>
customerRelList
);
void
insert
Batch
(
@Param
(
"customerRelList"
)
List
<
WeFlowerCustomerRel
>
customerRelList
);
}
linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeFlowerCustomerTagRelMapper.java
浏览文件 @
55d3c117
...
...
@@ -70,5 +70,5 @@ public interface WeFlowerCustomerTagRelMapper extends BaseMapper<WeFlowerCustom
*/
public
int
batchInsetWeFlowerCustomerTagRel
(
List
<
WeFlowerCustomerTagRel
>
weFlowerCustomerTagRels
);
public
void
save
Batch
(
@Param
(
"weFlowerCustomerTagRels"
)
List
<
WeFlowerCustomerTagRel
>
weFlowerCustomerTagRels
);
public
void
insert
Batch
(
@Param
(
"weFlowerCustomerTagRels"
)
List
<
WeFlowerCustomerTagRel
>
weFlowerCustomerTagRels
);
}
linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeTagGroupMapper.java
浏览文件 @
55d3c117
...
...
@@ -29,7 +29,7 @@ public interface WeTagGroupMapper extends BaseMapper<WeTagGroup>
* @param weTagGroups
* @return
*/
public
void
insetWeTagGroupBatch
(
@Param
(
"weTagGroups"
)
List
<
WeTagGroup
>
weTagGroups
);
public
void
inse
r
tWeTagGroupBatch
(
@Param
(
"weTagGroups"
)
List
<
WeTagGroup
>
weTagGroups
);
/**
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeTagMapper.java
浏览文件 @
55d3c117
...
...
@@ -21,6 +21,6 @@ public interface WeTagMapper extends BaseMapper<WeTag>
* @param weTags
* @return
*/
public
void
inse
tWeTagBatch
(
List
<
WeTag
>
weTags
);
public
void
inse
rtWeTagBatch
(
@Param
(
"weTags"
)
List
<
WeTag
>
weTags
);
}
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeFlowerCustomerRelService.java
浏览文件 @
55d3c117
...
...
@@ -19,7 +19,7 @@ public interface IWeFlowerCustomerRelService extends IService<WeFlowerCustomerRe
* 批量新增
* @param customerRelList
*/
public
void
save
Batch
(
List
<
WeFlowerCustomerRel
>
customerRelList
);
public
void
insert
Batch
(
List
<
WeFlowerCustomerRel
>
customerRelList
);
/**
* 删除服务跟进人
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeFlowerCustomerTagRelService.java
浏览文件 @
55d3c117
...
...
@@ -76,5 +76,5 @@ public interface IWeFlowerCustomerTagRelService extends IService<WeFlowerCustome
* @param weFlowerCustomerTagRels
* @return
*/
public
void
save
Batch
(
List
<
WeFlowerCustomerTagRel
>
weFlowerCustomerTagRels
);
public
void
insert
Batch
(
List
<
WeFlowerCustomerTagRel
>
weFlowerCustomerTagRels
);
}
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeTagService.java
浏览文件 @
55d3c117
...
...
@@ -92,5 +92,5 @@ public interface IWeTagService extends IService<WeTag>
* @param weTagGroups
* @return
*/
public
void
insetWeTagBatch
(
List
<
WeTag
>
weTagGroups
);
public
void
inse
r
tWeTagBatch
(
List
<
WeTag
>
weTagGroups
);
}
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCustomerServiceImpl.java
浏览文件 @
55d3c117
...
...
@@ -199,24 +199,20 @@ public class WeCustomerServiceImpl extends ServiceImpl<WeCustomerMapper, WeCusto
.
userId
(
userId
)
.
externalUserid
(
weCustomer
.
getExternalUserid
())
.
tagId
(
tagId
)
.
createTime
(
new
Date
())
.
updateTime
(
new
Date
())
.
createBy
(
StringUtils
.
isEmpty
(
SecurityUtils
.
getUsername
())?
"0"
:
SecurityUtils
.
getUsername
())
.
updateBy
(
StringUtils
.
isEmpty
(
SecurityUtils
.
getUsername
())?
"0"
:
SecurityUtils
.
getUsername
())
.
build
());
});
}
});
if
(
CollectionUtil
.
isNotEmpty
(
customerList
))
{
this
.
weCustomerMapper
.
save
Batch
(
customerList
);
this
.
weCustomerMapper
.
insert
Batch
(
customerList
);
}
if
(
CollectionUtil
.
isNotEmpty
(
weFlowerCustomerRels
))
{
iWeFlowerCustomerRelService
.
save
Batch
(
weFlowerCustomerRels
);
iWeFlowerCustomerRelService
.
insert
Batch
(
weFlowerCustomerRels
);
}
if
(
CollectionUtil
.
isNotEmpty
(
weFlowerCustomerTagRels
))
{
iWeFlowerCustomerTagRelService
.
save
Batch
(
weFlowerCustomerTagRels
);
iWeFlowerCustomerTagRelService
.
insert
Batch
(
weFlowerCustomerTagRels
);
}
});
}
...
...
@@ -481,24 +477,20 @@ public class WeCustomerServiceImpl extends ServiceImpl<WeCustomerMapper, WeCusto
.
userId
(
followUser
.
getUserid
())
.
externalUserid
(
externalUserid
)
.
tagId
(
tag
.
getTag_id
())
.
createTime
(
new
Date
())
.
updateTime
(
new
Date
())
.
createBy
(
StringUtils
.
isEmpty
(
SecurityUtils
.
getUsername
())?
"0"
:
SecurityUtils
.
getUsername
())
.
updateBy
(
StringUtils
.
isEmpty
(
SecurityUtils
.
getUsername
())?
"0"
:
SecurityUtils
.
getUsername
())
.
build
());
});
}
});
if
(
CollectionUtil
.
isNotEmpty
(
customerList
))
{
this
.
weCustomerMapper
.
save
Batch
(
customerList
);
this
.
weCustomerMapper
.
insert
Batch
(
customerList
);
}
if
(
CollectionUtil
.
isNotEmpty
(
weFlowerCustomerRels
))
{
iWeFlowerCustomerRelService
.
save
Batch
(
weFlowerCustomerRels
);
iWeFlowerCustomerRelService
.
insert
Batch
(
weFlowerCustomerRels
);
}
if
(
CollectionUtil
.
isNotEmpty
(
weFlowerCustomerTagRels
))
{
iWeFlowerCustomerTagRelService
.
save
Batch
(
weFlowerCustomerTagRels
);
iWeFlowerCustomerTagRelService
.
insert
Batch
(
weFlowerCustomerTagRels
);
}
}
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeFlowerCustomerRelServiceImpl.java
浏览文件 @
55d3c117
...
...
@@ -25,8 +25,8 @@ public class WeFlowerCustomerRelServiceImpl extends ServiceImpl<WeFlowerCustomer
@Override
public
void
save
Batch
(
List
<
WeFlowerCustomerRel
>
customerRelList
)
{
this
.
baseMapper
.
save
Batch
(
customerRelList
);
public
void
insert
Batch
(
List
<
WeFlowerCustomerRel
>
customerRelList
)
{
this
.
baseMapper
.
insert
Batch
(
customerRelList
);
}
@Override
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeFlowerCustomerTagRelServiceImpl.java
浏览文件 @
55d3c117
...
...
@@ -106,7 +106,7 @@ public class WeFlowerCustomerTagRelServiceImpl extends ServiceImpl<WeFlowerCusto
}
@Override
public
void
save
Batch
(
List
<
WeFlowerCustomerTagRel
>
weFlowerCustomerTagRels
)
{
weFlowerCustomerTagRelMapper
.
save
Batch
(
weFlowerCustomerTagRels
);
public
void
insert
Batch
(
List
<
WeFlowerCustomerTagRel
>
weFlowerCustomerTagRels
)
{
weFlowerCustomerTagRelMapper
.
insert
Batch
(
weFlowerCustomerTagRels
);
}
}
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeTagGroupServiceImpl.java
浏览文件 @
55d3c117
...
...
@@ -199,7 +199,7 @@ public class WeTagGroupServiceImpl extends ServiceImpl<WeTagGroupMapper, WeTagGr
tagGroups
.
forEach
(
tagGroup
->
{
WeTagGroup
weTagGroup
=
new
WeTagGroup
();
weTagGroup
.
setCreateBy
(
SecurityUtils
.
getUsername
());
weTagGroup
.
setG
our
pName
(
tagGroup
.
getGroup_name
());
weTagGroup
.
setG
rou
pName
(
tagGroup
.
getGroup_name
());
weTagGroup
.
setGroupId
(
tagGroup
.
getGroup_id
());
List
<
WeCropTagDto
>
tags
=
tagGroup
.
getTag
();
if
(
CollectionUtil
.
isNotEmpty
(
tags
))
{
...
...
@@ -227,7 +227,7 @@ public class WeTagGroupServiceImpl extends ServiceImpl<WeTagGroupMapper, WeTagGr
this
.
removeByIds
(
noExist
.
stream
().
map
(
WeTagGroup:
:
getId
).
collect
(
Collectors
.
toList
()));
}
}
this
.
baseMapper
.
insetWeTagGroupBatch
(
weTagGroups
);
this
.
baseMapper
.
inse
r
tWeTagGroupBatch
(
weTagGroups
);
List
<
WeTag
>
weTags
=
weTagGroups
.
stream
().
map
(
WeTagGroup:
:
getWeTags
).
collect
(
ArrayList:
:
new
,
ArrayList:
:
addAll
,
ArrayList:
:
addAll
);
if
(
CollectionUtil
.
isNotEmpty
(
weTags
))
{
...
...
@@ -238,7 +238,7 @@ public class WeTagGroupServiceImpl extends ServiceImpl<WeTagGroupMapper, WeTagGr
iWeTagService
.
removeByIds
(
noExistWeTags
.
stream
().
map
(
WeTag:
:
getId
).
collect
(
Collectors
.
toList
()));
}
}
iWeTagService
.
insetWeTagBatch
(
weTags
);
iWeTagService
.
inse
r
tWeTagBatch
(
weTags
);
}
}
else
{
//不存在删除所有标签组,以标签
if
(
isSync
)
{
...
...
@@ -263,8 +263,8 @@ public class WeTagGroupServiceImpl extends ServiceImpl<WeTagGroupMapper, WeTagGr
List
<
WeCropGroupTagDto
>
tagGroups
=
weCropGroupTagListDto
.
getTag_group
();
if
(
CollectionUtil
.
isNotEmpty
(
tagGroups
))
{
List
<
WeTagGroup
>
tagGroupsList
=
new
ArrayList
<>();
tagGroups
.
forEach
(
k
->
WeTagGroup
.
builder
().
groupId
(
k
.
getGroup_id
()).
g
our
pName
(
k
.
getGroup_name
()).
build
());
this
.
baseMapper
.
insetWeTagGroupBatch
(
tagGroupsList
);
tagGroups
.
forEach
(
k
->
WeTagGroup
.
builder
().
groupId
(
k
.
getGroup_id
()).
g
rou
pName
(
k
.
getGroup_name
()).
build
());
this
.
baseMapper
.
inse
r
tWeTagGroupBatch
(
tagGroupsList
);
}
}
...
...
@@ -280,8 +280,8 @@ public class WeTagGroupServiceImpl extends ServiceImpl<WeTagGroupMapper, WeTagGr
List
<
WeCropGroupTagDto
>
tagGroups
=
weCropGroupTagListDto
.
getTag_group
();
if
(
CollectionUtil
.
isNotEmpty
(
tagGroups
))
{
List
<
WeTagGroup
>
tagGroupsList
=
new
ArrayList
<>();
tagGroups
.
forEach
(
k
->
WeTagGroup
.
builder
().
groupId
(
k
.
getGroup_id
()).
g
our
pName
(
k
.
getGroup_name
()).
build
());
this
.
baseMapper
.
insetWeTagGroupBatch
(
tagGroupsList
);
tagGroups
.
forEach
(
k
->
WeTagGroup
.
builder
().
groupId
(
k
.
getGroup_id
()).
g
rou
pName
(
k
.
getGroup_name
()).
build
());
this
.
baseMapper
.
inse
r
tWeTagGroupBatch
(
tagGroupsList
);
}
}
...
...
linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeTagServiceImpl.java
浏览文件 @
55d3c117
...
...
@@ -141,7 +141,7 @@ public class WeTagServiceImpl extends ServiceImpl<WeTagMapper,WeTag> implements
.
groupId
(
tagGroup
.
getGroup_id
())
.
name
(
tag
.
getName
())
.
build
());
this
.
baseMapper
.
insetWeTagBatch
(
weTags
);
this
.
baseMapper
.
inse
r
tWeTagBatch
(
weTags
);
}
});
}
...
...
@@ -170,7 +170,7 @@ public class WeTagServiceImpl extends ServiceImpl<WeTagMapper,WeTag> implements
.
groupId
(
tagGroup
.
getGroup_id
())
.
name
(
tag
.
getName
())
.
build
());
this
.
baseMapper
.
insetWeTagBatch
(
weTags
);
this
.
baseMapper
.
inse
r
tWeTagBatch
(
weTags
);
}
});
}
...
...
@@ -178,8 +178,8 @@ public class WeTagServiceImpl extends ServiceImpl<WeTagMapper,WeTag> implements
}
@Override
public
void
insetWeTagBatch
(
List
<
WeTag
>
weTags
)
{
this
.
baseMapper
.
insetWeTagBatch
(
weTags
);
public
void
inse
r
tWeTagBatch
(
List
<
WeTag
>
weTags
)
{
this
.
baseMapper
.
inse
r
tWeTagBatch
(
weTags
);
}
...
...
linkwe-wecom/src/main/resources/mapper/wecom/WeCustomerMapper.xml
浏览文件 @
55d3c117
...
...
@@ -285,7 +285,7 @@
</select>
<insert
id=
"
save
Batch"
>
<insert
id=
"
insert
Batch"
>
insert into we_customer
(external_userid, `name`, avatar, `type`, gender, unionid, birthday, corp_name, corp_full_name,
`position`,create_by, create_time, update_time, update_by) values
...
...
@@ -302,7 +302,7 @@
`type`= values(`type`),gender= values(gender),
unionid= values(unionid),birthday= values(birthday),
corp_name= values(corp_name),corp_full_name= values(corp_full_name),
`position`= values(`position`)
`position`= values(`position`)
,update_by= values(update_by),update_time= values(update_time)
</insert>
</mapper>
\ No newline at end of file
linkwe-wecom/src/main/resources/mapper/wecom/WeFlowerCustomerRelMapper.xml
浏览文件 @
55d3c117
...
...
@@ -142,7 +142,7 @@
</select>
<insert
id=
"
save
Batch"
>
<insert
id=
"
insert
Batch"
>
insert into we_flower_customer_rel (user_id, external_userid, remark, description, add_time, remark_corp_name,
remark_mobiles, oper_userid, add_way, `state`,create_by, create_time, update_time, update_by)
values
...
...
@@ -157,6 +157,6 @@
description= values(description),add_time= values(add_time),
add_time= values(add_time),remark_corp_name= values(remark_corp_name),
remark_mobiles= values(remark_mobiles),oper_userid= values(oper_userid),
add_way= values(add_way),`state`= values(`state`)
add_way= values(add_way),`state`= values(`state`)
,update_by= values(update_by),update_time= values(update_time)
</insert>
</mapper>
\ No newline at end of file
linkwe-wecom/src/main/resources/mapper/wecom/WeFlowerCustomerTagRelMapper.xml
浏览文件 @
55d3c117
...
...
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</insert>
<insert
id=
"
save
Batch"
>
<insert
id=
"
insert
Batch"
>
insert into we_flower_customer_tag_rel (external_userid, user_id, tag_id,create_by, create_time, update_time, update_by)
values
<foreach
collection=
"weFlowerCustomerTagRels"
item=
"item"
index=
"index"
separator=
","
>
...
...
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item.createTime},#{item.updateTime},#{item.updateBy})
</foreach>
on duplicate key update corp_id= values(corp_id),external_userid= values(external_userid),
user_id = values(user_id), tag_id= values(tag_id)
user_id = values(user_id), tag_id= values(tag_id)
,update_by= values(update_by),update_time= values(update_time)
</insert>
</mapper>
\ No newline at end of file
linkwe-wecom/src/main/resources/mapper/wecom/WeTagGroupMapper.xml
浏览文件 @
55d3c117
...
...
@@ -5,7 +5,7 @@
<mapper
namespace=
"com.linkwechat.wecom.mapper.WeTagGroupMapper"
>
<resultMap
type=
"com.linkwechat.wecom.domain.vo.tag.WeTagGroupVo"
id=
"WeTagGroupResult"
>
<result
property=
"g
ourpName"
column=
"gour
p_name"
/>
<result
property=
"g
roupName"
column=
"grou
p_name"
/>
<result
property=
"groupId"
column=
"group_id"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"createBy"
column=
"create_by"
/>
...
...
@@ -19,7 +19,7 @@
<sql
id=
"selectWeTagGroupVo"
>
SELECT
wtg.group_id ,
wtg.g
our
p_name ,
wtg.g
rou
p_name ,
wtg.create_time ,
wtg.create_by ,
wt.tag_id ,
...
...
@@ -33,28 +33,29 @@
<select
id=
"selectWeTagGroupList"
parameterType=
"WeTagGroup"
resultMap=
"WeTagGroupResult"
>
<include
refid=
"selectWeTagGroupVo"
/>
<where>
<if
test=
"g
ourpName != null and gour
pName != ''"
>
and g
ourp_name like concat('%', #{gour
pName}, '%')
<if
test=
"g
roupName != null and grou
pName != ''"
>
and g
roup_name like concat('%', #{grou
pName}, '%')
</if>
and wtg.del_flag=0
</where>
</select>
<insert
id=
"insetWeTagGroupBatch"
>
insert into we_tag_group (group_id,g
our
p_name,create_by,update_by,create_time,update_time)
<insert
id=
"inse
r
tWeTagGroupBatch"
>
insert into we_tag_group (group_id,g
rou
p_name,create_by,update_by,create_time,update_time)
values
<foreach
collection=
"weTagGroups"
item=
"weTagGroup"
index=
"index"
separator=
","
>
(#{weTagGroup.groupId},#{weTagGroup.g
our
pName},
(#{weTagGroup.groupId},#{weTagGroup.g
rou
pName},
#{weTagGroup.createBy},#{weTagGroup.updateBy},#{weTagGroup.createTime},#{weTagGroup.updateTime})
</foreach>
on duplicate key update group_id= values(group_id),gourp_name= values(gourp_name)
on duplicate key update group_id= values(group_id),group_name= values(group_name),
update_by= values(update_by),update_time= values(update_time)
</insert>
<select
id=
"findCustomerTag"
resultMap=
"WeTagGroupResult"
>
SELECT
wtg.g
our
p_name,
wtg.g
rou
p_name,
wtg.group_id,
wt.tag_id,
wt.`name`
...
...
linkwe-wecom/src/main/resources/mapper/wecom/WeTagMapper.xml
浏览文件 @
55d3c117
...
...
@@ -12,14 +12,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<insert
id=
"insetWeTagBatch"
>
<insert
id=
"inse
r
tWeTagBatch"
>
insert into we_tag (group_id, `name`, tag_id, create_by,update_by,create_time,update_time)
values
<foreach
collection=
"weTags"
item=
"tag"
index=
"index"
separator=
","
>
(#{tag.groupId},#{tag.name},#{tag.tagId},
#{tag.createBy},#{tag.updateBy},#{tag.createTime},#{tag.updateTime})
</foreach>
on duplicate key update group_id= values(group_id),`name`= values(`name`),tag_id= values(tag_id)
on duplicate key update group_id= values(group_id),`name`= values(`name`),tag_id= values(tag_id),
update_by= values(update_by),update_time= values(update_time)
</insert>
...
...
linkwe-wecom/src/main/resources/mapper/wecom/WeUserMapper.xml
浏览文件 @
55d3c117
...
...
@@ -102,9 +102,7 @@
telephone= values(telephone),address= values(address),
birthday= values(birthday),remark= values(remark),
is_activate= values(is_activate),
create_by= values(create_by),
update_by= values(update_by),
create_time= values(create_time),
update_time= values(update_time)
</insert>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录