Skip to content

M
manager
Commit f0b8cd7f by manxiaoqiang
Options

app排序

parent 4028c3e3
Showing with 255 additions and 126 deletions
.idea/workspace.xml
......@@ -4,12 +4,6 @@
<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/controller/UserController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" afterPath="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -33,8 +27,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="145">
<caret line="111" column="84" lean-forward="false" selection-start-line="111" selection-start-column="84" selection-end-line="111" selection-end-column="84" />
<state relative-caret-position="506">
<caret line="111" column="91" lean-forward="true" selection-start-line="111" selection-start-column="91" selection-end-line="111" selection-end-column="91" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -47,7 +41,65 @@
<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 />
<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>
</provider>
</entry>
......@@ -55,12 +107,54 @@
<file leaf-file-name="UserLog.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="574">
<caret line="139" column="36" lean-forward="true" selection-start-line="139" selection-start-column="36" selection-end-line="139" selection-end-column="36" />
<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="e#2494#2495#0" expanded="true" />
<element signature="e#2521#2522#0" expanded="true" />
<element signature="e#2591#2592#0" expanded="true" />
<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>
</provider>
......@@ -69,9 +163,17 @@
<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="183">
<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 />
<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>
</state>
</provider>
</entry>
......@@ -79,7 +181,7 @@
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="724">
<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" />
<folding />
</state>
......@@ -1340,14 +1442,8 @@
<workItem from="1516932422302" duration="5866000" />
<workItem from="1517189406074" duration="8333000" />
<workItem from="1517275427548" duration="11524000" />
<workItem from="1517361892578" duration="19172000" />
</task>
<task id="LOCAL-00023" summary="pom">
<created>1515052644376</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1515052644376</updated>
<workItem from="1517361892578" duration="19237000" />
<workItem from="1517447750893" duration="616000" />
</task>
<task id="LOCAL-00024" summary="pom">
<created>1515054597133</created>
......@@ -1685,11 +1781,18 @@
<option name="project" value="LOCAL" />
<updated>1517390626972</updated>
</task>
<option name="localTasksCounter" value="72" />
<task id="LOCAL-00072" summary="app排序">
<created>1517399760213</created>
<option name="number" value="00072" />
<option name="presentableId" value="LOCAL-00072" />
<option name="project" value="LOCAL" />
<updated>1517399760213</updated>
</task>
<option name="localTasksCounter" value="73" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="316982000" />
<option name="totallyTimeSpent" value="317663000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -1713,7 +1816,7 @@
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.42553192" sideWeight="0.49016643" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42553192" sideWeight="0.49016643" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30711043" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
......@@ -1925,7 +2028,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="202" column="33" lean-forward="false" selection-start-line="202" selection-start-column="22" selection-end-line="202" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
......@@ -1940,27 +2042,6 @@
<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>
......@@ -1968,7 +2049,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
......@@ -1983,7 +2063,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="73" column="13" lean-forward="false" selection-start-line="73" selection-start-column="13" selection-end-line="73" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1991,33 +2070,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="10" column="29" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="29" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#425#426#0" expanded="false" />
<element signature="e#450#451#0" expanded="false" />
<element signature="e#484#485#0" expanded="false" />
<element signature="e#512#513#0" expanded="false" />
<element signature="e#541#542#0" expanded="false" />
<element signature="e#566#567#0" expanded="false" />
<element signature="e#602#603#0" expanded="false" />
<element signature="e#630#631#0" expanded="false" />
<element signature="e#665#666#0" expanded="false" />
<element signature="e#696#697#0" expanded="false" />
<element signature="e#744#745#0" expanded="false" />
<element signature="e#784#785#0" expanded="false" />
<element signature="e#816#817#0" expanded="false" />
<element signature="e#844#845#0" expanded="false" />
<element signature="e#886#887#0" expanded="false" />
<element signature="e#920#921#0" expanded="false" />
<element signature="e#956#957#0" expanded="false" />
<element signature="e#987#988#0" expanded="false" />
<element signature="e#1036#1037#0" expanded="false" />
<element signature="e#1076#1077#0" expanded="false" />
<element signature="e#1119#1120#0" expanded="false" />
<element signature="e#1157#1158#0" expanded="false" />
<element signature="e#1220#1221#0" expanded="false" />
<element signature="e#1274#1275#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -2025,9 +2077,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="13" column="14" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="14" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -2035,7 +2084,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="44" column="53" lean-forward="true" selection-start-line="44" selection-start-column="53" selection-end-line="44" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
......@@ -2043,7 +2091,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="13" column="15" lean-forward="false" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
......@@ -2051,9 +2098,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="52" column="75" lean-forward="false" selection-start-line="52" selection-start-column="75" selection-end-line="52" selection-end-column="75" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -2061,7 +2105,6 @@
<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>
......@@ -2069,7 +2112,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="46" column="36" lean-forward="true" selection-start-line="46" selection-start-column="36" selection-end-line="46" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
......@@ -2084,7 +2126,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="63" column="52" lean-forward="true" selection-start-line="63" selection-start-column="52" selection-end-line="63" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
......@@ -2106,9 +2147,6 @@
<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" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -2116,9 +2154,6 @@
<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>
......@@ -2126,7 +2161,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1493">
<caret line="100" column="17" lean-forward="true" selection-start-line="100" selection-start-column="17" selection-end-line="100" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
......@@ -2134,7 +2168,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
......@@ -2142,7 +2175,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="21" column="40" lean-forward="false" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
......@@ -2150,7 +2182,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="32" column="32" lean-forward="false" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
......@@ -2158,7 +2189,6 @@
<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>
......@@ -2166,7 +2196,6 @@
<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>
......@@ -2174,7 +2203,6 @@
<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>
......@@ -2182,7 +2210,6 @@
<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>
......@@ -2201,7 +2228,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229">
<caret line="14" column="35" lean-forward="false" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
......@@ -2209,13 +2235,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="130" column="25" lean-forward="false" selection-start-line="130" selection-start-column="25" selection-end-line="130" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="724">
<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" />
<folding />
</state>
......@@ -2225,15 +2250,22 @@
<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" />
<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="183">
<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 />
<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>
</state>
</provider>
</entry>
......@@ -2241,7 +2273,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="35" column="32" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
......@@ -2249,7 +2280,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
......@@ -2257,7 +2287,6 @@
<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>
......@@ -2265,7 +2294,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="122">
<caret line="140" column="47" lean-forward="true" selection-start-line="140" selection-start-column="47" selection-end-line="140" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
......@@ -2273,18 +2301,59 @@
<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>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="574">
<caret line="139" column="36" lean-forward="true" selection-start-line="139" selection-start-column="36" selection-end-line="139" selection-end-column="36" />
<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="e#2494#2495#0" expanded="true" />
<element signature="e#2521#2522#0" expanded="true" />
<element signature="e#2591#2592#0" expanded="true" />
<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>
</provider>
......@@ -2293,14 +2362,72 @@
<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 />
<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>
</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="145">
<caret line="111" column="84" lean-forward="false" selection-start-line="111" selection-start-column="84" selection-end-line="111" selection-end-column="84" />
<state relative-caret-position="506">
<caret line="111" column="91" lean-forward="true" selection-start-line="111" selection-start-column="91" selection-end-line="111" selection-end-column="91" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......
src/main/java/common/controller/ContractController.java
......@@ -108,9 +108,11 @@ public class ContractController {
e.printStackTrace();
}
HttpHeaders headers = new HttpHeaders();
response.setHeader("filename", "contract_pay.txt");
response.setHeader("content-disposition", "attachment; filename=contract_pay.txt");
response.setHeader("Content-Type", "application/octet-stream;charset=UTF-8");
response.setHeader("filename", "contract_pay.csv");
response.setHeader("content-disposition", "attachment; filename=contract_pay.csv");
// response.setHeader("Content-Type", "application/octet-stream;charset=UTF-8");
response.setHeader("Content-Type","text/csv");
response.setContentType("APPLICATION/OCTET-STREAM");
//返回文件字符串
return new ResponseEntity<byte[]>(content, headers, HttpStatus.CREATED);
......
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