1

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

@@ -104,7 +104,7 @@ public class ContractController {
             for (Contract c : contractList) {
                 sb.append(c.getDs()).append(",").
                         append(c.getContractCode()).append(",")
-                        .append(c.getEmail()).append(",")
+                        .append(c.getEmail() == null ? "无" : c.getEmail()).append(",")
                         .append(c.getMyBodyName()).append(",")
                         .append(c.getCustomerBody()).append(",")
                         .append(c.getTradeName()).append(",")
@@ -115,13 +115,13 @@ public class ContractController {
                         .append(c.getMoney()).append(",")
                         .append(CONTRACT_STATUS.get(c.getContractType())).append(",")
                         .append(CONTRACT_STATUS.get(c.getStatus())).append(",")
-                        .append(CONTRACT_STATUS.get(c.getBackStatus()+"_back")).append(",")
+                        .append(CONTRACT_STATUS.get(c.getBackStatus() + "_back")).append(",")
                         .append(c.getRelationCode() == null ? "" : c.getRelationCode()).append(",")
                         .append("\r\n");
             }
         }
 
-        String fileName = "合同管理_" + new DateTime(startDate).toString("yyyyMMdd")+ "_" + new DateTime(endDate).toString("yyyyMMdd")
+        String fileName = "合同管理_" + new DateTime(startDate).toString("yyyyMMdd") + "_" + new DateTime(endDate).toString("yyyyMMdd")
                 + ".csv";
         this.exportWrite(fileName, sb.toString(), "合同管理", response);