Browse Source

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
a3149224bb

+ 4 - 4
src/main/java/com/goafanti/demandCollection/bo/OutDemandCollection.java

@@ -102,9 +102,9 @@ public class OutDemandCollection {
 	private String createTime;
 	private String sfxwgw;
 	private String sfyxck;
-	/*private String qyyzkdgjqykjcxhzqk;
+	private String qyyzkdgjqykjcxhzqk;
 	private String zyhzfs;
-	private String zyhzfsValue;*/
+	private String zyhzfsValue;
 
 	public String getId() {
 		return id;
@@ -1384,7 +1384,7 @@ public class OutDemandCollection {
 		this.sfyxck = sfyxck;
 	}
 
-/*	public String getZyhzfs() {
+	public String getZyhzfs() {
 		if (zyhzfs != null) {
 			String str = zyhzfs;
 			String str2 = "";
@@ -1431,5 +1431,5 @@ public class OutDemandCollection {
 
 	public void setZyhzfsValue(String zyhzfsValue) {
 		this.zyhzfsValue = zyhzfsValue;
-	}*/
+	}
 }

+ 11 - 13
src/main/java/com/goafanti/demandCollection/service/impl/DemandCollectionServiceImpl.java

@@ -67,7 +67,6 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 		OutputStream out = response.getOutputStream();
 		try {
 			List<OutDemandCollection>list=(List<OutDemandCollection>) demandCollectionList(idc).getList();
-					 
 			String[] comment = { "编号", "单位名称", "单位性质", "行业领域", "所属市州", "所属园区", "拥有的省级及以上平台", "法人代表", "统一社会信用代码", "经济规模",
 					"人员规模", "成立时间", "注册资本", "通讯地址", "邮编", "联系人", "联系电话", "email", "主营业务及核心产品(服务)", "2018年度项目主营业务收入(万元)",
 					"2018年度项目净利润(万元)", "2019年度项目主营业务收入(万元)", "2019年度项目净利润(万元)", "年度研发投入", "年度研发投入占营业收入比例", "是否曾获银行贷款",
@@ -81,13 +80,12 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 					"拟采取的合作方式", "需求解决截止时间", "需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口", "需求解决方式", "企业产品是否有销往国外",
 					"企业产品是否有意向出口", "创建时间" };
     		String fileName ="需求征集表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
-    		//type 0 变更
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"需求征集表");
     		//根据列表编写文档
     		XSSFSheet sheet =wb.getSheetAt(0);
-//    		XSSFCellStyle styleTitle = wb.createCellStyle();
-//			styleTitle.setAlignment(HorizontalAlignment.CENTER);
-//			styleTitle.setWrapText(true);
+    		XSSFCellStyle styleTitle = wb.createCellStyle();
+			styleTitle.setAlignment(HorizontalAlignment.CENTER);
+			styleTitle.setWrapText(true);
     		for (OutDemandCollection ob : (List<OutDemandCollection>)list) {
     			//新增一行
     			XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
@@ -154,8 +152,8 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "是否有意向合作单位" : o = ob.getSfyyxhzdw(); break;
     				case "意向合作单位" : o = ob.getSfyyxhzdwValue(); break;
     				case "意向合作方式" : o = ob.getYxhzfs(); break;
-//    				case "企业已展开的国际与区域科技创新合作方式" : o = ob.getQyyzkdgjqykjcxhzqk(); break;
-//    				case "主要合作方式 " : o = ob.getZyhzfs(); break;
+    				case "企业已展开的国际与区域科技创新合作方式" : o = ob.getQyyzkdgjqykjcxhzqk(); break;
+    				case "主要合作方式 " : o = ob.getZyhzfs(); break;
     				case "已享受的科技政策" : o = ob.getYssdkjzc(); break;
     				case "拟申请的省级项目" : o = ob.getNsqdsjxm(); break; 
     				case "是否授权省科技主管部门将上述有关信息对外公开发布" : o = ob.getSqskjzgbmxxdwgkfb(); break;
@@ -192,12 +190,12 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				XSSFCell c = r.createCell(i);
     				sheet.autoSizeColumn(i,true); 
     				
-//    				c.setCellStyle(styleTitle);
-//    				if (sheet.getColumnWidth(i)>10000) {
-//    					sheet.setColumnWidth(i, 10000);
-//					}else {
-//						sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 12 / 10);
-//					}
+    				c.setCellStyle(styleTitle);
+    				if (sheet.getColumnWidth(i)>10000) {
+    					sheet.setColumnWidth(i, 10000);
+					}else {
+						sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 12 / 10);
+					}
     				c.setCellValue(o);
     			}
     		}