Commit cea61169 by manxiaoqiang

2

parent 838f61c7
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,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="-1081"> <state relative-caret-position="299">
<caret line="208" column="49" lean-forward="false" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" /> <caret line="193" column="57" lean-forward="true" selection-start-line="193" selection-start-column="57" selection-end-line="193" selection-end-column="57" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1302,13 +1302,6 @@ ...@@ -1302,13 +1302,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-00055" summary="合同">
<created>1516676016551</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1516676016551</updated>
</task>
<task id="LOCAL-00056" summary="合同"> <task id="LOCAL-00056" summary="合同">
<created>1516955508508</created> <created>1516955508508</created>
<option name="number" value="00056" /> <option name="number" value="00056" />
...@@ -1645,11 +1638,18 @@ ...@@ -1645,11 +1638,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1524452814567</updated> <updated>1524452814567</updated>
</task> </task>
<option name="localTasksCounter" value="104" /> <task id="LOCAL-00104" summary="2&#10;">
<created>1524470845494</created>
<option name="number" value="00104" />
<option name="presentableId" value="LOCAL-00104" />
<option name="project" value="LOCAL" />
<updated>1524470845494</updated>
</task>
<option name="localTasksCounter" value="105" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="466192000" /> <option name="totallyTimeSpent" value="466526000" />
</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" />
...@@ -2206,8 +2206,8 @@ ...@@ -2206,8 +2206,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="-1081"> <state relative-caret-position="299">
<caret line="208" column="49" lean-forward="false" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" /> <caret line="193" column="57" lean-forward="true" selection-start-line="193" selection-start-column="57" selection-end-line="193" selection-end-column="57" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -191,6 +191,7 @@ public class ContractServiceImpl implements ContractService{ ...@@ -191,6 +191,7 @@ public class ContractServiceImpl implements ContractService{
contract.setCustomerBody(account.getCompany()); contract.setCustomerBody(account.getCompany());
contract.setType("increment"); contract.setType("increment");
contract.setPlatform("tkio"); contract.setPlatform("tkio");
contract.setStartDate(DateUtil.getBeforeDays(0));
ContractIncrement contractIncrement = contractIncrementRepository.findByCode(contract.getPriceLevelName()); ContractIncrement contractIncrement = contractIncrementRepository.findByCode(contract.getPriceLevelName());
contract.setPriceLevel(contractIncrement.getId()); contract.setPriceLevel(contractIncrement.getId());
Contract contract1 = create(null, contract); Contract contract1 = create(null, contract);
......
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