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
bb4d9bc1
Commit
bb4d9bc1
authored
7 years ago
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app排序
parent
760c141d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
108 additions
and
52 deletions
+108
-52
workspace.xml
.idea/workspace.xml
+107
-51
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+1
-1
No files found.
.idea/workspace.xml
View file @
bb4d9bc1
...
...
@@ -3,7 +3,7 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/
tkio/service/impl/TkioAccountServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccoun
tServiceImpl.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/
common/service/impl/ContractServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/impl/Contrac
tServiceImpl.java"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/target/"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -27,13 +27,43 @@
<file
leaf-file-name=
"TkioAccountController.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
207
"
>
<state
relative-caret-position=
"
-1971
"
>
<caret
line=
"32"
column=
"53"
lean-forward=
"false"
selection-start-line=
"32"
selection-start-column=
"53"
selection-end-line=
"32"
selection-end-column=
"53"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ContractController.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"260"
>
<caret
line=
"45"
column=
"44"
lean-forward=
"true"
selection-start-line=
"45"
selection-start-column=
"44"
selection-end-line=
"45"
selection-end-column=
"44"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ContractService.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"183"
>
<caret
line=
"13"
column=
"24"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"24"
selection-end-line=
"13"
selection-end-column=
"24"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<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=
"183"
>
<caret
line=
"272"
column=
"23"
lean-forward=
"false"
selection-start-line=
"272"
selection-start-column=
"23"
selection-end-line=
"272"
selection-end-column=
"23"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"TkioAccountService.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -44,7 +74,7 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"TkioAccountServiceImpl.java"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"TkioAccountServiceImpl.java"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"237"
>
...
...
@@ -167,7 +197,6 @@
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/util/DateUtil.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/UserLog.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java"
/>
...
...
@@ -189,6 +218,7 @@
<option
value=
"$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
</list>
</option>
</component>
...
...
@@ -746,6 +776,36 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"manager"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"manager"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"src"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"main"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"java"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"common"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"controller"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane
id=
"Scope"
/>
...
...
@@ -1242,14 +1302,7 @@
<workItem
from=
"1516843795236"
duration=
"8291000"
/>
<workItem
from=
"1516932422302"
duration=
"5866000"
/>
<workItem
from=
"1517189406074"
duration=
"8333000"
/>
<workItem
from=
"1517275427548"
duration=
"8526000"
/>
</task>
<task
id=
"LOCAL-00014"
summary=
"test pom"
>
<created>
1514893244444
</created>
<option
name=
"number"
value=
"00014"
/>
<option
name=
"presentableId"
value=
"LOCAL-00014"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1514893244444
</updated>
<workItem
from=
"1517275427548"
duration=
"11086000"
/>
</task>
<task
id=
"LOCAL-00015"
summary=
"test pom"
>
<created>
1514893773558
</created>
...
...
@@ -1587,11 +1640,18 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1517301138523
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"63"
/>
<task
id=
"LOCAL-00063"
summary=
"app排序"
>
<created>
1517302015547
</created>
<option
name=
"number"
value=
"00063"
/>
<option
name=
"presentableId"
value=
"LOCAL-00063"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1517302015547
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"64"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"29
481
2000"
/>
<option
name=
"totallyTimeSpent"
value=
"29
737
2000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
...
...
@@ -1777,13 +1837,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"161"
>
<caret
line=
"11"
column=
"17"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"17"
selection-end-line=
"11"
selection-end-column=
"17"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"92"
>
...
...
@@ -1791,13 +1844,6 @@
</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=
"4071"
>
<caret
line=
"197"
column=
"60"
lean-forward=
"false"
selection-start-line=
"197"
selection-start-column=
"60"
selection-end-line=
"197"
selection-end-column=
"60"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"299"
>
...
...
@@ -1943,20 +1989,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"598"
>
<caret
line=
"39"
column=
"22"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"22"
selection-end-line=
"39"
selection-end-column=
"22"
/>
<folding>
<element
signature=
"imports"
expanded=
"false"
/>
<element
signature=
"e#1721#1722#0"
expanded=
"false"
/>
<element
signature=
"e#1778#1779#0"
expanded=
"false"
/>
<element
signature=
"e#2760#2761#0"
expanded=
"false"
/>
<element
signature=
"e#2817#2818#0"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"528"
>
...
...
@@ -2105,7 +2137,7 @@
<state
relative-caret-position=
"435"
>
<caret
line=
"52"
column=
"75"
lean-forward=
"false"
selection-start-line=
"52"
selection-start-column=
"75"
selection-end-line=
"52"
selection-end-column=
"75"
/>
<folding>
<element
signature=
"imports"
expanded=
"
tru
e"
/>
<element
signature=
"imports"
expanded=
"
fals
e"
/>
</folding>
</state>
</provider>
...
...
@@ -2158,14 +2190,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"207"
>
<caret
line=
"32"
column=
"53"
lean-forward=
"false"
selection-start-line=
"32"
selection-start-column=
"53"
selection-end-line=
"32"
selection-end-column=
"53"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"184"
>
...
...
@@ -2206,6 +2230,38 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-1971"
>
<caret
line=
"32"
column=
"53"
lean-forward=
"false"
selection-start-line=
"32"
selection-start-column=
"53"
selection-end-line=
"32"
selection-end-column=
"53"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"260"
>
<caret
line=
"45"
column=
"44"
lean-forward=
"true"
selection-start-line=
"45"
selection-start-column=
"44"
selection-end-line=
"45"
selection-end-column=
"44"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"183"
>
<caret
line=
"13"
column=
"24"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"24"
selection-end-line=
"13"
selection-end-column=
"24"
/>
<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=
"183"
>
<caret
line=
"272"
column=
"23"
lean-forward=
"false"
selection-start-line=
"272"
selection-start-column=
"23"
selection-end-line=
"272"
selection-end-column=
"23"
/>
<folding
/>
</state>
</provider>
</entry>
</component>
<component
name=
"masterDetails"
>
<states>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
bb4d9bc1
...
...
@@ -270,7 +270,7 @@ public class ContractServiceImpl implements ContractService{
}
}
else
{
//同步修改trackingio的数据
if
(
resource
.
getPlatform
().
equals
(
"tkio"
)){
if
(
contract
.
getPlatform
().
equals
(
"tkio"
)){
accountService
.
forbiden
(
contract
);
}
contract
.
setStatus
(
"cancel"
);
...
...
This diff is collapsed.
Click to expand it.
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