11

code/finance_serv/src/main/java/com/vion/financial/FinancialSystemApplication.java

@@ -6,8 +6,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 
 @SpringBootApplication
 @SpringBootApplication
+@EnableScheduling
 @MapperScan(basePackages="com.vion.financial.mapper")
 @MapperScan(basePackages="com.vion.financial.mapper")
 @ComponentScan(basePackages="com.vion.financial.*")
 @ComponentScan(basePackages="com.vion.financial.*")
 public class FinancialSystemApplication  extends SpringBootServletInitializer {
 public class FinancialSystemApplication  extends SpringBootServletInitializer {

code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java

@@ -578,7 +578,7 @@ public class ContractServiceImpl implements ContractService {
 		}
 		}
 		try {
 		try {
 			DownLoad downLoad =new DownLoad();
 			DownLoad downLoad =new DownLoad();
-			if(selectVo.getColumns() != null && selectVo.getColumns().length > 0) {
+/*			if(selectVo.getColumns() != null && selectVo.getColumns().length > 0) {
 				//动态生成excel表头
 				//动态生成excel表头
 				ExcelExportEntity excelExportEntity = new ExcelExportEntity("合同编号");
 				ExcelExportEntity excelExportEntity = new ExcelExportEntity("合同编号");
 				excelExportEntity.setWidth(20);
 				excelExportEntity.setWidth(20);
@@ -589,8 +589,8 @@ public class ContractServiceImpl implements ContractService {
 				
 				
 			}else {
 			}else {
 				downLoad.exportExcel(list, "合同Excel表格", "合同Excel表格", ExportModel.class, "合同.xls", response);
 				downLoad.exportExcel(list, "合同Excel表格", "合同Excel表格", ExportModel.class, "合同.xls", response);
-			}
-			
+			}*/
+			downLoad.exportExcel(list, "合同Excel表格", "合同Excel表格", ExportModel.class, "合同.xls", response);
 		} catch (Exception e) {
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			e.printStackTrace();