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
d40b99e5
Commit
d40b99e5
authored
Apr 23, 2018
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二版
parent
7f5e60bc
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
243 additions
and
174 deletions
+243
-174
workspace.xml
.idea/workspace.xml
+171
-174
ContractController.java
src/main/java/common/controller/ContractController.java
+7
-0
ContractRepository.java
src/main/java/common/repository/ContractRepository.java
+3
-0
ContractService.java
src/main/java/common/service/ContractService.java
+2
-0
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+43
-0
TkioAccountServiceImpl.java
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
+17
-0
No files found.
.idea/workspace.xml
View file @
d40b99e5
...
...
@@ -3,7 +3,11 @@
<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$/pom.xml"
afterPath=
"$PROJECT_DIR$/pom.xml"
/>
<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/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"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/target/"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -24,88 +28,92 @@
<component
name=
"ExecutionTargetManager"
SELECTED_TARGET=
"default_target"
/>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<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=
"368"
>
<caret
line=
"36"
column=
"57"
lean-forward=
"false"
selection-start-line=
"36"
selection-start-column=
"57"
selection-end-line=
"36"
selection-end-column=
"57"
/>
<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=
"
161
"
>
<caret
line=
"1
87"
column=
"40"
lean-forward=
"false"
selection-start-line=
"187"
selection-start-column=
"40"
selection-end-line=
"187"
selection-end-column=
"40
"
/>
<state
relative-caret-position=
"
260
"
>
<caret
line=
"1
37"
column=
"42"
lean-forward=
"true"
selection-start-line=
"137"
selection-start-column=
"42"
selection-end-line=
"137"
selection-end-column=
"42
"
/>
<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=
"
applicationContext-schedule.xml"
pinned=
"false"
current-in-tab=
"tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
resources/spring/applicationContext-schedule.xml
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
19
4"
>
<caret
line=
"
27"
column=
"13"
lean-forward=
"false"
selection-start-line=
"27"
selection-start-column=
"13"
selection-end-line=
"27"
selection-end-column=
"13
"
/>
<state
relative-caret-position=
"
84
4"
>
<caret
line=
"
44"
column=
"65"
lean-forward=
"false"
selection-start-line=
"44"
selection-start-column=
"65"
selection-end-line=
"44"
selection-end-column=
"65
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ContractService
Impl
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/
impl/ContractServiceImpl
.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=
"
148
"
>
<caret
line=
"
216"
column=
"29"
lean-forward=
"false"
selection-start-line=
"216"
selection-start-column=
"29"
selection-end-line=
"216"
selection-end-column=
"29
"
/>
<state
relative-caret-position=
"
206
"
>
<caret
line=
"
15"
column=
"21"
lean-forward=
"false"
selection-start-line=
"15"
selection-start-column=
"12"
selection-end-line=
"15"
selection-end-column=
"21
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
AccountService
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/AccountService
.java"
>
<file
leaf-file-name=
"
ContractServiceImpl
.java"
pinned=
"false"
current-in-tab=
"false"
>
<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=
"230"
>
<caret
line=
"10"
column=
"12"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"12"
selection-end-line=
"10"
selection-end-column=
"12"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"306"
>
<caret
line=
"573"
column=
"16"
lean-forward=
"true"
selection-start-line=
"573"
selection-start-column=
"16"
selection-end-line=
"573"
selection-end-column=
"16"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
AccountServiceImpl
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/impl/AccountServiceImpl
.java"
>
<file
leaf-file-name=
"
UserService
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/service/UserService
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
470
"
>
<caret
line=
"
61"
column=
"29"
lean-forward=
"true"
selection-start-line=
"61"
selection-start-column=
"29"
selection-end-line=
"61"
selection-end-column=
"29
"
/>
<state
relative-caret-position=
"
398
"
>
<caret
line=
"
40"
column=
"15"
lean-forward=
"false"
selection-start-line=
"40"
selection-start-column=
"15"
selection-end-line=
"40"
selection-end-column=
"15
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
logback.xml
"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
resources/logback/product/logback.xml
"
>
<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=
"25
3
"
>
<caret
line=
"
11"
column=
"42"
lean-forward=
"true"
selection-start-line=
"11"
selection-start-column=
"42"
selection-end-line=
"11"
selection-end-column=
"42
"
/>
<state
relative-caret-position=
"25
2
"
>
<caret
line=
"
39"
column=
"54"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"13"
selection-end-line=
"39"
selection-end-column=
"54
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
pom.xml"
pinned=
"false"
current-in-tab=
"tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/
pom.xml
"
>
<file
leaf-file-name=
"
TkioAccountService.java"
pinned=
"false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/
src/main/java/tkio/service/TkioAccountService.java
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
035
"
>
<caret
line=
"1
20"
column=
"61"
lean-forward=
"true"
selection-start-line=
"120"
selection-start-column=
"61"
selection-end-line=
"120"
selection-end-column=
"61
"
/>
<state
relative-caret-position=
"1
94
"
>
<caret
line=
"1
3"
column=
"16"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"16"
selection-end-line=
"13"
selection-end-column=
"16
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
Account
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/
model/Account
.java"
>
<file
leaf-file-name=
"
TkioAccountServiceImpl
.java"
pinned=
"false"
current-in-tab=
"false"
>
<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=
"161"
>
<caret
line=
"72"
column=
"41"
lean-forward=
"false"
selection-start-line=
"72"
selection-start-column=
"41"
selection-end-line=
"72"
selection-end-column=
"41"
/>
<folding>
<element
signature=
"e#2175#2176#0"
expanded=
"true"
/>
<element
signature=
"e#2235#2236#0"
expanded=
"true"
/>
<element
signature=
"e#2280#2281#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"344"
>
<caret
line=
"112"
column=
"58"
lean-forward=
"false"
selection-start-line=
"112"
selection-start-column=
"58"
selection-end-line=
"112"
selection-end-column=
"58"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -203,8 +211,6 @@
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/ContractIncrementRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/service/IOAccountService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/dic/RoleEnum.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/model/Crowd.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/repository/CrowdRepository.java"
/>
...
...
@@ -215,15 +221,17 @@
<option
value=
"$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/model/IncrementFlow.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/repository/IncrementFlowRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/model/Account.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/pom.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.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/impl/ContractServiceImpl.java"
/>
</list>
</option>
</component>
...
...
@@ -545,11 +553,7 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"userio"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"task"
/>
<option
name=
"myItemId"
value=
"tkio"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
...
...
@@ -575,11 +579,11 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"
user
io"
/>
<option
name=
"myItemId"
value=
"
tk
io"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"
service
"
/>
<option
name=
"myItemId"
value=
"
controller
"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
...
...
@@ -605,15 +609,7 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"userio"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"service"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"impl"
/>
<option
name=
"myItemId"
value=
"dic"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
...
...
@@ -639,7 +635,7 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"
userio
"
/>
<option
name=
"myItemId"
value=
"
common
"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
...
...
@@ -668,6 +664,10 @@
<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>
...
...
@@ -1176,14 +1176,7 @@
<workItem
from=
"1517902340876"
duration=
"6159000"
/>
<workItem
from=
"1522052551509"
duration=
"4324000"
/>
<workItem
from=
"1523843445576"
duration=
"7238000"
/>
<workItem
from=
"1523876594256"
duration=
"63713000"
/>
</task>
<task
id=
"LOCAL-00050"
summary=
"合同"
>
<created>
1516592276562
</created>
<option
name=
"number"
value=
"00050"
/>
<option
name=
"presentableId"
value=
"LOCAL-00050"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1516592276562
</updated>
<workItem
from=
"1523876594256"
duration=
"73571000"
/>
</task>
<task
id=
"LOCAL-00051"
summary=
"合同"
>
<created>
1516611136767
</created>
...
...
@@ -1521,11 +1514,18 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524206069453
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"99"
/>
<task
id=
"LOCAL-00099"
summary=
"二版 "
>
<created>
1524209788379
</created>
<option
name=
"number"
value=
"00099"
/>
<option
name=
"presentableId"
value=
"LOCAL-00099"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524209788379
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"100"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"4
51060
000"
/>
<option
name=
"totallyTimeSpent"
value=
"4
60918
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
...
...
@@ -1549,7 +1549,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=
"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=
"false"
show_stripe_button=
"true"
weight=
"0.
333878
87"
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.
546644
87"
sideWeight=
"0.49016643"
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.2927383"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -1603,7 +1603,7 @@
<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=
"false"
show_stripe_button=
"true"
weight=
"0.
333878
87"
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.
546644
87"
sideWeight=
"0.49016643"
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=
"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"
/>
...
...
@@ -1762,14 +1762,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"361"
>
<caret
line=
"50"
column=
"67"
lean-forward=
"false"
selection-start-line=
"50"
selection-start-column=
"67"
selection-end-line=
"50"
selection-end-column=
"67"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/PressMoneyRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"322"
>
...
...
@@ -1810,17 +1802,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/Contract.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"252"
>
<caret
line=
"235"
column=
"21"
lean-forward=
"false"
selection-start-line=
"235"
selection-start-column=
"21"
selection-end-line=
"235"
selection-end-column=
"21"
/>
<folding>
<element
signature=
"e#4694#4695#0"
expanded=
"true"
/>
<element
signature=
"e#4721#4722#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/util/ValidateUtil.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"194"
>
...
...
@@ -1837,22 +1818,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/UserService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"366"
>
<caret
line=
"40"
column=
"15"
lean-forward=
"false"
selection-start-line=
"40"
selection-start-column=
"15"
selection-end-line=
"40"
selection-end-column=
"15"
/>
<folding
/>
</state>
</provider>
</entry>
<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=
"183"
>
<caret
line=
"328"
column=
"27"
lean-forward=
"true"
selection-start-line=
"328"
selection-start-column=
"27"
selection-end-line=
"328"
selection-end-column=
"27"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/repository/CrowdRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"184"
>
...
...
@@ -1869,14 +1834,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=
"-1863"
>
<caret
line=
"21"
column=
"36"
lean-forward=
"true"
selection-start-line=
"21"
selection-start-column=
"36"
selection-end-line=
"21"
selection-end-column=
"36"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"252"
>
...
...
@@ -1945,14 +1902,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"276"
>
<caret
line=
"12"
column=
"0"
lean-forward=
"true"
selection-start-line=
"12"
selection-start-column=
"0"
selection-end-line=
"12"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"230"
>
...
...
@@ -1997,22 +1946,6 @@
</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=
"183"
>
<caret
line=
"36"
column=
"27"
lean-forward=
"false"
selection-start-line=
"36"
selection-start-column=
"27"
selection-end-line=
"36"
selection-end-column=
"27"
/>
<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=
"573"
>
<caret
line=
"50"
column=
"14"
lean-forward=
"false"
selection-start-line=
"50"
selection-start-column=
"14"
selection-end-line=
"50"
selection-end-column=
"14"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"620"
>
...
...
@@ -2021,14 +1954,6 @@
</state>
</provider>
</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=
"7779"
>
<caret
line=
"514"
column=
"59"
lean-forward=
"true"
selection-start-line=
"514"
selection-start-column=
"59"
selection-end-line=
"514"
selection-end-column=
"59"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/model/IncrementFlow.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"734"
>
...
...
@@ -2050,26 +1975,38 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/controller/ContractController
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/model/Account
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"161"
>
<caret
line=
"187"
column=
"40"
lean-forward=
"false"
selection-start-line=
"187"
selection-start-column=
"40"
selection-end-line=
"187"
selection-end-column=
"40"
/>
<caret
line=
"72"
column=
"41"
lean-forward=
"false"
selection-start-line=
"72"
selection-start-column=
"41"
selection-end-line=
"72"
selection-end-column=
"41"
/>
<folding>
<element
signature=
"e#2175#2176#0"
expanded=
"true"
/>
<element
signature=
"e#2235#2236#0"
expanded=
"true"
/>
<element
signature=
"e#2280#2281#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"253"
>
<caret
line=
"11"
column=
"42"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"42"
selection-end-line=
"11"
selection-end-column=
"42"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
src/main/java/common/service/ContractService.java
"
>
<entry
file=
"file://$PROJECT_DIR$/
pom.xml
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
194
"
>
<caret
line=
"
27"
column=
"13"
lean-forward=
"false"
selection-start-line=
"27"
selection-start-column=
"13"
selection-end-line=
"27"
selection-end-column=
"13
"
/>
<state
relative-caret-position=
"
299
"
>
<caret
line=
"
103"
column=
"62"
lean-forward=
"false"
selection-start-line=
"103"
selection-start-column=
"47"
selection-end-line=
"103"
selection-end-column=
"62
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/service/impl/Contrac
tServiceImpl.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/impl/Accoun
tServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
148
"
>
<caret
line=
"
216"
column=
"29"
lean-forward=
"false"
selection-start-line=
"216"
selection-start-column=
"29"
selection-end-line=
"216"
selection-end-column=
"29
"
/>
<state
relative-caret-position=
"
552
"
>
<caret
line=
"
36"
column=
"0"
lean-forward=
"false"
selection-start-line=
"36"
selection-start-column=
"0"
selection-end-line=
"36"
selection-end-column=
"0
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -2079,43 +2016,103 @@
<state
relative-caret-position=
"230"
>
<caret
line=
"10"
column=
"12"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"12"
selection-end-line=
"10"
selection-end-column=
"12"
/>
<folding>
<element
signature=
"imports"
expanded=
"
tru
e"
/>
<element
signature=
"imports"
expanded=
"
fals
e"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/
model/Account
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/
controller/TkioAccountController
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"161"
>
<caret
line=
"72"
column=
"41"
lean-forward=
"false"
selection-start-line=
"72"
selection-start-column=
"41"
selection-end-line=
"72"
selection-end-column=
"41"
/>
<folding>
<element
signature=
"e#2175#2176#0"
expanded=
"true"
/>
<element
signature=
"e#2235#2236#0"
expanded=
"true"
/>
<element
signature=
"e#2280#2281#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"368"
>
<caret
line=
"36"
column=
"57"
lean-forward=
"false"
selection-start-line=
"36"
selection-start-column=
"57"
selection-end-line=
"36"
selection-end-column=
"57"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/
impl/AccountServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/
TkioAccountService
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
470
"
>
<caret
line=
"
61"
column=
"29"
lean-forward=
"true"
selection-start-line=
"61"
selection-start-column=
"29"
selection-end-line=
"61"
selection-end-column=
"29
"
/>
<state
relative-caret-position=
"
194
"
>
<caret
line=
"
13"
column=
"16"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"16"
selection-end-line=
"13"
selection-end-column=
"16
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/
resources/logback/product/logback.xml
"
>
<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=
"
253
"
>
<caret
line=
"11
"
column=
"42"
lean-forward=
"true"
selection-start-line=
"11"
selection-start-column=
"42"
selection-end-line=
"11"
selection-end-column=
"42
"
/>
<state
relative-caret-position=
"
344
"
>
<caret
line=
"11
2"
column=
"58"
lean-forward=
"false"
selection-start-line=
"112"
selection-start-column=
"58"
selection-end-line=
"112"
selection-end-column=
"58
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/pom.xml"
>
<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=
"-128"
>
<caret
line=
"329"
column=
"25"
lean-forward=
"false"
selection-start-line=
"329"
selection-start-column=
"19"
selection-end-line=
"329"
selection-end-column=
"25"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/UserService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"398"
>
<caret
line=
"40"
column=
"15"
lean-forward=
"false"
selection-start-line=
"40"
selection-start-column=
"15"
selection-end-line=
"40"
selection-end-column=
"15"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/Contract.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-300"
>
<caret
line=
"12"
column=
"13"
lean-forward=
"false"
selection-start-line=
"12"
selection-start-column=
"13"
selection-end-line=
"12"
selection-end-column=
"13"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"276"
>
<caret
line=
"12"
column=
"0"
lean-forward=
"true"
selection-start-line=
"12"
selection-start-column=
"0"
selection-end-line=
"12"
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=
"252"
>
<caret
line=
"39"
column=
"54"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"13"
selection-end-line=
"39"
selection-end-column=
"54"
/>
<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=
"306"
>
<caret
line=
"573"
column=
"16"
lean-forward=
"true"
selection-start-line=
"573"
selection-start-column=
"16"
selection-end-line=
"573"
selection-end-column=
"16"
/>
<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=
"206"
>
<caret
line=
"15"
column=
"21"
lean-forward=
"false"
selection-start-line=
"15"
selection-start-column=
"12"
selection-end-line=
"15"
selection-end-column=
"21"
/>
<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=
"137"
column=
"42"
lean-forward=
"true"
selection-start-line=
"137"
selection-start-column=
"42"
selection-end-line=
"137"
selection-end-column=
"42"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
1035
"
>
<caret
line=
"
120"
column=
"61"
lean-forward=
"true"
selection-start-line=
"120"
selection-start-column=
"61"
selection-end-line=
"120"
selection-end-column=
"61
"
/>
<state
relative-caret-position=
"
844
"
>
<caret
line=
"
44"
column=
"65"
lean-forward=
"false"
selection-start-line=
"44"
selection-start-column=
"65"
selection-end-line=
"44"
selection-end-column=
"65
"
/>
<folding
/>
</state>
</provider>
...
...
src/main/java/common/controller/ContractController.java
View file @
d40b99e5
...
...
@@ -144,6 +144,13 @@ public class ContractController {
return
ResultModel
.
OK
(
service
.
checkAccount
(
email
,
platform
));
}
@RequestMapping
(
value
=
"checkTime"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ResultModel
checkTime
(
@RequestParam
String
type
,
@RequestParam
String
email
,
@RequestParam
String
platform
,
@RequestParam
(
required
=
false
)
String
product
)
{
return
ResultModel
.
OK
(
service
.
checkTime
(
email
,
platform
,
type
,
product
));
}
@RequestMapping
(
value
=
"find/body"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ResultModel
findBody
(
@CurrentAccount
User
loginAccount
)
{
...
...
src/main/java/common/repository/ContractRepository.java
View file @
d40b99e5
...
...
@@ -36,6 +36,9 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query
(
value
=
"SELECT * from contract where platform = ?1 and email = ?2 and type = ?3 order by ds desc limit 1"
,
nativeQuery
=
true
)
Contract
findByPlatformAndEmailLimit1
(
String
platform
,
String
email
,
String
type
);
@Query
(
value
=
"SELECT * from contract where platform = ?1 and email = ?2 and type = ?3 and price_level = ?4 order by ds desc limit 1"
,
nativeQuery
=
true
)
Contract
findByPlatformAndEmailAndPricelevelLimit1
(
String
platform
,
String
email
,
String
type
,
Long
priceLevel
);
@Query
(
value
=
"SELECT * from contract where platform = ?1 and email = ?2 and (status = 'wait' or status = 'executing') and type = 'main' order by ds desc limit 1"
,
nativeQuery
=
true
)
Contract
findByPlatformAndEmailLimitVaild
(
String
platform
,
String
email
);
...
...
src/main/java/common/service/ContractService.java
View file @
d40b99e5
...
...
@@ -13,6 +13,8 @@ public interface ContractService {
Map
<
String
,
Object
>
checkAccount
(
String
email
,
String
platfrom
);
Boolean
checkTime
(
String
email
,
String
platfrom
,
String
type
,
String
product
);
List
<
ContractBody
>
findBody
();
String
getContractCode
(
String
code
);
...
...
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
d40b99e5
...
...
@@ -100,6 +100,35 @@ public class ContractServiceImpl implements ContractService{
}
@Override
public
Boolean
checkTime
(
String
email
,
String
platfrom
,
String
type
,
String
product
)
{
Boolean
flag
=
false
;
if
(
ContractTypeEnum
.
MAIN
.
getKey
().
equals
(
type
)){
Contract
contract
=
contractRepository
.
findByPlatformAndEmailLimit1
(
platfrom
,
email
,
type
);
if
(
null
==
contract
){
flag
=
true
;
}
else
{
String
beforeDay
=
DateUtil
.
getBeforeDays
(
180
);
if
(
beforeDay
.
compareTo
(
contract
.
getEndDate
())
>
0
){
flag
=
true
;
}
}
}
else
{
ContractIncrement
increment
=
contractIncrementRepository
.
findByCode
(
product
);
Contract
contract
=
contractRepository
.
findByPlatformAndEmailAndPricelevelLimit1
(
platfrom
,
email
,
type
,
increment
.
getId
());
if
(
null
==
contract
){
flag
=
true
;
}
else
{
String
beforeDay
=
DateUtil
.
getBeforeDays
(
180
);
String
endDate
=
contract
.
getEndDate
()
==
null
?
contract
.
getDs
()
:
contract
.
getEndDate
();
if
(
beforeDay
.
compareTo
(
endDate
)
>
0
){
flag
=
true
;
}
}
}
return
flag
;
}
@Override
public
List
<
ContractBody
>
findBody
()
{
return
contractBodyRepository
.
findAll
();
}
...
...
@@ -366,6 +395,7 @@ public class ContractServiceImpl implements ContractService{
List
<
User
>
userList
=
userService
.
findAllSons
(
loginAccount
.
getId
());
List
<
Long
>
idList
=
new
ArrayList
<>();
idList
.
add
(
loginAccount
.
getId
());
for
(
User
u
:
userList
){
idList
.
add
(
u
.
getId
());
}
...
...
@@ -414,6 +444,19 @@ public class ContractServiceImpl implements ContractService{
contract
.
setPriceLevelName
(
typeMap
.
containsKey
(
contract
.
getPriceLevel
())
?
typeMap
.
get
(
contract
.
getPriceLevel
())
:
""
);
contract
.
setCreateName
(
saleMap
.
containsKey
(
contract
.
getCreateAccount
())
?
saleMap
.
get
(
contract
.
getCreateAccount
())
:
""
);
Boolean
flag
=
null
;
if
(
contract
.
getPriceLevel
().
longValue
()
==
1
l
){
flag
=
checkTime
(
contract
.
getEmail
(),
contract
.
getPlatform
(),
contract
.
getType
(),
"black"
);
}
else
{
flag
=
checkTime
(
contract
.
getEmail
(),
contract
.
getPlatform
(),
contract
.
getType
(),
"analysis"
);
}
if
(
flag
){
contract
.
setContractType
(
"0"
);
}
else
{
contract
.
setContractType
(
"1"
);
}
return
contract
;
}
...
...
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
View file @
d40b99e5
...
...
@@ -213,6 +213,16 @@ public class TkioAccountServiceImpl implements TkioAccountService {
if
(
null
==
aw
){
return
null
;
}
List
<
SalesManLeader
>
roles
=
salesManLeaderRepository
.
findAll
();
Map
<
Long
,
String
>
busMap
=
new
HashMap
<>();
for
(
SalesManLeader
u
:
roles
){
busMap
.
put
((
long
)
u
.
getId
(),
u
.
getName
());
}
List
<
User
>
users
=
userRepository
.
findAll
();
Map
<
String
,
Long
>
saleMap
=
new
HashMap
<>();
for
(
User
u
:
users
){
saleMap
.
put
(
u
.
getEmail
(),
u
.
getId
());
}
List
<
BackVisit
>
backVisitList
=
backVisitRepository
.
findAllByPlatformAndEmail
(
"tkio"
,
email
);
if
(
ValidateUtil
.
isValid
(
backVisitList
)){
aw
.
setBackTime
(
backVisitList
.
size
());
...
...
@@ -234,6 +244,13 @@ public class TkioAccountServiceImpl implements TkioAccountService {
}
else
{
aw
.
setRemStatus
(
true
);
}
if
(
busMap
.
containsKey
(
aw
.
getBussinessMan
())){
aw
.
setSaleName
(
busMap
.
get
(
aw
.
getBussinessMan
()));
}
else
{
aw
.
setSaleName
(
""
);
}
return
aw
;
}
...
...
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