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
a206c0cd
Commit
a206c0cd
authored
Apr 26, 2018
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2
parent
8a2892f5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
32 deletions
+50
-32
workspace.xml
.idea/workspace.xml
+49
-31
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+1
-1
No files found.
.idea/workspace.xml
View file @
a206c0cd
...
...
@@ -35,8 +35,28 @@
<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"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"138"
>
<caret
line=
"348"
column=
"55"
lean-forward=
"true"
selection-start-line=
"348"
selection-start-column=
"55"
selection-end-line=
"348"
selection-end-column=
"55"
/>
<state
relative-caret-position=
"-23"
>
<caret
line=
"344"
column=
"44"
lean-forward=
"false"
selection-start-line=
"344"
selection-start-column=
"44"
selection-end-line=
"344"
selection-end-column=
"44"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"AccountIOService.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"207"
>
<caret
line=
"10"
column=
"12"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"12"
selection-end-line=
"10"
selection-end-column=
"12"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"AccountIOServiceImpl.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"309"
>
<caret
line=
"31"
column=
"47"
lean-forward=
"false"
selection-start-line=
"31"
selection-start-column=
"37"
selection-end-line=
"31"
selection-end-column=
"47"
/>
<folding
/>
</state>
</provider>
...
...
@@ -1192,13 +1212,6 @@
<workItem
from=
"1523843445576"
duration=
"7238000"
/>
<workItem
from=
"1523876594256"
duration=
"75800000"
/>
</task>
<task
id=
"LOCAL-00081"
summary=
"app排序"
>
<created>
1517477432252
</created>
<option
name=
"number"
value=
"00081"
/>
<option
name=
"presentableId"
value=
"LOCAL-00081"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1517477432252
</updated>
</task>
<task
id=
"LOCAL-00082"
summary=
"app排序"
>
<created>
1517478623525
</created>
<option
name=
"number"
value=
"00082"
/>
...
...
@@ -1535,11 +1548,18 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524730718982
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"130"
/>
<task
id=
"LOCAL-00130"
summary=
"2 "
>
<created>
1524732473230
</created>
<option
name=
"number"
value=
"00130"
/>
<option
name=
"presentableId"
value=
"LOCAL-00130"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524732473230
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"131"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"50
4496
000"
/>
<option
name=
"totallyTimeSpent"
value=
"50
5039
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
...
...
@@ -1919,24 +1939,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"184"
>
<caret
line=
"21"
column=
"61"
lean-forward=
"false"
selection-start-line=
"21"
selection-start-column=
"45"
selection-end-line=
"21"
selection-end-column=
"61"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"230"
>
<caret
line=
"10"
column=
"8"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"8"
selection-end-line=
"10"
selection-end-column=
"8"
/>
<folding>
<element
signature=
"imports"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/Contract.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"184"
>
...
...
@@ -2125,10 +2127,26 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"207"
>
<caret
line=
"10"
column=
"12"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"12"
selection-end-line=
"10"
selection-end-column=
"12"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"309"
>
<caret
line=
"31"
column=
"47"
lean-forward=
"false"
selection-start-line=
"31"
selection-start-column=
"37"
selection-end-line=
"31"
selection-end-column=
"47"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
138
"
>
<caret
line=
"34
8"
column=
"55"
lean-forward=
"true"
selection-start-line=
"348"
selection-start-column=
"55"
selection-end-line=
"348"
selection-end-column=
"55
"
/>
<state
relative-caret-position=
"
-23
"
>
<caret
line=
"34
4"
column=
"44"
lean-forward=
"false"
selection-start-line=
"344"
selection-start-column=
"44"
selection-end-line=
"344"
selection-end-column=
"44
"
/>
<folding
/>
</state>
</provider>
...
...
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
a206c0cd
...
...
@@ -342,7 +342,7 @@ public class ContractServiceImpl implements ContractService{
accountService
.
update
(
contract
);
}
if
(
contract
.
getPlatform
().
equals
(
"io"
)
&&
resource
.
getType
().
equals
(
"main"
)){
accountIOService
.
update
(
resource
);
accountIOService
.
update
(
contract
);
}
if
(
contract
.
getPlatform
().
equals
(
"tkio"
)){
...
...
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