Skip to content

M
manager
Commit 8a2892f5 by manxiaoqiang
Options

2

parent 7cc35fec
Showing with 14 additions and 15 deletions
.idea/workspace.xml
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <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$/.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/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> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -36,8 +35,8 @@ ...@@ -36,8 +35,8 @@
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="true"> <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"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="920"> <state relative-caret-position="138">
<caret line="367" column="13" lean-forward="false" selection-start-line="367" selection-start-column="13" selection-end-line="367" selection-end-column="13" /> <caret line="348" column="55" lean-forward="true" selection-start-line="348" selection-start-column="55" selection-end-line="348" selection-end-column="55" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1193,13 +1192,6 @@ ...@@ -1193,13 +1192,6 @@
<workItem from="1523843445576" duration="7238000" /> <workItem from="1523843445576" duration="7238000" />
<workItem from="1523876594256" duration="75800000" /> <workItem from="1523876594256" duration="75800000" />
</task> </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排序"> <task id="LOCAL-00081" summary="app排序">
<created>1517477432252</created> <created>1517477432252</created>
<option name="number" value="00081" /> <option name="number" value="00081" />
...@@ -1536,11 +1528,18 @@ ...@@ -1536,11 +1528,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1524728497519</updated> <updated>1524728497519</updated>
</task> </task>
<option name="localTasksCounter" value="129" /> <task id="LOCAL-00129" summary="2&#10;">
<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 /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="503745000" /> <option name="totallyTimeSpent" value="504496000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
...@@ -2128,8 +2127,8 @@ ...@@ -2128,8 +2127,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="920"> <state relative-caret-position="138">
<caret line="367" column="13" lean-forward="false" selection-start-line="367" selection-start-column="13" selection-end-line="367" selection-end-column="13" /> <caret line="348" column="55" lean-forward="true" selection-start-line="348" selection-start-column="55" selection-end-line="348" selection-end-column="55" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/main/java/common/service/impl/ContractServiceImpl.java
...@@ -346,7 +346,7 @@ public class ContractServiceImpl implements ContractService{ ...@@ -346,7 +346,7 @@ public class ContractServiceImpl implements ContractService{
} }
if(contract.getPlatform().equals("tkio")){ if(contract.getPlatform().equals("tkio")){
if(resource.getPlatform().equals("tkio")) { if(contract.getPlatform().equals("tkio")) {
IncrementFlow flow = incrementFlowRepository.findOne(resource.getContractCode()); IncrementFlow flow = incrementFlowRepository.findOne(resource.getContractCode());
if (null != flow) { if (null != flow) {
flow.setEndDate(resource.getEndDate()); flow.setEndDate(resource.getEndDate());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment