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
8a2892f5
Commit
8a2892f5
authored
6 years ago
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2
parent
7cc35fec
master
…
0727_bugfix
1082_bugfix
1151_bugfix
1209_bugfix
1315_bugfix
1439_bugfix
1608_bugfix
1608_from_1619
1619_bugfix
1990_bugfix
20180411
20180525_adi
20180530_bpu
2578_bugfix
2580_fix
31762_2_bugfix
31762_bugfix
31969_bugfix
32400_fix
32599_bugfix
649_bugfix
back_version
back_version2
bigfix_20201028
bugfix_1608_new
bugfix_1760
bugfix_master_1760
change_double
contract_rela
develper
liushaowei
manager_new
master_mv
mobvista_master
month_flow
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
15 deletions
+14
-15
workspace.xml
.idea/workspace.xml
+13
-14
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+1
-1
No files found.
.idea/workspace.xml
View file @
8a2892f5
...
...
@@ -4,7 +4,6 @@
<list
default=
"true"
id=
"e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/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/task/AccountCheck.java"
afterPath=
"$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/target/"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -36,8 +35,8 @@
<file
leaf-file-name=
"ContractServiceImpl.java"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
920
"
>
<caret
line=
"3
67"
column=
"13"
lean-forward=
"false"
selection-start-line=
"367"
selection-start-column=
"13"
selection-end-line=
"367"
selection-end-column=
"13
"
/>
<state
relative-caret-position=
"
138
"
>
<caret
line=
"3
48"
column=
"55"
lean-forward=
"true"
selection-start-line=
"348"
selection-start-column=
"55"
selection-end-line=
"348"
selection-end-column=
"55
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -1193,13 +1192,6 @@
<workItem
from=
"1523843445576"
duration=
"7238000"
/>
<workItem
from=
"1523876594256"
duration=
"75800000"
/>
</task>
<task
id=
"LOCAL-00080"
summary=
"app排序"
>
<created>
1517477130551
</created>
<option
name=
"number"
value=
"00080"
/>
<option
name=
"presentableId"
value=
"LOCAL-00080"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1517477130551
</updated>
</task>
<task
id=
"LOCAL-00081"
summary=
"app排序"
>
<created>
1517477432252
</created>
<option
name=
"number"
value=
"00081"
/>
...
...
@@ -1536,11 +1528,18 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524728497519
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"129"
/>
<task
id=
"LOCAL-00129"
summary=
"2 "
>
<created>
1524730718982
</created>
<option
name=
"number"
value=
"00129"
/>
<option
name=
"presentableId"
value=
"LOCAL-00129"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524730718982
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"130"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"50
3745
000"
/>
<option
name=
"totallyTimeSpent"
value=
"50
4496
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
...
...
@@ -2128,8 +2127,8 @@
</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=
"
920
"
>
<caret
line=
"3
67"
column=
"13"
lean-forward=
"false"
selection-start-line=
"367"
selection-start-column=
"13"
selection-end-line=
"367"
selection-end-column=
"13
"
/>
<state
relative-caret-position=
"
138
"
>
<caret
line=
"3
48"
column=
"55"
lean-forward=
"true"
selection-start-line=
"348"
selection-start-column=
"55"
selection-end-line=
"348"
selection-end-column=
"55
"
/>
<folding
/>
</state>
</provider>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
8a2892f5
...
...
@@ -346,7 +346,7 @@ public class ContractServiceImpl implements ContractService{
}
if
(
contract
.
getPlatform
().
equals
(
"tkio"
)){
if
(
resource
.
getPlatform
().
equals
(
"tkio"
))
{
if
(
contract
.
getPlatform
().
equals
(
"tkio"
))
{
IncrementFlow
flow
=
incrementFlowRepository
.
findOne
(
resource
.
getContractCode
());
if
(
null
!=
flow
)
{
flow
.
setEndDate
(
resource
.
getEndDate
());
...
...
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