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
833eff93
Commit
833eff93
authored
Apr 25, 2018
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2
parent
16772859
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
76 additions
and
64 deletions
+76
-64
workspace.xml
.idea/workspace.xml
+72
-64
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+4
-0
No files found.
.idea/workspace.xml
View file @
833eff93
...
...
@@ -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"
/>
...
...
@@ -21,14 +21,22 @@
<component
name=
"CreatePatchCommitExecutor"
>
<option
name=
"PATCH_PATH"
value=
"E:\newgit\manager"
/>
</component>
<component
name=
"DatabaseView"
>
<option
name=
"GROUP_SCHEMA"
value=
"true"
/>
<option
name=
"GROUP_CONTENTS"
value=
"false"
/>
<option
name=
"SORT_POSITIONED"
value=
"false"
/>
<option
name=
"SHOW_TABLE_DETAILS"
value=
"true"
/>
<option
name=
"SHOW_EMPTY_GROUPS"
value=
"false"
/>
<option
name=
"AUTO_SCROLL_FROM_SOURCE"
value=
"false"
/>
</component>
<component
name=
"ExecutionTargetManager"
SELECTED_TARGET=
"default_target"
/>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<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=
"
320
"
>
<caret
line=
"
269"
column=
"42"
lean-forward=
"false"
selection-start-line=
"269"
selection-start-column=
"42"
selection-end-line=
"269
"
selection-end-column=
"42"
/>
<state
relative-caret-position=
"
183
"
>
<caret
line=
"
152"
column=
"42"
lean-forward=
"false"
selection-start-line=
"152"
selection-start-column=
"42"
selection-end-line=
"152
"
selection-end-column=
"42"
/>
<folding
/>
</state>
</provider>
...
...
@@ -37,48 +45,48 @@
<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"
>
<state
relative-caret-position=
"
366
"
>
<state
relative-caret-position=
"
1125
"
>
<caret
line=
"54"
column=
"9"
lean-forward=
"false"
selection-start-line=
"54"
selection-start-column=
"9"
selection-end-line=
"54"
selection-end-column=
"9"
/>
<folding
/>
</state>
</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=
"
436
"
>
<caret
line=
"
593"
column=
"50"
lean-forward=
"true"
selection-start-line=
"593"
selection-start-column=
"50"
selection-end-line=
"593"
selection-end-column=
"5
0"
/>
<state
relative-caret-position=
"
-277
"
>
<caret
line=
"
81"
column=
"0"
lean-forward=
"true"
selection-start-line=
"81"
selection-start-column=
"0"
selection-end-line=
"81"
selection-end-column=
"
0"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
AccountCheck
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/task/AccountCheck
.java"
>
<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=
"-1
95
"
>
<caret
line=
"
27"
column=
"23"
lean-forward=
"true"
selection-start-line=
"27"
selection-start-column=
"23"
selection-end-line=
"27"
selection-end-column=
"23
"
/>
<state
relative-caret-position=
"-1
62
"
>
<caret
line=
"
15"
column=
"12"
lean-forward=
"false"
selection-start-line=
"15"
selection-start-column=
"12"
selection-end-line=
"15"
selection-end-column=
"12
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ContractService
.java"
pinned=
"false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/
ContractService
.java"
>
<file
leaf-file-name=
"ContractService
Impl.java"
pinned=
"false"
current-in-tab=
"tru
e"
>
<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=
"
421
"
>
<caret
line=
"4
9"
column=
"13"
lean-forward=
"false"
selection-start-line=
"49"
selection-start-column=
"13"
selection-end-line=
"49"
selection-end-column=
"13
"
/>
<state
relative-caret-position=
"
275
"
>
<caret
line=
"4
71"
column=
"8"
lean-forward=
"false"
selection-start-line=
"471"
selection-start-column=
"8"
selection-end-line=
"471"
selection-end-column=
"8
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"Contract
ServiceImpl
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/service/impl/ContractServiceImpl
.java"
>
<file
leaf-file-name=
"Contract
TypeEnum
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
dic/ContractTypeEnum
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
401
"
>
<caret
line=
"
479"
column=
"36"
lean-forward=
"true"
selection-start-line=
"479"
selection-start-column=
"36"
selection-end-line=
"479"
selection-end-column=
"36
"
/>
<state
relative-caret-position=
"
207
"
>
<caret
line=
"
9"
column=
"24"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"15"
selection-end-line=
"9"
selection-end-column=
"24
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -88,7 +96,7 @@
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-253"
>
<caret
line=
"13"
column=
"35"
lean-forward=
"
tru
e"
selection-start-line=
"13"
selection-start-column=
"35"
selection-end-line=
"13"
selection-end-column=
"35"
/>
<caret
line=
"13"
column=
"35"
lean-forward=
"
fals
e"
selection-start-line=
"13"
selection-start-column=
"35"
selection-end-line=
"13"
selection-end-column=
"35"
/>
<folding
/>
</state>
</provider>
...
...
@@ -118,7 +126,7 @@
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"194"
>
<caret
line=
"79"
column=
"31"
lean-forward=
"
tru
e"
selection-start-line=
"79"
selection-start-column=
"31"
selection-end-line=
"79"
selection-end-column=
"31"
/>
<caret
line=
"79"
column=
"31"
lean-forward=
"
fals
e"
selection-start-line=
"79"
selection-start-column=
"31"
selection-end-line=
"79"
selection-end-column=
"31"
/>
<folding
/>
</state>
</provider>
...
...
@@ -236,8 +244,8 @@
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.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>
...
...
@@ -1368,13 +1376,6 @@
<workItem
from=
"1523843445576"
duration=
"7238000"
/>
<workItem
from=
"1523876594256"
duration=
"75800000"
/>
</task>
<task
id=
"LOCAL-00068"
summary=
"app排序"
>
<created>
1517382900046
</created>
<option
name=
"number"
value=
"00068"
/>
<option
name=
"presentableId"
value=
"LOCAL-00068"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1517382900046
</updated>
</task>
<task
id=
"LOCAL-00069"
summary=
"app排序"
>
<created>
1517384165633
</created>
<option
name=
"number"
value=
"00069"
/>
...
...
@@ -1711,11 +1712,18 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524561675852
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"117"
/>
<task
id=
"LOCAL-00117"
summary=
"2 "
>
<created>
1524561869197
</created>
<option
name=
"number"
value=
"00117"
/>
<option
name=
"presentableId"
value=
"LOCAL-00117"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524561869197
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"118"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"4
76200
000"
/>
<option
name=
"totallyTimeSpent"
value=
"4
80862
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
...
...
@@ -1724,11 +1732,11 @@
<window_info
id=
"Palette"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Nl-Palette"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4304419"
sideWeight=
"0.5098336"
order=
"6"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Maven Projects"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
4674735
4"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Maven Projects"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
1694402
4"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Properties"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Capture Tool"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Designer"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.3
3
"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.3
2980332
"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.24962178"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Ant Build"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.24962178"
sideWeight=
"0.5"
order=
"10"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"UI Designer"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1771,7 +1779,7 @@
<window_info
id=
"Commander"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4304419"
sideWeight=
"0.5098336"
order=
"6"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Application Servers"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"12"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Maven Projects"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
4674735
4"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Maven Projects"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
1694402
4"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"JRebel Executor"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"13"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Properties"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Capture Tool"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1779,7 +1787,7 @@
<window_info
id=
"Hierarchy"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"11"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Memory View"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Get Gist"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"15"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.3
3
"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.3
2980332
"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"SonarQube"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"16"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.24962178"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Ant Build"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.24962178"
sideWeight=
"0.5"
order=
"10"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1792,7 +1800,7 @@
<window_info
id=
"Java Enterprise"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Capture Analysis"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Inspection"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"14"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
44680852
"
sideWeight=
"0.49016643"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
5171849
"
sideWeight=
"0.49016643"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.5155483"
sideWeight=
"0.49546143"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Spring"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.3289689"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.5581015"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1967,14 +1975,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/dic/ContractTypeEnum.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"138"
>
<caret
line=
"6"
column=
"12"
lean-forward=
"false"
selection-start-line=
"6"
selection-start-column=
"12"
selection-end-line=
"6"
selection-end-column=
"12"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"161"
>
...
...
@@ -2129,7 +2129,7 @@
<state
relative-caret-position=
"412"
>
<caret
line=
"34"
column=
"47"
lean-forward=
"false"
selection-start-line=
"34"
selection-start-column=
"47"
selection-end-line=
"34"
selection-end-column=
"47"
/>
<folding>
<element
signature=
"imports"
expanded=
"
tru
e"
/>
<element
signature=
"imports"
expanded=
"
fals
e"
/>
</folding>
</state>
</provider>
...
...
@@ -2206,14 +2206,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=
"421"
>
<caret
line=
"49"
column=
"13"
lean-forward=
"false"
selection-start-line=
"49"
selection-start-column=
"13"
selection-end-line=
"49"
selection-end-column=
"13"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"263"
>
...
...
@@ -2233,7 +2225,7 @@
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"194"
>
<caret
line=
"79"
column=
"31"
lean-forward=
"
tru
e"
selection-start-line=
"79"
selection-start-column=
"31"
selection-end-line=
"79"
selection-end-column=
"31"
/>
<caret
line=
"79"
column=
"31"
lean-forward=
"
fals
e"
selection-start-line=
"79"
selection-start-column=
"31"
selection-end-line=
"79"
selection-end-column=
"31"
/>
<folding
/>
</state>
</provider>
...
...
@@ -2241,30 +2233,30 @@
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-253"
>
<caret
line=
"13"
column=
"35"
lean-forward=
"
tru
e"
selection-start-line=
"13"
selection-start-column=
"35"
selection-end-line=
"13"
selection-end-column=
"35"
/>
<caret
line=
"13"
column=
"35"
lean-forward=
"
fals
e"
selection-start-line=
"13"
selection-start-column=
"35"
selection-end-line=
"13"
selection-end-column=
"35"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/controller/ContractController
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
dic/ContractTypeEnum
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
320
"
>
<caret
line=
"
269"
column=
"42"
lean-forward=
"false"
selection-start-line=
"269"
selection-start-column=
"42"
selection-end-line=
"269"
selection-end-column=
"42
"
/>
<state
relative-caret-position=
"
207
"
>
<caret
line=
"
9"
column=
"24"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"15"
selection-end-line=
"9"
selection-end-column=
"24
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
service/impl/ContractServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
controller/ContractController
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
401
"
>
<caret
line=
"
479"
column=
"36"
lean-forward=
"true"
selection-start-line=
"479"
selection-start-column=
"36"
selection-end-line=
"479"
selection-end-column=
"36
"
/>
<state
relative-caret-position=
"
183
"
>
<caret
line=
"
152"
column=
"42"
lean-forward=
"false"
selection-start-line=
"152"
selection-start-column=
"42"
selection-end-line=
"152"
selection-end-column=
"42
"
/>
<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=
"
366
"
>
<state
relative-caret-position=
"
1125
"
>
<caret
line=
"54"
column=
"9"
lean-forward=
"false"
selection-start-line=
"54"
selection-start-column=
"9"
selection-end-line=
"54"
selection-end-column=
"9"
/>
<folding
/>
</state>
...
...
@@ -2272,8 +2264,24 @@
</entry>
<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=
"436"
>
<caret
line=
"593"
column=
"50"
lean-forward=
"true"
selection-start-line=
"593"
selection-start-column=
"50"
selection-end-line=
"593"
selection-end-column=
"50"
/>
<state
relative-caret-position=
"-277"
>
<caret
line=
"81"
column=
"0"
lean-forward=
"true"
selection-start-line=
"81"
selection-start-column=
"0"
selection-end-line=
"81"
selection-end-column=
"0"
/>
<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=
"-162"
>
<caret
line=
"15"
column=
"12"
lean-forward=
"false"
selection-start-line=
"15"
selection-start-column=
"12"
selection-end-line=
"15"
selection-end-column=
"12"
/>
<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=
"275"
>
<caret
line=
"471"
column=
"8"
lean-forward=
"false"
selection-start-line=
"471"
selection-start-column=
"8"
selection-end-line=
"471"
selection-end-column=
"8"
/>
<folding
/>
</state>
</provider>
...
...
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
833eff93
...
...
@@ -469,6 +469,10 @@ public class ContractServiceImpl implements ContractService{
}
else
{
contract
.
setInvoice
(
contract
.
getInvoice
()
+
resource
.
getMoney
());
}
if
(
contract
.
getType
().
equals
(
ContractTypeEnum
.
INCREMENT
.
getKey
())){
contract
.
setStatus
(
"end"
);
}
contractRepository
.
save
(
contract
);
resource
.
setPlatform
(
contract
.
getPlatform
());
...
...
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