Skip to content

M
manager
Commit 820915cc by manxiaoqiang
Options

app排序

parent 5a011dbb
Showing with 113 additions and 191 deletions
.idea/workspace.xml
......@@ -4,6 +4,9 @@
<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/controller/ContractController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.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/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" />
......@@ -27,8 +30,8 @@
<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="92">
<caret line="74" column="192" lean-forward="false" selection-start-line="74" selection-start-column="192" selection-end-line="74" selection-end-column="192" />
<state relative-caret-position="230">
<caret line="137" column="128" lean-forward="false" selection-start-line="137" selection-start-column="128" selection-end-line="137" selection-end-column="128" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -36,126 +39,22 @@
</provider>
</entry>
</file>
<file leaf-file-name="ContractMoney.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java">
<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="276">
<caret line="15" column="27" lean-forward="false" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="27" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#667#668#0" expanded="false" />
<element signature="e#692#693#0" expanded="false" />
<element signature="e#726#727#0" expanded="false" />
<element signature="e#754#755#0" expanded="false" />
<element signature="e#793#794#0" expanded="false" />
<element signature="e#828#829#0" expanded="false" />
<element signature="e#884#885#0" expanded="false" />
<element signature="e#932#933#0" expanded="false" />
<element signature="e#961#962#0" expanded="false" />
<element signature="e#986#987#0" expanded="false" />
<element signature="e#1022#1023#0" expanded="false" />
<element signature="e#1050#1051#0" expanded="false" />
<element signature="e#1081#1082#0" expanded="false" />
<element signature="e#1108#1109#0" expanded="false" />
<element signature="e#1148#1149#0" expanded="false" />
<element signature="e#1180#1181#0" expanded="false" />
<element signature="e#1210#1211#0" expanded="false" />
<element signature="e#1238#1239#0" expanded="false" />
<element signature="e#1278#1279#0" expanded="false" />
<element signature="e#1312#1313#0" expanded="false" />
<element signature="e#1341#1342#0" expanded="false" />
<element signature="e#1368#1369#0" expanded="false" />
<element signature="e#1406#1407#0" expanded="false" />
<element signature="e#1438#1439#0" expanded="false" />
<element signature="e#1470#1471#0" expanded="false" />
<element signature="e#1498#1499#0" expanded="false" />
<element signature="e#1540#1541#0" expanded="false" />
<element signature="e#1574#1575#0" expanded="false" />
<element signature="e#1608#1609#0" expanded="false" />
<element signature="e#1638#1639#0" expanded="false" />
<element signature="e#1684#1685#0" expanded="false" />
<element signature="e#1722#1723#0" expanded="false" />
<element signature="e#1760#1761#0" expanded="false" />
<element signature="e#1796#1797#0" expanded="false" />
<element signature="e#1852#1853#0" expanded="false" />
<element signature="e#1902#1903#0" expanded="false" />
<element signature="e#1940#1941#0" expanded="false" />
<element signature="e#1976#1977#0" expanded="false" />
<element signature="e#2032#2033#0" expanded="false" />
<element signature="e#2082#2083#0" expanded="false" />
<element signature="e#2117#2118#0" expanded="false" />
<element signature="e#2150#2151#0" expanded="false" />
<element signature="e#2200#2201#0" expanded="false" />
<element signature="e#2244#2245#0" expanded="false" />
<element signature="e#2279#2280#0" expanded="false" />
<element signature="e#2312#2313#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2406#2407#0" expanded="false" />
<element signature="e#2443#2444#0" expanded="false" />
<element signature="e#2476#2477#0" expanded="false" />
<element signature="e#2528#2529#0" expanded="false" />
<element signature="e#2572#2573#0" expanded="false" />
<element signature="e#2607#2608#0" expanded="false" />
<element signature="e#2638#2639#0" expanded="false" />
<element signature="e#2686#2687#0" expanded="false" />
<element signature="e#2726#2727#0" expanded="false" />
</folding>
<state relative-caret-position="183">
<caret line="13" column="66" lean-forward="false" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserLog.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<file leaf-file-name="TrackAccountController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1633">
<caret line="139" column="36" lean-forward="false" selection-start-line="139" selection-start-column="36" selection-end-line="139" selection-end-column="36" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#637#638#0" expanded="false" />
<element signature="e#662#663#0" expanded="false" />
<element signature="e#700#701#0" expanded="false" />
<element signature="e#728#729#0" expanded="false" />
<element signature="e#770#771#0" expanded="false" />
<element signature="e#804#805#0" expanded="false" />
<element signature="e#862#863#0" expanded="false" />
<element signature="e#908#909#0" expanded="false" />
<element signature="e#951#952#0" expanded="false" />
<element signature="e#986#987#0" expanded="false" />
<element signature="e#1046#1047#0" expanded="false" />
<element signature="e#1094#1095#0" expanded="false" />
<element signature="e#1136#1137#0" expanded="false" />
<element signature="e#1170#1171#0" expanded="false" />
<element signature="e#1228#1229#0" expanded="false" />
<element signature="e#1274#1275#0" expanded="false" />
<element signature="e#1307#1308#0" expanded="false" />
<element signature="e#1332#1333#0" expanded="false" />
<element signature="e#1372#1373#0" expanded="false" />
<element signature="e#1400#1401#0" expanded="false" />
<element signature="e#1448#1449#0" expanded="false" />
<element signature="e#1488#1489#0" expanded="false" />
<element signature="e#1558#1559#0" expanded="false" />
<element signature="e#1616#1617#0" expanded="false" />
<element signature="e#1660#1661#0" expanded="false" />
<element signature="e#1696#1697#0" expanded="false" />
<element signature="e#1758#1759#0" expanded="false" />
<element signature="e#1808#1809#0" expanded="false" />
<element signature="e#1850#1851#0" expanded="false" />
<element signature="e#1884#1885#0" expanded="false" />
<element signature="e#1942#1943#0" expanded="false" />
<element signature="e#1988#1989#0" expanded="false" />
<element signature="e#2027#2028#0" expanded="false" />
<element signature="e#2058#2059#0" expanded="false" />
<element signature="e#2110#2111#0" expanded="false" />
<element signature="e#2150#2151#0" expanded="false" />
<element signature="e#2186#2187#0" expanded="false" />
<element signature="e#2218#2219#0" expanded="false" />
<element signature="e#2268#2269#0" expanded="false" />
<element signature="e#2305#2306#0" expanded="false" />
<element signature="e#2341#2342#0" expanded="false" />
<element signature="e#2373#2374#0" expanded="false" />
<element signature="e#2423#2424#0" expanded="false" />
<element signature="e#2465#2466#0" expanded="false" />
</folding>
<state relative-caret-position="-46">
<caret line="73" column="197" lean-forward="false" selection-start-line="73" selection-start-column="197" selection-end-line="73" selection-end-column="197" />
<folding />
</state>
</provider>
</entry>
......@@ -163,26 +62,21 @@
<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="2415">
<caret line="125" column="15" lean-forward="false" selection-start-line="125" selection-start-column="15" selection-end-line="125" selection-end-column="15" />
<state relative-caret-position="252">
<caret line="50" column="84" lean-forward="true" selection-start-line="50" selection-start-column="84" selection-end-line="50" selection-end-column="84" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1822#1823#0" expanded="false" />
<element signature="e#1877#1878#0" expanded="false" />
<element signature="e#2381#2382#0" expanded="false" />
<element signature="e#2435#2436#0" expanded="false" />
<element signature="e#2718#2719#0" expanded="false" />
<element signature="e#2767#2768#0" expanded="false" />
<element signature="e#1831#1832#0" expanded="true" />
<element signature="e#1886#1887#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml">
<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="2277">
<caret line="99" column="8" lean-forward="false" selection-start-line="99" selection-start-column="8" selection-end-line="99" selection-end-column="8" />
<state relative-caret-position="183">
<caret line="18" column="22" lean-forward="false" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
<folding />
</state>
</provider>
......@@ -222,6 +116,7 @@
<find>isASC</find>
<find>rootParent</find>
<find>, request</find>
<find>reminderlevel</find>
</findStrings>
<replaceStrings>
<replace />
......@@ -262,7 +157,6 @@
<option value="$PROJECT_DIR$/src/main/java/common/repository/TrackAccount4WebRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/util/DateUtil.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" />
......@@ -272,7 +166,6 @@
<option value="$PROJECT_DIR$/src/main/java/common/repository/ReminderLevelRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/track/model/MeasuresTrackNew.java" />
<option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
<option value="$PROJECT_DIR$/src/main/java/track/task/AccountTask.java" />
......@@ -286,13 +179,15 @@
<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" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" />
<option value="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
<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/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.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>
......@@ -388,9 +283,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
......@@ -949,6 +842,8 @@
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -1443,14 +1338,7 @@
<workItem from="1517189406074" duration="8333000" />
<workItem from="1517275427548" duration="11524000" />
<workItem from="1517361892578" duration="19237000" />
<workItem from="1517447750893" duration="2572000" />
</task>
<task id="LOCAL-00027" summary="sendemail">
<created>1515062373397</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1515062373397</updated>
<workItem from="1517447750893" duration="5665000" />
</task>
<task id="LOCAL-00028" summary="sendemail">
<created>1515114797659</created>
......@@ -1788,15 +1676,22 @@
<option name="project" value="LOCAL" />
<updated>1517454972328</updated>
</task>
<option name="localTasksCounter" value="76" />
<task id="LOCAL-00076" summary="app排序">
<created>1517455132087</created>
<option name="number" value="00076" />
<option name="presentableId" value="LOCAL-00076" />
<option name="project" value="LOCAL" />
<updated>1517455132087</updated>
</task>
<option name="localTasksCounter" value="77" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="319619000" />
<option name="totallyTimeSpent" value="322712000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<editor active="false" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
......@@ -1954,13 +1849,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/exception/TipException.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/exception/GlobalExceptionAdvice.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-301">
......@@ -2042,6 +1930,27 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="137" column="31" lean-forward="false" selection-start-line="137" selection-start-column="25" selection-end-line="137" selection-end-column="31" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2402#2403#0" expanded="false" />
<element signature="e#2459#2460#0" expanded="false" />
<element signature="e#2609#2610#0" expanded="false" />
<element signature="e#2666#2667#0" expanded="false" />
<element signature="e#3534#3535#0" expanded="false" />
<element signature="e#3590#3591#0" expanded="false" />
<element signature="e#3773#3774#0" expanded="false" />
<element signature="e#3830#3831#0" expanded="false" />
<element signature="e#4613#4614#0" expanded="false" />
<element signature="e#4669#4670#0" expanded="false" />
<element signature="e#4723#4724#0" expanded="false" />
<element signature="e#4780#4781#0" expanded="false" />
<element signature="e#4838#4839#0" expanded="false" />
<element signature="e#4892#4893#0" expanded="false" />
<element signature="e#29079#29080#0" expanded="false" />
<element signature="e#29124#29125#0" expanded="false" />
<element signature="e#29180#29181#0" expanded="false" />
<element signature="e#29224#29225#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -2105,6 +2014,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="32" column="72" lean-forward="false" selection-start-line="32" selection-start-column="72" selection-end-line="32" selection-end-column="73" />
<folding />
</state>
</provider>
</entry>
......@@ -2147,13 +2057,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7176">
<caret line="332" column="52" lean-forward="false" selection-start-line="332" selection-start-column="52" selection-end-line="332" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="13" column="24" lean-forward="false" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -2189,6 +2095,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="173" column="0" lean-forward="false" selection-start-line="173" selection-start-column="0" selection-end-line="175" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
......@@ -2210,6 +2117,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="119" column="9" lean-forward="false" selection-start-line="119" selection-start-column="9" selection-end-line="119" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
......@@ -2250,22 +2158,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="46">
<caret line="33" column="34" lean-forward="false" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
</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="2415">
<caret line="125" column="15" lean-forward="false" selection-start-line="125" selection-start-column="15" selection-end-line="125" selection-end-column="15" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1822#1823#0" expanded="false" />
<element signature="e#1877#1878#0" expanded="false" />
<element signature="e#2381#2382#0" expanded="false" />
<element signature="e#2435#2436#0" expanded="false" />
<element signature="e#2718#2719#0" expanded="false" />
<element signature="e#2767#2768#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -2276,17 +2169,11 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1403">
<caret line="73" column="197" lean-forward="false" selection-start-line="73" selection-start-column="197" selection-end-line="73" selection-end-column="197" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/UserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214">
<caret line="41" column="20" lean-forward="false" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
......@@ -2424,10 +2311,45 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-46">
<caret line="73" column="197" lean-forward="false" selection-start-line="73" selection-start-column="197" selection-end-line="73" selection-end-column="197" />
<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="183">
<caret line="18" column="22" lean-forward="false" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="13" column="66" lean-forward="false" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="66" />
<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="252">
<caret line="50" column="84" lean-forward="true" selection-start-line="50" selection-start-column="84" selection-end-line="50" selection-end-column="84" />
<folding>
<element signature="e#1831#1832#0" expanded="true" />
<element signature="e#1886#1887#0" expanded="true" />
</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="92">
<caret line="74" column="192" lean-forward="false" selection-start-line="74" selection-start-column="192" selection-end-line="74" selection-end-column="192" />
<state relative-caret-position="230">
<caret line="137" column="128" lean-forward="false" selection-start-line="137" selection-start-column="128" selection-end-line="137" selection-end-column="128" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......
src/main/java/common/controller/ContractController.java
......@@ -135,8 +135,8 @@ public class ContractController {
@RequestMapping(value = "checkAccount", method = RequestMethod.GET)
@ResponseBody
public ResultModel checkAccount(@CurrentAccount User loginAccount, @RequestParam String email) {
return ResultModel.OK(service.checkAccount(email));
public ResultModel checkAccount(@CurrentAccount User loginAccount, @RequestParam String email, @PathVariable String platform) {
return ResultModel.OK(service.checkAccount(email, platform));
}
@RequestMapping(value = "find/body", method = RequestMethod.GET)
......
src/main/java/common/repository/ContractRepository.java
......@@ -15,8 +15,8 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query(value="select count(*) from contract where ds = ?1",nativeQuery=true)
BigInteger countNumByDs(String ds);
@Query(value="select count(*) from contract where email = ?1",nativeQuery=true)
BigInteger countNumByEmail(String email);
@Query(value="select count(*) from contract where email = ?1 and platform = ?2",nativeQuery=true)
BigInteger countNumByEmail(String email, String platfrom);
@Query(value="select * from contract where ds >= ?1 and ds <= ?2 and platform = ?3 order by ds desc",nativeQuery=true)
List<Contract> findByDs(String startDate, String endDate, String platfrom);
......
src/main/java/common/service/ContractService.java
......@@ -11,7 +11,7 @@ import java.util.Map;
*/
public interface ContractService {
Map<String, Object> checkAccount(String email);
Map<String, Object> checkAccount(String email, String platfrom);
List<ContractBody> findBody();
......
src/main/java/common/service/impl/ContractServiceImpl.java
......@@ -42,13 +42,13 @@ public class ContractServiceImpl implements ContractService{
AccountService accountService;
@Override
public Map<String, Object> checkAccount(String email) {
public Map<String, Object> checkAccount(String email, String platfrom) {
Map<String, Object> map = new HashMap<>();
Account4Web account4Web = account4WebRepository.findByEmail(email);
if(null == account4Web){
map.put("result", 0);
}else{
BigInteger integer = contractRepository.countNumByDs(DateUtil.getBeforeDays(0));
BigInteger integer = contractRepository.countNumByEmail(email,platfrom);
map.put("result", 1);
map.put("company", account4Web.getCompany());
map.put("num", integer.intValue());
......
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