Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
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
reyun
manager
Commits
131793d4
Commit
131793d4
authored
Jan 30, 2018
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app排序
parent
bb4d9bc1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
workspace.xml
.idea/workspace.xml
+14
-14
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+1
-1
No files found.
.idea/workspace.xml
View file @
131793d4
...
@@ -57,8 +57,8 @@
...
@@ -57,8 +57,8 @@
<file
leaf-file-name=
"ContractServiceImpl.java"
pinned=
"false"
current-in-tab=
"true"
>
<file
leaf-file-name=
"ContractServiceImpl.java"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
83
"
>
<state
relative-caret-position=
"1
37
"
>
<caret
line=
"2
72"
column=
"23"
lean-forward=
"false"
selection-start-line=
"272"
selection-start-column=
"23"
selection-end-line=
"272
"
selection-end-column=
"23"
/>
<caret
line=
"2
67"
column=
"23"
lean-forward=
"false"
selection-start-line=
"267"
selection-start-column=
"23"
selection-end-line=
"267
"
selection-end-column=
"23"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
...
@@ -1302,14 +1302,7 @@
...
@@ -1302,14 +1302,7 @@
<workItem
from=
"1516843795236"
duration=
"8291000"
/>
<workItem
from=
"1516843795236"
duration=
"8291000"
/>
<workItem
from=
"1516932422302"
duration=
"5866000"
/>
<workItem
from=
"1516932422302"
duration=
"5866000"
/>
<workItem
from=
"1517189406074"
duration=
"8333000"
/>
<workItem
from=
"1517189406074"
duration=
"8333000"
/>
<workItem
from=
"1517275427548"
duration=
"11086000"
/>
<workItem
from=
"1517275427548"
duration=
"11415000"
/>
</task>
<task
id=
"LOCAL-00015"
summary=
"test pom"
>
<created>
1514893773558
</created>
<option
name=
"number"
value=
"00015"
/>
<option
name=
"presentableId"
value=
"LOCAL-00015"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1514893773558
</updated>
</task>
</task>
<task
id=
"LOCAL-00016"
summary=
"发邮件"
>
<task
id=
"LOCAL-00016"
summary=
"发邮件"
>
<created>
1514966556862
</created>
<created>
1514966556862
</created>
...
@@ -1647,11 +1640,18 @@
...
@@ -1647,11 +1640,18 @@
<option
name=
"project"
value=
"LOCAL"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1517302015547
</updated>
<updated>
1517302015547
</updated>
</task>
</task>
<option
name=
"localTasksCounter"
value=
"64"
/>
<task
id=
"LOCAL-00064"
summary=
"app排序"
>
<created>
1517309281095
</created>
<option
name=
"number"
value=
"00064"
/>
<option
name=
"presentableId"
value=
"LOCAL-00064"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1517309281095
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"65"
/>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"297
372
000"
/>
<option
name=
"totallyTimeSpent"
value=
"297
701
000"
/>
</component>
</component>
<component
name=
"ToolWindowManager"
>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
...
@@ -2256,8 +2256,8 @@
...
@@ -2256,8 +2256,8 @@
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
83
"
>
<state
relative-caret-position=
"1
37
"
>
<caret
line=
"2
72"
column=
"23"
lean-forward=
"false"
selection-start-line=
"272"
selection-start-column=
"23"
selection-end-line=
"272
"
selection-end-column=
"23"
/>
<caret
line=
"2
67"
column=
"23"
lean-forward=
"false"
selection-start-line=
"267"
selection-start-column=
"23"
selection-end-line=
"267
"
selection-end-column=
"23"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
...
...
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
131793d4
...
@@ -265,7 +265,7 @@ public class ContractServiceImpl implements ContractService{
...
@@ -265,7 +265,7 @@ public class ContractServiceImpl implements ContractService{
contract
.
setRebate
(
f1
);
contract
.
setRebate
(
f1
);
//同步修改trackingio的数据
//同步修改trackingio的数据
if
(
resource
.
getPlatform
().
equals
(
"tkio"
)){
if
(
contract
.
getPlatform
().
equals
(
"tkio"
)){
accountService
.
update
(
contract
);
accountService
.
update
(
contract
);
}
}
}
else
{
}
else
{
...
...
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