Skip to content

M
manager
Commit d39c2a5c by manxiaoqiang
Options

app排序

parent a795255d
Showing with 136 additions and 70 deletions
.idea/workspace.xml
......@@ -3,8 +3,10 @@
<component name="ChangeListManager">
<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/repository/ContractRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java" afterPath="$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/ContractService.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" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -25,16 +27,71 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ContractSendEmailThread.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
<file leaf-file-name="ContractController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="228" column="80" lean-forward="true" selection-start-line="228" selection-start-column="80" selection-end-line="228" selection-end-column="80" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="41" column="22" lean-forward="false" selection-start-line="41" selection-start-column="13" selection-end-line="41" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="NewUserLogThread.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="42" column="11" lean-forward="false" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false">
<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="298">
<caret line="373" column="41" lean-forward="false" selection-start-line="373" selection-start-column="31" selection-end-line="373" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractMoneyRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="53" column="72" lean-forward="false" selection-start-line="53" selection-start-column="72" selection-end-line="53" selection-end-column="72" />
<state relative-caret-position="228">
<caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractSendEmailThread.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="481">
<caret line="63" column="32" lean-forward="true" selection-start-line="63" selection-start-column="32" selection-end-line="63" selection-end-column="32" />
<folding>
<element signature="e#1123#1124#0" expanded="true" />
<element signature="e#1163#1164#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -125,7 +182,6 @@
<option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/util/ResultStatus.java" />
<option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
......@@ -135,13 +191,14 @@
<option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ContractTask.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
</list>
</option>
</component>
......@@ -1257,14 +1314,7 @@
<workItem from="1517189406074" duration="8333000" />
<workItem from="1517275427548" duration="11524000" />
<workItem from="1517361892578" duration="19237000" />
<workItem from="1517447750893" duration="9447000" />
</task>
<task id="LOCAL-00032" summary="sendemail">
<created>1515143555554</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1515143555554</updated>
<workItem from="1517447750893" duration="10636000" />
</task>
<task id="LOCAL-00033" summary="sendemail">
<created>1515144713999</created>
......@@ -1602,11 +1652,18 @@
<option name="project" value="LOCAL" />
<updated>1517477130551</updated>
</task>
<option name="localTasksCounter" value="81" />
<task id="LOCAL-00081" summary="app排序">
<created>1517477432252</created>
<option name="number" value="00081" />
<option name="presentableId" value="LOCAL-00081" />
<option name="project" value="LOCAL" />
<updated>1517477432252</updated>
</task>
<option name="localTasksCounter" value="82" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="326494000" />
<option name="totallyTimeSpent" value="327683000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -1756,20 +1813,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/exception/TransferCurrentAccountException.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="6" column="33" lean-forward="false" selection-start-line="6" selection-start-column="33" selection-end-line="6" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/security/resolvers/LoginUserMethodArgumentsResolver.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="122">
<caret line="23" column="14" lean-forward="true" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
......@@ -1921,13 +1964,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="21" column="29" lean-forward="true" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
......@@ -1954,6 +1990,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="13" column="16" lean-forward="false" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
......@@ -1961,6 +1998,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
......@@ -2040,6 +2078,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="79" column="161" lean-forward="false" selection-start-line="79" selection-start-column="161" selection-end-line="79" selection-end-column="161" />
<folding />
</state>
</provider>
</entry>
......@@ -2211,64 +2250,91 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
<state relative-caret-position="324">
<caret line="29" column="54" lean-forward="false" selection-start-line="29" selection-start-column="54" selection-end-line="29" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367">
<caret line="101" column="41" lean-forward="false" selection-start-line="101" selection-start-column="32" selection-end-line="101" selection-end-column="41" />
<state relative-caret-position="642">
<caret line="36" column="49" lean-forward="true" selection-start-line="36" selection-start-column="49" selection-end-line="36" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="29" column="54" lean-forward="false" selection-start-line="29" selection-start-column="54" selection-end-line="29" selection-end-column="54" />
<state relative-caret-position="206">
<caret line="41" column="67" lean-forward="true" selection-start-line="41" selection-start-column="67" selection-end-line="41" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<entry file="jar://E:/Java/jdk1.8.0_65/src.zip!/java/lang/Thread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="642">
<caret line="36" column="49" lean-forward="true" selection-start-line="36" selection-start-column="49" selection-end-line="36" selection-end-column="49" />
<state relative-caret-position="194">
<caret line="695" column="29" lean-forward="false" selection-start-line="695" selection-start-column="29" selection-end-line="695" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="67" column="23" lean-forward="false" selection-start-line="67" selection-start-column="17" selection-end-line="67" selection-end-column="23" />
<state relative-caret-position="194">
<caret line="42" column="11" lean-forward="false" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="481">
<caret line="63" column="32" lean-forward="true" selection-start-line="63" selection-start-column="32" selection-end-line="63" selection-end-column="32" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1123#1124#0" expanded="true" />
<element signature="e#1163#1164#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractTask.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="41" column="67" lean-forward="true" selection-start-line="41" selection-start-column="67" selection-end-line="41" selection-end-column="67" />
<state relative-caret-position="320">
<caret line="41" column="22" lean-forward="false" selection-start-line="41" selection-start-column="13" selection-end-line="41" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="53" column="72" lean-forward="false" selection-start-line="53" selection-start-column="72" selection-end-line="53" selection-end-column="72" />
<state relative-caret-position="228">
<caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="35" />
<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="298">
<caret line="373" column="41" lean-forward="false" selection-start-line="373" selection-start-column="31" selection-end-line="373" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="228" column="80" lean-forward="true" selection-start-line="228" selection-start-column="80" selection-end-line="228" selection-end-column="80" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
src/main/java/common/controller/ContractController.java
......@@ -225,8 +225,8 @@ public class ContractController {
@RequestMapping(value = "find/payall", method = RequestMethod.GET)
@ResponseBody
public ResultModel findPayAll(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate) {
return ResultModel.OK(service.findPay(startDate, endDate));
@RequestParam String endDate, @PathVariable String platform) {
return ResultModel.OK(service.findPayAll(startDate, endDate, platform));
}
......
src/main/java/common/repository/ContractMoneyRepository.java
......@@ -15,8 +15,8 @@ public interface ContractMoneyRepository extends JpaRepository<ContractMoney, Lo
@Query(value="select * from contract_money where ds >= ?1 and ds <= ?2 and contract_code = ?3 order by ds desc",nativeQuery=true)
List<ContractMoney> findByDs(String startDate, String endDate, String code);
@Query(value="select * from contract_money where ds >= ?1 and ds <= ?2 order by ds desc",nativeQuery=true)
List<ContractMoney> findByDs(String startDate, String endDate);
@Query(value="select * from contract_money where ds >= ?1 and ds <= ?2 and platform = ?3 order by ds desc",nativeQuery=true)
List<ContractMoney> findByDsAll(String startDate, String endDate, String platform);
@Query(value="select * from contract_money where ds >= ?1 and ds <= ?2 and email = ?3 and platform = ?4 order by ds desc",nativeQuery=true)
List<ContractMoney> findByDs(String startDate, String endDate, String email, String platform);
......
src/main/java/common/service/ContractService.java
......@@ -41,5 +41,5 @@ public interface ContractService {
Contract updatePay(User loginUser, ContractMoney resource);
List<ContractMoney> findPay(String startDate, String endDate);
List<ContractMoney> findPayAll(String startDate, String endDate, String platform);
}
src/main/java/common/service/impl/ContractServiceImpl.java
......@@ -371,7 +371,7 @@ public class ContractServiceImpl implements ContractService{
}
@Override
public List<ContractMoney> findPay(String startDate, String endDate) {
public List<ContractMoney> findPayAll(String startDate, String endDate, String platfrom) {
List<User> sales = userRepository.findAll();
Map<Long, String> saleMap = new HashMap<>();
if(ValidateUtil.isValid(sales)){
......@@ -381,7 +381,7 @@ public class ContractServiceImpl implements ContractService{
}
List<ContractMoney> result = new ArrayList<>();
List<ContractMoney> list = contractMoneyRepository.findByDs(startDate, endDate);
List<ContractMoney> list = contractMoneyRepository.findByDsAll(startDate, endDate, platfrom);
if(ValidateUtil.isValid(list)){
for(ContractMoney cm : list){
cm.setCreateName(saleMap.containsKey(cm.getUser()) ? saleMap.get(cm.getUser()) : "");
......
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