Skip to content

M
manager
Commit 0b3088ab by manxiaoqiang
Options

2

parent ea18bc2f
Showing with 53 additions and 45 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/model/Account4Web.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/Account4Web.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/tkio/service/impl/TkioAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.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> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
...@@ -56,8 +56,18 @@ ...@@ -56,8 +56,18 @@
<file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="true"> <file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367"> <state relative-caret-position="137">
<caret line="200" column="42" lean-forward="false" selection-start-line="200" selection-start-column="42" selection-end-line="200" selection-end-column="42" /> <caret line="199" column="50" lean-forward="false" selection-start-line="199" selection-start-column="50" selection-end-line="199" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
</file>
<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="160">
<caret line="29" column="77" lean-forward="false" selection-start-line="29" selection-start-column="77" selection-end-line="29" selection-end-column="77" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -202,7 +212,6 @@ ...@@ -202,7 +212,6 @@
<option value="$PROJECT_DIR$/src/main/java/userio/task/AccountCheck.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/task/AccountCheck.java" />
<option value="$PROJECT_DIR$/src/main/java/userio/repository/IOAccountRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/repository/IOAccountRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/userio/task/IOAccountCheck.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/task/IOAccountCheck.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/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java" />
<option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" />
...@@ -220,6 +229,7 @@ ...@@ -220,6 +229,7 @@
<option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/Account4Web.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/tkio/service/impl/TkioAccountServiceImpl.java" />
</list> </list>
</option> </option>
...@@ -1295,13 +1305,6 @@ ...@@ -1295,13 +1305,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-00083" summary="app排序">
<created>1517478695938</created>
<option name="number" value="00083" />
<option name="presentableId" value="LOCAL-00083" />
<option name="project" value="LOCAL" />
<updated>1517478695938</updated>
</task>
<task id="LOCAL-00084" summary="app排序"> <task id="LOCAL-00084" summary="app排序">
<created>1517542092126</created> <created>1517542092126</created>
<option name="number" value="00084" /> <option name="number" value="00084" />
...@@ -1638,11 +1641,18 @@ ...@@ -1638,11 +1641,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1524733020842</updated> <updated>1524733020842</updated>
</task> </task>
<option name="localTasksCounter" value="132" /> <task id="LOCAL-00132" summary="2&#10;">
<created>1524734309558</created>
<option name="number" value="00132" />
<option name="presentableId" value="LOCAL-00132" />
<option name="project" value="LOCAL" />
<updated>1524734309558</updated>
</task>
<option name="localTasksCounter" value="133" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="506146000" /> <option name="totallyTimeSpent" value="506656000" />
</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" />
...@@ -2014,18 +2024,6 @@ ...@@ -2014,18 +2024,6 @@
</state> </state>
</provider> </provider>
</entry> </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="184">
<caret line="56" column="33" lean-forward="true" selection-start-line="56" selection-start-column="33" selection-end-line="56" selection-end-column="33" />
<folding>
<element signature="e#1345#1346#0" expanded="true" />
<element signature="e#1392#1393#0" expanded="true" />
<element signature="e#1430#1431#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/userio/model/SalesManLeader.java"> <entry file="file://$PROJECT_DIR$/src/main/java/userio/model/SalesManLeader.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">
...@@ -2172,14 +2170,6 @@ ...@@ -2172,14 +2170,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="4140">
<caret line="357" column="60" lean-forward="false" selection-start-line="357" selection-start-column="60" selection-end-line="357" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <state relative-caret-position="207">
...@@ -2188,14 +2178,6 @@ ...@@ -2188,14 +2178,6 @@
</state> </state>
</provider> </provider>
</entry> </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="644">
<caret line="35" column="123" lean-forward="false" selection-start-line="35" selection-start-column="18" selection-end-line="35" selection-end-column="123" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309"> <state relative-caret-position="309">
...@@ -2222,10 +2204,37 @@ ...@@ -2222,10 +2204,37 @@
</state> </state>
</provider> </provider>
</entry> </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="194">
<caret line="216" column="18" lean-forward="false" selection-start-line="216" selection-start-column="18" selection-end-line="216" selection-end-column="18" />
<folding>
<element signature="e#4439#4440#0" expanded="true" />
<element signature="e#4468#4469#0" expanded="true" />
</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="160">
<caret line="29" column="77" lean-forward="false" selection-start-line="29" selection-start-column="77" selection-end-line="29" selection-end-column="77" />
<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="4140">
<caret line="357" column="60" lean-forward="false" selection-start-line="357" selection-start-column="60" selection-end-line="357" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367"> <state relative-caret-position="137">
<caret line="200" column="42" lean-forward="false" selection-start-line="200" selection-start-column="42" selection-end-line="200" selection-end-column="42" /> <caret line="199" column="50" lean-forward="false" selection-start-line="199" selection-start-column="50" selection-end-line="199" selection-end-column="50" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/main/java/common/repository/ContractRepository.java
...@@ -27,7 +27,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> { ...@@ -27,7 +27,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query(value="select * from contract where contract_code = ?1",nativeQuery=true) @Query(value="select * from contract where contract_code = ?1",nativeQuery=true)
Contract findByCode(String contract_code); Contract findByCode(String contract_code);
@Query(value="SELECT * from contract where platform = ?1",nativeQuery=true) @Query(value="SELECT * from contract where platform = ?1 and type = 'main'",nativeQuery=true)
List<Contract> findByPlatform(String platform); List<Contract> findByPlatform(String platform);
@Query(value="SELECT * from contract where platform = ?1 and email = ?2 and type = ?3",nativeQuery=true) @Query(value="SELECT * from contract where platform = ?1 and email = ?2 and type = ?3",nativeQuery=true)
......
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
...@@ -198,7 +198,6 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -198,7 +198,6 @@ public class TkioAccountServiceImpl implements TkioAccountService {
Map<String, Integer> backTimeMap = getBackTime(); Map<String, Integer> backTimeMap = getBackTime();
Map<String, List<Contract>> payMap = getPay(); Map<String, List<Contract>> payMap = getPay();
for(Account4Web aw : account4WebList){ for(Account4Web aw : account4WebList){
logger.error(aw.toString());
if(backTimeMap.containsKey(aw.getEmail())){ if(backTimeMap.containsKey(aw.getEmail())){
aw.setBackTime(backTimeMap.get(aw.getEmail())); aw.setBackTime(backTimeMap.get(aw.getEmail()));
} else{ } else{
......
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