Commit 2a44d09a by manxiaoqiang

app排序

parent 8521b38d
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<file leaf-file-name="ContractController.java" pinned="false" current-in-tab="true"> <file leaf-file-name="ContractController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368"> <state relative-caret-position="299">
<caret line="104" column="47" lean-forward="true" selection-start-line="104" selection-start-column="47" selection-end-line="104" selection-end-column="47" /> <caret line="86" column="84" lean-forward="false" selection-start-line="86" selection-start-column="84" selection-end-line="86" selection-end-column="84" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -1443,14 +1443,7 @@ ...@@ -1443,14 +1443,7 @@
<workItem from="1517189406074" duration="8333000" /> <workItem from="1517189406074" duration="8333000" />
<workItem from="1517275427548" duration="11524000" /> <workItem from="1517275427548" duration="11524000" />
<workItem from="1517361892578" duration="19237000" /> <workItem from="1517361892578" duration="19237000" />
<workItem from="1517447750893" duration="1793000" /> <workItem from="1517447750893" duration="2411000" />
</task>
<task id="LOCAL-00025" summary="pom">
<created>1515061487894</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1515061487894</updated>
</task> </task>
<task id="LOCAL-00026" summary="pom"> <task id="LOCAL-00026" summary="pom">
<created>1515061586903</created> <created>1515061586903</created>
...@@ -1788,11 +1781,18 @@ ...@@ -1788,11 +1781,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1517452222291</updated> <updated>1517452222291</updated>
</task> </task>
<option name="localTasksCounter" value="74" /> <task id="LOCAL-00074" summary="app排序">
<created>1517453564145</created>
<option name="number" value="00074" />
<option name="presentableId" value="LOCAL-00074" />
<option name="project" value="LOCAL" />
<updated>1517453564145</updated>
</task>
<option name="localTasksCounter" value="75" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="318840000" /> <option name="totallyTimeSpent" value="319458000" />
</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" />
...@@ -2426,8 +2426,8 @@ ...@@ -2426,8 +2426,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368"> <state relative-caret-position="299">
<caret line="104" column="47" lean-forward="true" selection-start-line="104" selection-start-column="47" selection-end-line="104" selection-end-column="47" /> <caret line="86" column="84" lean-forward="false" selection-start-line="86" selection-start-column="84" selection-end-line="86" selection-end-column="84" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
......
...@@ -83,8 +83,8 @@ public class ContractController { ...@@ -83,8 +83,8 @@ public class ContractController {
e.printStackTrace(); e.printStackTrace();
} }
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
response.setHeader("filename", "contract.txt"); response.setHeader("filename", "contract.csv");
response.setHeader("content-disposition", "attachment; filename=contract.txt"); response.setHeader("content-disposition", "attachment; filename=contract.csv");
response.setHeader("Content-Type","text/csv"); response.setHeader("Content-Type","text/csv");
response.setContentType("APPLICATION/OCTET-STREAM"); response.setContentType("APPLICATION/OCTET-STREAM");
......
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