Procházet zdrojové kódy

Merge branch 'test' of jishutao/jitao-server into prod

anderx před 5 roky
rodič
revize
7de8680f26

+ 14 - 7
src/main/java/com/goafanti/demandCollection/service/impl/DemandCollectionServiceImpl.java

@@ -65,7 +65,7 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 	public void exportDemandCollectionList(HttpServletResponse response, InputDemandCollection idc) throws IOException {
 		OutputStream out = response.getOutputStream();
 		try {
-			List<OutDemandCollection>list=(List<OutDemandCollection>) demandCollectionList(idc).getList();
+			System.out.println(1);
 			String[] comment = { "编号", "单位名称", "单位性质", "行业领域", "所属市州", "所属园区", "拥有的省级及以上平台", "法人代表", "统一社会信用代码", "经济规模",
 					"人员规模", "成立时间", "注册资本", "通讯地址", "邮编", "联系人", "联系电话", "email", "主营业务及核心产品(服务)", "2018年度项目主营业务收入(万元)",
 					"2018年度项目净利润(万元)", "2019年度项目主营业务收入(万元)", "2019年度项目净利润(万元)", "年度研发投入", "年度研发投入占营业收入比例", "是否曾获银行贷款",
@@ -79,14 +79,17 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 					"需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口", "需求解决方式", "企业产品是否有销往国外", "企业产品是否有意向出口", "创建时间" };
     		String fileName ="需求征集表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"需求征集表");
+    		System.out.println(2);
     		//根据列表编写文档
     		XSSFSheet sheet =wb.getSheetAt(0);
+    		
     		XSSFCellStyle styleTitle = wb.createCellStyle();
 			styleTitle.setAlignment(HorizontalAlignment.CENTER);
 			styleTitle.setWrapText(true);
-    		for (OutDemandCollection ob : (List<OutDemandCollection>)list) {
+			System.out.println(3);
+    		for (OutDemandCollection ob : (List<OutDemandCollection>)demandCollectionList(idc).getList()) {
+    			System.out.println(4);
     			int x=0;
-    			
     			//新增一行
     			XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
     			for (int i = 0; i < comment.length; i++) {
@@ -146,7 +149,9 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "拟采取成果转移转化方式合作开发 " : o = ob.getNcqcgzyzhfshzkf(); break; 
     				case "拟采取成果转移转化方式技术转让 " : o = ob.getNcqcgzyzhfsjszr(); break; 
     				case "预计可转移转化时间" : o = ob.getYjkzyzhsj(); break; 
-    				case "成果简述" : o = ob.getCgjs(); break; 
+    				case "成果简述" : o = ob.getCgjs(); 
+    				if (x==0)sheet.setColumnWidth(i, 10000);
+    				break; 
     				case "是否有成果合作需求" : o = ob.getSfycghzxq(); break; 
     				case "是否有意向合作单位" : o = ob.getSfyyxhzdw(); break;
     				case "意向合作单位" : o = ob.getSfyyxhzdwValue(); break;
@@ -157,8 +162,10 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "主要合作方式 " : o = ob.getZyhzfs(); break;
     				case "已享受的科技政策" : o = ob.getYssdkjzc(); break;
     				case "拟申请的省级项目" : o = ob.getNsqdsjxm(); break; 
-    				case "是否授权省科技主管部门将上述有关信息对外公开发布" : 
-    					o = ob.getSqskjzgbmxxdwgkfb().replace("\n", String.valueOf((char)10)); 
+    				case "是否授权省科技主管部门将上述有关信息对外公开发布" :
+    					if (ob.getSqskjzgbmxxdwgkfb()!=null) {
+    						o = ob.getSqskjzgbmxxdwgkfb().replace("\n", String.valueOf((char)10)); 
+						}
     					if (x==0)sheet.setColumnWidth(i, 10000);
     					break;
     				case "技术负责人" : o = ob.getJsfzr(); break; 
@@ -202,7 +209,7 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 			 out.flush();
 			 out.close();
 		} catch (Exception e) {
-			logger.error(e.getLocalizedMessage());
+			
 			throw new BusinessException(new Error("表格生成错误。"));
 		}finally {
 			out.flush();