app排序

.idea/workspace.xml

@@ -27,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="299">
-              <caret line="86" column="84" lean-forward="false" selection-start-line="86" selection-start-column="84" selection-end-line="86" selection-end-column="84" />
+            <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" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -1443,14 +1443,7 @@
       <workItem from="1517189406074" duration="8333000" />
       <workItem from="1517275427548" duration="11524000" />
       <workItem from="1517361892578" duration="19237000" />
-      <workItem from="1517447750893" duration="2411000" />
-    </task>
-    <task id="LOCAL-00026" summary="pom">
-      <created>1515061586903</created>
-      <option name="number" value="00026" />
-      <option name="presentableId" value="LOCAL-00026" />
-      <option name="project" value="LOCAL" />
-      <updated>1515061586903</updated>
+      <workItem from="1517447750893" duration="2572000" />
     </task>
     <task id="LOCAL-00027" summary="sendemail">
       <created>1515062373397</created>
@@ -1788,11 +1781,18 @@
       <option name="project" value="LOCAL" />
       <updated>1517453564145</updated>
     </task>
-    <option name="localTasksCounter" value="75" />
+    <task id="LOCAL-00075" summary="app排序">
+      <created>1517454972328</created>
+      <option name="number" value="00075" />
+      <option name="presentableId" value="LOCAL-00075" />
+      <option name="project" value="LOCAL" />
+      <updated>1517454972328</updated>
+    </task>
+    <option name="localTasksCounter" value="76" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="319458000" />
+    <option name="totallyTimeSpent" value="319619000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -2426,8 +2426,8 @@
     </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="299">
-          <caret line="86" column="84" lean-forward="false" selection-start-line="86" selection-start-column="84" selection-end-line="86" selection-end-column="84" />
+        <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" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

src/main/java/common/controller/ContractController.java

@@ -72,7 +72,7 @@ public class ContractController {
         if(ValidateUtil.isValid(contractList)){
             for (Contract c : contractList){
                 sb.append(c.getDs()).append(",").append(c.getContractCode()).append(",").append(c.getEmail()).append(",").append(c.getCustomerBody()).append(",").append(c.getSaleName()).append(",")
-                        .append(c.getStartDate()).append(",").append(c.getEndDate()).append(",").append(c.getPriceLevelName()).append(",").append(c.getMoney()).append(",").append(c.getPayMoney()).append(",")
+                        .append(c.getStartDate()).append(",").append(c.getEndDate()).append(",").append(c.getPriceLevelName()).append(",").append(c.getMoney()).append(",").append(c.getRebate()).append(",").append(c.getPayMoney()).append(",")
                         .append(map.get(c.getStatus())).append("\r\n");
             }
         }