Skip to content

M
manager
Commit 7cc35fec by manxiaoqiang
Options

2

parent 2949c5ec
Showing with 40 additions and 38 deletions
.idea/workspace.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<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/repository/IOAccount4WebRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/IOAccount4WebRepository.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" /> <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/" />
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false"> <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="368"> <state relative-caret-position="920">
<caret line="226" column="13" lean-forward="false" selection-start-line="226" selection-start-column="13" selection-end-line="226" selection-end-column="13" /> <caret line="367" column="13" lean-forward="false" selection-start-line="367" selection-start-column="13" selection-end-line="367" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
<file leaf-file-name="AccountCheck.java" pinned="false" current-in-tab="false"> <file leaf-file-name="AccountCheck.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175"> <state relative-caret-position="529">
<caret line="35" column="67" lean-forward="false" selection-start-line="35" selection-start-column="67" selection-end-line="35" selection-end-column="67" /> <caret line="36" column="48" lean-forward="false" selection-start-line="36" selection-start-column="48" selection-end-line="36" selection-end-column="48" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="IOAccount4WebRepository.java" pinned="false" current-in-tab="true"> <file leaf-file-name="IOAccount4WebRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/IOAccount4WebRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/IOAccount4WebRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366"> <state relative-caret-position="366">
...@@ -206,9 +206,9 @@ ...@@ -206,9 +206,9 @@
<option value="$PROJECT_DIR$/src/main/java/userio/service/IOAccountService.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/service/IOAccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/userio/repository/IOSalesManLeaderRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/repository/IOSalesManLeaderRepository.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" /> <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/IOAccount4WebRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/IOAccount4WebRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -1193,13 +1193,6 @@ ...@@ -1193,13 +1193,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-00079" summary="app排序">
<created>1517477110327</created>
<option name="number" value="00079" />
<option name="presentableId" value="LOCAL-00079" />
<option name="project" value="LOCAL" />
<updated>1517477110327</updated>
</task>
<task id="LOCAL-00080" summary="app排序"> <task id="LOCAL-00080" summary="app排序">
<created>1517477130551</created> <created>1517477130551</created>
<option name="number" value="00080" /> <option name="number" value="00080" />
...@@ -1536,11 +1529,18 @@ ...@@ -1536,11 +1529,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1524727895420</updated> <updated>1524727895420</updated>
</task> </task>
<option name="localTasksCounter" value="128" /> <task id="LOCAL-00128" summary="2&#10;">
<created>1524728497519</created>
<option name="number" value="00128" />
<option name="presentableId" value="LOCAL-00128" />
<option name="project" value="LOCAL" />
<updated>1524728497519</updated>
</task>
<option name="localTasksCounter" value="129" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="502955000" /> <option name="totallyTimeSpent" value="503745000" />
</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" />
...@@ -2052,14 +2052,6 @@ ...@@ -2052,14 +2052,6 @@
</state> </state>
</provider> </provider>
</entry> </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="368">
<caret line="226" column="13" lean-forward="false" selection-start-line="226" selection-start-column="13" selection-end-line="226" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115"> <state relative-caret-position="115">
...@@ -2068,14 +2060,6 @@ ...@@ -2068,14 +2060,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="35" column="67" lean-forward="false" selection-start-line="35" selection-start-column="67" selection-end-line="35" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/userio/controller/IoAccountController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/userio/controller/IoAccountController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390"> <state relative-caret-position="390">
...@@ -2134,6 +2118,22 @@ ...@@ -2134,6 +2118,22 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="36" column="48" lean-forward="false" selection-start-line="36" selection-start-column="48" selection-end-line="36" selection-end-column="48" />
<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="920">
<caret line="367" column="13" lean-forward="false" selection-start-line="367" selection-start-column="13" selection-end-line="367" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
src/main/java/common/service/impl/ContractServiceImpl.java
...@@ -346,15 +346,16 @@ public class ContractServiceImpl implements ContractService{ ...@@ -346,15 +346,16 @@ public class ContractServiceImpl implements ContractService{
} }
if(contract.getPlatform().equals("tkio")){ if(contract.getPlatform().equals("tkio")){
if(resource.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());
flow.setStartDate(resource.getStartDate()); flow.setStartDate(resource.getStartDate());
if(contract.getExtraFlow() != resource.getExtraFlow() ){ if (contract.getExtraFlow() != resource.getExtraFlow()) {
flow.setFlow(resource.getExtraFlow()); flow.setFlow(resource.getExtraFlow());
incrementFlowRepository.save(flow); incrementFlowRepository.save(flow);
} }
} else if(resource.getExtraFlow().longValue() > 0){ } else if (resource.getExtraFlow().longValue() > 0) {
IncrementFlow flow1 = new IncrementFlow(); IncrementFlow flow1 = new IncrementFlow();
Account account = accountRepository.findByEmail(contract.getEmail()); Account account = accountRepository.findByEmail(contract.getEmail());
flow1.setAccount(account.getId()); flow1.setAccount(account.getId());
...@@ -364,6 +365,7 @@ public class ContractServiceImpl implements ContractService{ ...@@ -364,6 +365,7 @@ public class ContractServiceImpl implements ContractService{
flow1.setContractCode(resource.getContractCode()); flow1.setContractCode(resource.getContractCode());
incrementFlowRepository.save(flow1); incrementFlowRepository.save(flow1);
} }
}
} }
contract.setExtraFlow(resource.getExtraFlow()); contract.setExtraFlow(resource.getExtraFlow());
......
src/main/java/tkio/task/AccountCheck.java
...@@ -34,7 +34,7 @@ public class AccountCheck { ...@@ -34,7 +34,7 @@ public class AccountCheck {
for(Account a: accountList){ for(Account a: accountList){
List<Contract> contractList = contractRepository.findByPlatformAndEmail("tkio", a.getEmail(), ContractTypeEnum.MAIN.getKey()); List<Contract> contractList = contractRepository.findByPlatformAndEmail("tkio", a.getEmail(), ContractTypeEnum.MAIN.getKey());
logger.error("startDate :" + (null == contractList)); logger.error("startDate :" + (null == contractList));
if(null == contractList){ if(null == contractList || contractList.isEmpty()){
a.setStatus(0); a.setStatus(0);
list.add(a); list.add(a);
} }
......
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