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
c8783675
Commit
c8783675
authored
Nov 25, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
09bd4e2c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
DealSyncOperationApiServiceImpl.java
...ice/service/out/impl/DealSyncOperationApiServiceImpl.java
+17
-1
PreDealLogMapper.xml
...e3-service/src/main/resources/mapper/PreDealLogMapper.xml
+1
-1
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
View file @
c8783675
...
@@ -550,7 +550,23 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
...
@@ -550,7 +550,23 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
}
}
}
}
}
}
}
else
{
}
else
if
(
syncTask
.
getTaskType
().
equals
(
2
)){
List
<
PreDealLogInfoDTO
>
result
=
page
.
getResult
();
for
(
PreDealLogInfoDTO
dto
:
result
)
{
dto
.
setDataCode
(
dto
.
getDataId
());
if
(
dto
.
getDataType
()
==
PreDealTypeEnum
.
friend
.
getVal
()){
dto
.
setDataName
(
"第三方应用处理"
);
}
else
if
(
dto
.
getDataType
()
==
PreDealTypeEnum
.
friend_clerk
.
getVal
()){
dto
.
setDataName
(
"导购处理"
);
}
else
if
(
dto
.
getDataType
()
==
PreDealTypeEnum
.
friend_merge
.
getVal
()){
dto
.
setDataName
(
"合并处理"
);
}
else
if
(
dto
.
getDataType
()
==
PreDealTypeEnum
.
self_friend
.
getVal
()){
dto
.
setDataName
(
"自建应用处理"
);
}
//dto.setReason(reason);
}
}
else
{
List
<
PreDealLogInfoDTO
>
result
=
page
.
getResult
();
List
<
PreDealLogInfoDTO
>
result
=
page
.
getResult
();
for
(
PreDealLogInfoDTO
dto
:
result
)
{
for
(
PreDealLogInfoDTO
dto
:
result
)
{
dto
.
setDataCode
(
dto
.
getDataId
());
dto
.
setDataCode
(
dto
.
getDataId
());
...
...
haoban-manage3-service/src/main/resources/mapper/PreDealLogMapper.xml
View file @
c8783675
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
update_time
update_time
</sql>
</sql>
<sql
id=
"Base_Column_List_data"
>
<sql
id=
"Base_Column_List_data"
>
id, wx_enterprise_id,enterprise_id, data_id,data_content, p_data_id, task_id, data_type, status_flag, create_time,
id, wx_enterprise_id,enterprise_id, data_id,data_content, p_data_id, task_id, data_type, status_flag, create_time,
reason,
update_time
update_time
</sql>
</sql>
<select
id=
"selectByPrimaryKey"
parameterType=
"java.lang.Integer"
resultMap=
"BaseResultMap"
>
<select
id=
"selectByPrimaryKey"
parameterType=
"java.lang.Integer"
resultMap=
"BaseResultMap"
>
...
...
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