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
70849a07
Commit
70849a07
authored
7 years ago
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同
parent
95709d18
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
212 additions
and
176 deletions
+212
-176
workspace.xml
.idea/workspace.xml
+194
-168
ContractController.java
src/main/java/common/controller/ContractController.java
+2
-2
Contract.java
src/main/java/common/model/Contract.java
+9
-0
ContractRepository.java
src/main/java/common/repository/ContractRepository.java
+2
-2
ContractService.java
src/main/java/common/service/ContractService.java
+1
-1
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+4
-3
No files found.
.idea/workspace.xml
View file @
70849a07
...
...
@@ -2,23 +2,12 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad"
name=
"Default"
comment=
""
>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/controller/SaleAuthController.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/Contract.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/ContractBody.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/SaleAuth.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/SaleAuthRepository.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/SaleAuthService.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/util/DateUtil.java"
afterPath=
"$PROJECT_DIR$/src/main/java/util/DateUtil.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/model/Contract.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/Contract.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/target/"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -42,26 +31,32 @@
<file
leaf-file-name=
"Contract.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/Contract.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
2713
"
>
<caret
line=
"
237"
column=
"48"
lean-forward=
"true"
selection-start-line=
"237"
selection-start-column=
"48"
selection-end-line=
"237"
selection-end-column=
"48
"
/>
<state
relative-caret-position=
"
1472
"
>
<caret
line=
"
121"
column=
"16"
lean-forward=
"false"
selection-start-line=
"121"
selection-start-column=
"16"
selection-end-line=
"121"
selection-end-column=
"16
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#1412#1413#0"
expanded=
"true"
/>
<element
signature=
"e#1445#1446#0"
expanded=
"true"
/>
<element
signature=
"e#1497#1498#0"
expanded=
"true"
/>
<element
signature=
"e#1541#1542#0"
expanded=
"true"
/>
<element
signature=
"e#4070#4071#0"
expanded=
"true"
/>
<element
signature=
"e#4099#4100#0"
expanded=
"true"
/>
<element
signature=
"e#4143#4144#0"
expanded=
"true"
/>
<element
signature=
"e#4179#4180#0"
expanded=
"true"
/>
<element
signature=
"e#4229#4230#0"
expanded=
"true"
/>
<element
signature=
"e#4260#4261#0"
expanded=
"true"
/>
<element
signature=
"e#4308#4309#0"
expanded=
"true"
/>
<element
signature=
"e#4348#4349#0"
expanded=
"true"
/>
<element
signature=
"e#4403#4404#0"
expanded=
"true"
/>
<element
signature=
"e#4440#4441#0"
expanded=
"true"
/>
<element
signature=
"e#4500#4501#0"
expanded=
"true"
/>
<element
signature=
"e#4552#4553#0"
expanded=
"true"
/>
<element
signature=
"e#1439#1440#0"
expanded=
"true"
/>
<element
signature=
"e#1472#1473#0"
expanded=
"true"
/>
<element
signature=
"e#1524#1525#0"
expanded=
"true"
/>
<element
signature=
"e#1568#1569#0"
expanded=
"true"
/>
<element
signature=
"e#2581#2582#0"
expanded=
"true"
/>
<element
signature=
"e#2614#2615#0"
expanded=
"true"
/>
<element
signature=
"e#4097#4098#0"
expanded=
"true"
/>
<element
signature=
"e#4126#4127#0"
expanded=
"true"
/>
<element
signature=
"e#4170#4171#0"
expanded=
"true"
/>
<element
signature=
"e#4206#4207#0"
expanded=
"true"
/>
<element
signature=
"e#4239#4240#0"
expanded=
"true"
/>
<element
signature=
"e#4270#4271#0"
expanded=
"true"
/>
<element
signature=
"e#4316#4317#0"
expanded=
"true"
/>
<element
signature=
"e#4356#4357#0"
expanded=
"true"
/>
<element
signature=
"e#4406#4407#0"
expanded=
"true"
/>
<element
signature=
"e#4437#4438#0"
expanded=
"true"
/>
<element
signature=
"e#4485#4486#0"
expanded=
"true"
/>
<element
signature=
"e#4525#4526#0"
expanded=
"true"
/>
<element
signature=
"e#4580#4581#0"
expanded=
"true"
/>
<element
signature=
"e#4617#4618#0"
expanded=
"true"
/>
<element
signature=
"e#4677#4678#0"
expanded=
"true"
/>
<element
signature=
"e#4729#4730#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
...
...
@@ -70,8 +65,8 @@
<file
leaf-file-name=
"ContractRepository.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
283
"
>
<caret
line=
"
18"
column=
"14"
lean-forward=
"false"
selection-start-line=
"18"
selection-start-column=
"14"
selection-end-line=
"18"
selection-end-column=
"14
"
/>
<state
relative-caret-position=
"
366
"
>
<caret
line=
"
21"
column=
"23"
lean-forward=
"false"
selection-start-line=
"21"
selection-start-column=
"23"
selection-end-line=
"21"
selection-end-column=
"23
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
...
...
@@ -82,8 +77,8 @@
<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=
"
109
"
>
<caret
line=
"
23"
column=
"11"
lean-forward=
"false"
selection-start-line=
"23"
selection-start-column=
"11"
selection-end-line=
"23"
selection-end-column=
"11
"
/>
<state
relative-caret-position=
"
343
"
>
<caret
line=
"
31"
column=
"59"
lean-forward=
"true"
selection-start-line=
"31"
selection-start-column=
"27"
selection-end-line=
"31"
selection-end-column=
"59
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
...
...
@@ -91,11 +86,11 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"ContractServiceImpl.java"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"ContractServiceImpl.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=
"
63
"
>
<caret
line=
"
81"
column=
"0"
lean-forward=
"true"
selection-start-line=
"81"
selection-start-column=
"0"
selection-end-line=
"81"
selection-end-column=
"0
"
/>
<state
relative-caret-position=
"
367
"
>
<caret
line=
"
97"
column=
"32"
lean-forward=
"false"
selection-start-line=
"97"
selection-start-column=
"32"
selection-end-line=
"97"
selection-end-column=
"32
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#1648#1649#0"
expanded=
"true"
/>
...
...
@@ -104,45 +99,33 @@
<element
signature=
"e#2261#2262#0"
expanded=
"true"
/>
<element
signature=
"e#2544#2545#0"
expanded=
"true"
/>
<element
signature=
"e#2593#2594#0"
expanded=
"true"
/>
<element
signature=
"e#3
106#3107
#0"
expanded=
"true"
/>
<element
signature=
"e#3
133#3134
#0"
expanded=
"true"
/>
<element
signature=
"e#3
254#3255
#0"
expanded=
"true"
/>
<element
signature=
"e#3
281#3282
#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"Contract
Controller.java"
pinned=
"false"
current-in-tab=
"tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
controller/ContractController
.java"
>
<file
leaf-file-name=
"Contract
Money.java"
pinned=
"false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
model/ContractMoney
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1380"
>
<caret
line=
"71"
column=
"66"
lean-forward=
"true"
selection-start-line=
"71"
selection-start-column=
"66"
selection-end-line=
"71"
selection-end-column=
"66"
/>
<folding>
<element
signature=
"e#1291#1292#0"
expanded=
"true"
/>
<element
signature=
"e#1348#1349#0"
expanded=
"true"
/>
<element
signature=
"e#2330#2331#0"
expanded=
"true"
/>
<element
signature=
"e#2387#2388#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"PriceLevelMoneyRepository.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"98"
>
<caret
line=
"11"
column=
"83"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"83"
selection-end-line=
"11"
selection-end-column=
"83"
/>
<state
relative-caret-position=
"253"
>
<caret
line=
"11"
column=
"0"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"0"
selection-end-line=
"11"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
PriceLevelMoney
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
model/PriceLevelMoney
.java"
>
<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=
"1
66
"
>
<caret
line=
"
13"
column=
"30"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"20"
selection-end-line=
"13"
selection-end-column=
"30
"
/>
<state
relative-caret-position=
"1
83
"
>
<caret
line=
"
30"
column=
"41"
lean-forward=
"false"
selection-start-line=
"30"
selection-start-column=
"41"
selection-end-line=
"30"
selection-end-column=
"41
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#1330#1331#0"
expanded=
"true"
/>
<element
signature=
"e#1387#1388#0"
expanded=
"true"
/>
<element
signature=
"e#2369#2370#0"
expanded=
"true"
/>
<element
signature=
"e#2426#2427#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
...
...
@@ -195,7 +178,6 @@
<component
name=
"IdeDocumentHistory"
>
<option
name=
"CHANGED_PATHS"
>
<list>
<option
value=
"$PROJECT_DIR$/src/main/java/office/service/impl/AccountFlowRestrictServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/office/service/AccountFlowRestrictService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/office/service/impl/OffAccountFlowRestrictServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java"
/>
...
...
@@ -240,12 +222,13 @@
<option
value=
"$PROJECT_DIR$/src/main/java/util/DateUtil.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/Contract.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/
repository/ContractRepositor
y.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/
model/ContractMone
y.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
</list>
</option>
</component>
...
...
@@ -721,7 +704,7 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"
controller
"
/>
<option
name=
"myItemId"
value=
"
model
"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
...
...
@@ -1213,7 +1196,7 @@
<workItem
from=
"1515728204617"
duration=
"796000"
/>
<workItem
from=
"1515983952975"
duration=
"10545000"
/>
<workItem
from=
"1516096949113"
duration=
"5148000"
/>
<workItem
from=
"1516155511499"
duration=
"
18532
000"
/>
<workItem
from=
"1516155511499"
duration=
"
24451
000"
/>
</task>
<task
id=
"LOCAL-00003"
summary=
"Merge branch 'master' of git.minrow.com:reyun/manager # Conflicts: #	pom.xml #	target/classes/common.properties #	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst "
>
<created>
1514871143365
</created>
...
...
@@ -1523,56 +1506,63 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1516010601133
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"47"
/>
<task
id=
"LOCAL-00047"
summary=
"合同"
>
<created>
1516187770796
</created>
<option
name=
"number"
value=
"00047"
/>
<option
name=
"presentableId"
value=
"LOCAL-00047"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1516187770796
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"48"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"1
89310
000"
/>
<option
name=
"totallyTimeSpent"
value=
"1
95229
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
<editor
active=
"
fals
e"
/>
<editor
active=
"
tru
e"
/>
<layout>
<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=
"
7
"
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=
"
6
"
side_tool=
"false"
content_ui=
"tabs"
/>
<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.42389524"
sideWeight=
"0.50680786"
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.46747354"
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.33"
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=
"
8
"
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.2
5"
sideWeight=
"0.5"
order=
"9
"
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.2
4962178"
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"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.45499182"
sideWeight=
"0.5"
order=
"10"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"TODO"
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=
"1
3
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"TODO"
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=
"1
8
"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Image Layers"
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=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"
4
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"
true"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"tru
e"
show_stripe_button=
"true"
weight=
"0.5155483"
sideWeight=
"0.49546143"
order=
"2"
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.
3633388
"
sideWeight=
"0.49319214"
order=
"9"
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=
"Version Control"
active=
"
false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"fals
e"
show_stripe_button=
"true"
weight=
"0.5155483"
sideWeight=
"0.49546143"
order=
"2"
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.
41734862
"
sideWeight=
"0.49319214"
order=
"9"
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"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.28441754"
sideWeight=
"0.5"
order=
"
7
"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Bean Validation"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32980332"
sideWeight=
"0.5"
order=
"
5
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.28441754"
sideWeight=
"0.5"
order=
"
8
"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Bean Validation"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32980332"
sideWeight=
"0.5"
order=
"
6
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Web"
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=
"4"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Theme Preview"
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=
"
6
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
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=
"
5
"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Theme Preview"
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=
"
7
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
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=
"
6
"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
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=
"tabs"
/>
<window_info
id=
"Message"
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=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"
8
"
side_tool=
"false"
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=
"1
1
"
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=
"1
2
"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"1
0
"
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=
"
3
"
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=
"1
3
"
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=
"1
3
"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"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=
"1
2
"
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=
"1
3
"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"1
1
"
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=
"1
5
"
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=
"1
6
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Messages"
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=
"0"
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=
"1
2
"
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=
"1
4
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"CheckStyle"
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=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Gradle View"
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
3
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"JRebel"
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=
"
4
"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Gradle View"
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
7
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"JRebel"
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=
"
5
"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Find"
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=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
</layout>
<layout-to-restore>
...
...
@@ -1589,30 +1579,30 @@
<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=
"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=
"
3
"
side_tool=
"false"
content_ui=
"tabs"
/>
<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.33"
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.2
5
"
sideWeight=
"0.5"
order=
"10"
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.2
4962178
"
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"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.45499182"
sideWeight=
"0.5"
order=
"10"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"TODO"
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=
"1
7
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"TODO"
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=
"1
8
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Messages"
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=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"
4
"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"
3
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Image Layers"
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=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"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=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
true"
show_stripe_button=
"true"
weight=
"0.3633388
"
sideWeight=
"0.49319214"
order=
"9"
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.3
3
"
sideWeight=
"0.5"
order=
"3"
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.41734862
"
sideWeight=
"0.49319214"
order=
"9"
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.3
289689
"
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"
/>
<window_info
id=
"CheckStyle"
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=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.28441754"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Bean Validation"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32980332"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Web"
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=
"4"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Gradle View"
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
8
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Gradle View"
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
7
"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"JRebel"
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=
"5"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Find"
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=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Theme Preview"
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=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1655,7 +1645,8 @@
<MESSAGE
value=
"定时任务"
/>
<MESSAGE
value=
"定时任务 删除appinfo重复数据"
/>
<MESSAGE
value=
"定时任务 刷新tkio表数据"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"定时任务 刷新tkio表数据"
/>
<MESSAGE
value=
"合同"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"合同"
/>
</component>
<component
name=
"XDebuggerManager"
>
<breakpoint-manager>
...
...
@@ -1693,14 +1684,6 @@
<option
name=
"FILTER_TARGETS"
value=
"false"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/IOpenApiService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"230"
>
<caret
line=
"10"
column=
"17"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"17"
selection-end-line=
"10"
selection-end-column=
"17"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/target/maven-archiver/pom.properties"
/>
<entry
file=
"file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"504"
>
...
...
@@ -1881,6 +1864,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"138"
>
<caret
line=
"9"
column=
"0"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"0"
selection-end-line=
"9"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1888,6 +1872,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"138"
>
<caret
line=
"6"
column=
"0"
lean-forward=
"false"
selection-start-line=
"6"
selection-start-column=
"0"
selection-end-line=
"6"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1902,6 +1887,25 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"182"
>
<caret
line=
"23"
column=
"21"
lean-forward=
"true"
selection-start-line=
"23"
selection-start-column=
"21"
selection-end-line=
"23"
selection-end-column=
"21"
/>
<folding>
<element
signature=
"imports"
expanded=
"false"
/>
<element
signature=
"e#354#355#0"
expanded=
"false"
/>
<element
signature=
"e#379#380#0"
expanded=
"false"
/>
<element
signature=
"e#413#414#0"
expanded=
"false"
/>
<element
signature=
"e#441#442#0"
expanded=
"false"
/>
<element
signature=
"e#472#473#0"
expanded=
"false"
/>
<element
signature=
"e#499#500#0"
expanded=
"false"
/>
<element
signature=
"e#539#540#0"
expanded=
"false"
/>
<element
signature=
"e#571#572#0"
expanded=
"false"
/>
<element
signature=
"e#608#609#0"
expanded=
"false"
/>
<element
signature=
"e#640#641#0"
expanded=
"false"
/>
<element
signature=
"e#691#692#0"
expanded=
"false"
/>
<element
signature=
"e#733#734#0"
expanded=
"false"
/>
<element
signature=
"e#764#765#0"
expanded=
"false"
/>
<element
signature=
"e#793#794#0"
expanded=
"false"
/>
<element
signature=
"e#835#836#0"
expanded=
"false"
/>
<element
signature=
"e#871#872#0"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -2006,82 +2010,117 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
model/Contract
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
repository/UserRepository
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2713"
>
<caret
line=
"237"
column=
"48"
lean-forward=
"true"
selection-start-line=
"237"
selection-start-column=
"48"
selection-end-line=
"237"
selection-end-column=
"48"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#1412#1413#0"
expanded=
"true"
/>
<element
signature=
"e#1445#1446#0"
expanded=
"true"
/>
<element
signature=
"e#1497#1498#0"
expanded=
"true"
/>
<element
signature=
"e#1541#1542#0"
expanded=
"true"
/>
<element
signature=
"e#4070#4071#0"
expanded=
"true"
/>
<element
signature=
"e#4099#4100#0"
expanded=
"true"
/>
<element
signature=
"e#4143#4144#0"
expanded=
"true"
/>
<element
signature=
"e#4179#4180#0"
expanded=
"true"
/>
<element
signature=
"e#4229#4230#0"
expanded=
"true"
/>
<element
signature=
"e#4260#4261#0"
expanded=
"true"
/>
<element
signature=
"e#4308#4309#0"
expanded=
"true"
/>
<element
signature=
"e#4348#4349#0"
expanded=
"true"
/>
<element
signature=
"e#4403#4404#0"
expanded=
"true"
/>
<element
signature=
"e#4440#4441#0"
expanded=
"true"
/>
<element
signature=
"e#4500#4501#0"
expanded=
"true"
/>
<element
signature=
"e#4552#4553#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"430"
>
<caret
line=
"29"
column=
"27"
lean-forward=
"false"
selection-start-line=
"29"
selection-start-column=
"15"
selection-end-line=
"29"
selection-end-column=
"27"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
repository/ContractRepositor
y.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
model/PriceLevelMone
y.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
83
"
>
<caret
line=
"1
8"
column=
"14"
lean-forward=
"false"
selection-start-line=
"18"
selection-start-column=
"14"
selection-end-line=
"18"
selection-end-column=
"14
"
/>
<state
relative-caret-position=
"2
05
"
>
<caret
line=
"1
1"
column=
"30"
lean-forward=
"true"
selection-start-line=
"11"
selection-start-column=
"30"
selection-end-line=
"11"
selection-end-column=
"30
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/
User
Repository.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/
PriceLevelMoney
Repository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
430
"
>
<caret
line=
"
29"
column=
"27"
lean-forward=
"false"
selection-start-line=
"29"
selection-start-column=
"15"
selection-end-line=
"29"
selection-end-column=
"27
"
/>
<state
relative-caret-position=
"
161
"
>
<caret
line=
"
11"
column=
"83"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"83"
selection-end-line=
"11"
selection-end-column=
"83
"
/>
<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=
"183"
>
<caret
line=
"30"
column=
"41"
lean-forward=
"false"
selection-start-line=
"30"
selection-start-column=
"41"
selection-end-line=
"30"
selection-end-column=
"41"
/>
<folding>
<element
signature=
"e#1330#1331#0"
expanded=
"true"
/>
<element
signature=
"e#1387#1388#0"
expanded=
"true"
/>
<element
signature=
"e#2369#2370#0"
expanded=
"true"
/>
<element
signature=
"e#2426#2427#0"
expanded=
"true"
/>
</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=
"
109
"
>
<caret
line=
"
23"
column=
"11"
lean-forward=
"false"
selection-start-line=
"23"
selection-start-column=
"11"
selection-end-line=
"23"
selection-end-column=
"11
"
/>
<state
relative-caret-position=
"
343
"
>
<caret
line=
"
31"
column=
"59"
lean-forward=
"true"
selection-start-line=
"31"
selection-start-column=
"27"
selection-end-line=
"31"
selection-end-column=
"59
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"339"
>
<caret
line=
"69"
column=
"36"
lean-forward=
"true"
selection-start-line=
"69"
selection-start-column=
"36"
selection-end-line=
"69"
selection-end-column=
"36"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"166"
>
<caret
line=
"13"
column=
"30"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"20"
selection-end-line=
"13"
selection-end-column=
"30"
/>
<state
relative-caret-position=
"253"
>
<caret
line=
"11"
column=
"0"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"0"
selection-end-line=
"11"
selection-end-column=
"0"
/>
<folding
/>
</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=
"366"
>
<caret
line=
"21"
column=
"23"
lean-forward=
"false"
selection-start-line=
"21"
selection-start-column=
"23"
selection-end-line=
"21"
selection-end-column=
"23"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
repository/PriceLevelMoneyRepository
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
model/Contract
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"98"
>
<caret
line=
"11"
column=
"83"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"83"
selection-end-line=
"11"
selection-end-column=
"83"
/>
<folding
/>
<state
relative-caret-position=
"1472"
>
<caret
line=
"121"
column=
"16"
lean-forward=
"false"
selection-start-line=
"121"
selection-start-column=
"16"
selection-end-line=
"121"
selection-end-column=
"16"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#1439#1440#0"
expanded=
"true"
/>
<element
signature=
"e#1472#1473#0"
expanded=
"true"
/>
<element
signature=
"e#1524#1525#0"
expanded=
"true"
/>
<element
signature=
"e#1568#1569#0"
expanded=
"true"
/>
<element
signature=
"e#2581#2582#0"
expanded=
"true"
/>
<element
signature=
"e#2614#2615#0"
expanded=
"true"
/>
<element
signature=
"e#4097#4098#0"
expanded=
"true"
/>
<element
signature=
"e#4126#4127#0"
expanded=
"true"
/>
<element
signature=
"e#4170#4171#0"
expanded=
"true"
/>
<element
signature=
"e#4206#4207#0"
expanded=
"true"
/>
<element
signature=
"e#4239#4240#0"
expanded=
"true"
/>
<element
signature=
"e#4270#4271#0"
expanded=
"true"
/>
<element
signature=
"e#4316#4317#0"
expanded=
"true"
/>
<element
signature=
"e#4356#4357#0"
expanded=
"true"
/>
<element
signature=
"e#4406#4407#0"
expanded=
"true"
/>
<element
signature=
"e#4437#4438#0"
expanded=
"true"
/>
<element
signature=
"e#4485#4486#0"
expanded=
"true"
/>
<element
signature=
"e#4525#4526#0"
expanded=
"true"
/>
<element
signature=
"e#4580#4581#0"
expanded=
"true"
/>
<element
signature=
"e#4617#4618#0"
expanded=
"true"
/>
<element
signature=
"e#4677#4678#0"
expanded=
"true"
/>
<element
signature=
"e#4729#4730#0"
expanded=
"true"
/>
</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=
"
63
"
>
<caret
line=
"
81"
column=
"0"
lean-forward=
"true"
selection-start-line=
"81"
selection-start-column=
"0"
selection-end-line=
"81"
selection-end-column=
"0
"
/>
<state
relative-caret-position=
"
367
"
>
<caret
line=
"
97"
column=
"32"
lean-forward=
"false"
selection-start-line=
"97"
selection-start-column=
"32"
selection-end-line=
"97"
selection-end-column=
"32
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#1648#1649#0"
expanded=
"true"
/>
...
...
@@ -2090,21 +2129,8 @@
<element
signature=
"e#2261#2262#0"
expanded=
"true"
/>
<element
signature=
"e#2544#2545#0"
expanded=
"true"
/>
<element
signature=
"e#2593#2594#0"
expanded=
"true"
/>
<element
signature=
"e#3106#3107#0"
expanded=
"true"
/>
<element
signature=
"e#3133#3134#0"
expanded=
"true"
/>
</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=
"1380"
>
<caret
line=
"71"
column=
"66"
lean-forward=
"true"
selection-start-line=
"71"
selection-start-column=
"66"
selection-end-line=
"71"
selection-end-column=
"66"
/>
<folding>
<element
signature=
"e#1291#1292#0"
expanded=
"true"
/>
<element
signature=
"e#1348#1349#0"
expanded=
"true"
/>
<element
signature=
"e#2330#2331#0"
expanded=
"true"
/>
<element
signature=
"e#2387#2388#0"
expanded=
"true"
/>
<element
signature=
"e#3254#3255#0"
expanded=
"true"
/>
<element
signature=
"e#3281#3282#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/controller/ContractController.java
View file @
70849a07
...
...
@@ -27,8 +27,8 @@ public class ContractController {
@RequestMapping
(
value
=
"find"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ResultModel
findAll
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
startDate
)
{
return
ResultModel
.
OK
(
service
.
findAll
(
startDate
));
public
ResultModel
findAll
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
startDate
,
@RequestParam
String
endDate
)
{
return
ResultModel
.
OK
(
service
.
findAll
(
startDate
,
endDate
));
}
@RequestMapping
(
value
=
"checkAccount"
,
method
=
RequestMethod
.
GET
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/model/Contract.java
View file @
70849a07
...
...
@@ -29,6 +29,7 @@ public class Contract {
private
String
status
;
private
String
saleName
;
private
String
priceLevelName
;
private
Long
payMoney
;
private
Long
modifyAccount
;
private
Long
createAccount
;
...
...
@@ -206,6 +207,14 @@ public class Contract {
this
.
status
=
status
;
}
public
Long
getPayMoney
()
{
return
payMoney
;
}
public
void
setPayMoney
(
Long
payMoney
)
{
this
.
payMoney
=
payMoney
;
}
@Transient
public
String
getSaleName
()
{
return
saleName
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/repository/ContractRepository.java
View file @
70849a07
...
...
@@ -18,6 +18,6 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query
(
value
=
"select count(*) from contract where email = ?1"
,
nativeQuery
=
true
)
BigInteger
countNumByEmail
(
String
email
);
@Query
(
value
=
"select * from contract where
start_date = ?1 order by start_date
desc"
,
nativeQuery
=
true
)
List
<
Contract
>
findByDs
(
String
ds
);
@Query
(
value
=
"select * from contract where
ds >= ?1 and ds <= ?2 order by ds
desc"
,
nativeQuery
=
true
)
List
<
Contract
>
findByDs
(
String
startDate
,
String
endDate
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/ContractService.java
View file @
70849a07
...
...
@@ -29,6 +29,6 @@ public interface ContractService {
Contract
update
(
User
loginUser
,
Contract
resource
);
List
<
Contract
>
findAll
(
String
ds
);
List
<
Contract
>
findAll
(
String
startDate
,
String
endDate
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
70849a07
...
...
@@ -94,7 +94,8 @@ public class ContractServiceImpl implements ContractService{
resource
.
setDs
(
DateUtil
.
getBeforeDays
(
0
));
resource
.
setStatus
(
"executing"
);
}
Double
rebat
=
getRebat
(
resource
.
getProduct
(),
resource
.
getPriceLevel
().
intValue
(),
resource
.
getMoney
());
resource
.
setRebate
(
rebat
);
return
contractRepository
.
save
(
resource
);
}
...
...
@@ -104,7 +105,7 @@ public class ContractServiceImpl implements ContractService{
}
@Override
public
List
<
Contract
>
findAll
(
String
ds
)
{
public
List
<
Contract
>
findAll
(
String
startDate
,
String
endDate
)
{
List
<
Contract
>
result
=
new
ArrayList
<>();
List
<
User
>
sales
=
userRepository
.
findAllSales
();
Map
<
Long
,
String
>
saleMap
=
new
HashMap
<>();
...
...
@@ -120,7 +121,7 @@ public class ContractServiceImpl implements ContractService{
typeMap
.
put
(
s
.
getId
(),
s
.
getPackageName
());
}
}
List
<
Contract
>
contractList
=
contractRepository
.
findByDs
(
ds
);
List
<
Contract
>
contractList
=
contractRepository
.
findByDs
(
startDate
,
endDate
);
if
(
ValidateUtil
.
isValid
(
contractList
)){
for
(
Contract
c
:
contractList
){
c
.
setSaleName
(
saleMap
.
containsKey
(
c
.
getSale
())
?
saleMap
.
get
(
c
.
getSale
())
:
""
);
...
...
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