Sfoglia il codice sorgente

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 anni fa
parent
commit
71687b623d

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

@@ -91,7 +91,6 @@ public class OutDemandCollection {
 	private String ncqdhzfs;
 	private String ncqdhzfsValue;
 	private String xqjjjzsj;
-	private String xqsfkegk;
 	private String wjjjsntntgdhzzj;
 	private String zjyt;
 	private String zjqk;
@@ -758,6 +757,8 @@ public class OutDemandCollection {
 					str2 = str2 + "银行贷款,";
 				else if (string.equals("3"))
 					str2 = str2 + "股权融资,";
+				else if (string.equals("4"))
+					str2 = str2 + "其他,";
 			}
 			str2 = str2.substring(0, str2.length() - 1);
 			return str2;

+ 108 - 97
src/main/java/com/goafanti/demandCollection/service/impl/DemandCollectionServiceImpl.java

@@ -84,117 +84,128 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     		XSSFCellStyle styleTitle = wb.createCellStyle();
 			styleTitle.setAlignment(HorizontalAlignment.CENTER);
 			styleTitle.setWrapText(true);
+			int x=0;
     		for (OutDemandCollection ob : (List<OutDemandCollection>)demandCollectionList(idc).getList()) {
-    			int x=0;
     			//新增一行
     			XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
     			for (int i = 0; i < comment.length; i++) {
     				//当前列的只
     				String o = "";
-    				switch (comment[i]) {
-    				case "编号" : o = ob.getId(); break; 
-    				case "单位名称" : o = ob.getDwmc(); break; 
-    				case "单位性质" : o = ob.getDwxz(); break; 
-    				case "行业领域" : o = ob.getHtly(); break; 
-    				case "所属市州" : o = ob.getSsszc()+"-"+ob.getSssza(); break; 
-    				case "所属园区" : o = ob.getSsyq(); break; 
-    				case "拥有的省级及以上平台" : o = ob.getYysjjyspt(); break;
-    				case "法人代表" : o = ob.getFrdb(); break; 
-    				case "统一社会信用代码" : o = ob.getYysjjyspt(); break; 
-    				case "经济规模" : o = ob.getJjgm(); break; 
-    				case "人员规模" : o = ob.getRygm(); break;
-    				case "成立时间" : o = ob.getClsj(); break; 
-    				case "注册资本" : o = ob.getZczb(); break; 
-    				case "通讯地址" : o = ob.getTxdz(); break; 
-    				case "邮编" : o = ob.getYb(); break; 
-    				case "联系人" : o = ob.getLxr(); break; 
-    				case "联系电话" : o = ob.getLxdh(); break; 
-    				case "email" : o = ob.getEmail(); break; 
-    				case "主营业务及核心产品(服务)" : o = ob.getZyywjhxcp(); break; 
-    				case "2018年度项目主营业务收入(万元)" : o = ob.getNdxmzyywsr18(); break; 
-    				case "2018年度项目净利润(万元)" : o = ob.getNdxmjlr18(); break; 
-    				case "2019年度项目主营业务收入(万元)" : o = ob.getNdxmzyywsr19(); break; 
-    				case "2019年度项目净利润(万元)" : o = ob.getNdxmjlr19(); break; 
-    				case "年度研发投入" : o = ob.getNdyftr(); break; 
-    				case "年度研发投入占营业收入比例" : o = ob.getNdyftrzyysrbl(); break; 
-    				case "是否曾获银行贷款" : o = ob.getSfchyhdk(); break;
-    				case "银行贷款" : o = ob.getSfchyhdkValue(); break;
-    				case "是否为高新技术企业编号 " : o = ob.getSfwgxjsqy(); break;
-    				case "高企证书编号 " : o = ob.getSfwgxjsqyValue(); break;
-    				case "是否为科技型中小企业" : o = ob.getSfwkjxzxqy(); break;
-    				case "科企证书编号" : o = ob.getSfwkjxzxqyValue(); break;
-    				case "专利数量" : o = ob.getZlsl(); break; 
-    				case "发明专利" : o = ob.getZlslFmzl(); break; 
-    				case "实用新型" : o = ob.getZlslSyxx(); break; 
-    				case "是否曾获科技专项资金" : o = ob.getSfchkjzxzj(); break; 
-    				case "是否有产学研合作" : o = ob.getSfycxyz(); break;
-    				case "产学研合作" : o = ob.getSfycxyzValue(); break;
-    				case "是否已获机构投资者投资 " : o = ob.getSfyhjgtzztz(); break;
-    				case "机构投资者投资 " : o = ob.getSfyhjgtzztzValue(); break;
-    				case "成果名称" : o = ob.getCgmc(); break;
-    				case "成果领域" : o = ob.getCgly(); break; 
-    				case "成果属性" : o = ob.getCgsx(); break; 
-    				case "成果体现形式" : o = ob.getCgtxxs(); break; 
-    				case "成果成熟度" : o = ob.getCgcsd(); break; 
-    				case "成果知识产权形式" : o = ob.getCgzscqxs(); break; 
-    				case "知识产权权属 " : o = ob.getZscqqs(); break; 
-    				case "专利状态" : o = ob.getZlzt(); break; 
-    				case "成果登记情况" : o = ob.getCgdjqk(); break;
-    				case "成果登记编号" : o = ob.getCgdjqkValue(); break;
-    				case "拟采取成果转移转化方式自主转化 " : o = ob.getNcqcgzyzhfszzzh(); break; 
-    				case "拟采取成果转移转化方式合作开发 " : o = ob.getNcqcgzyzhfshzkf(); break; 
-    				case "拟采取成果转移转化方式技术转让 " : o = ob.getNcqcgzyzhfsjszr(); break; 
-    				case "预计可转移转化时间" : o = ob.getYjkzyzhsj(); 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;
-    				case "意向合作方式" : o = ob.getYxhzfs(); break;
-    				case "企业已展开的国际与区域科技创新合作方式" : o = ob.getQyyzkdgjqykjcxhzqk();
-    					if (x==0)sheet.setColumnWidth(i, 10000);
+    					switch (comment[i]) {
+    					case "编号" : o = ob.getId(); break; 
+    					case "单位名称" : o = ob.getDwmc(); break;
+    					case "单位性质" : o = ob.getDwxz(); break; 
+    					case "行业领域" : o = ob.getHtly(); break; 
+    					case "所属市州" : o = ob.getSsszc()+"-"+ob.getSssza(); break; 
+    					case "所属园区" : o = ob.getSsyq(); break; 
+    					case "拥有的省级及以上平台" : o = ob.getYysjjyspt(); break;
+    					case "法人代表" : o = ob.getFrdb(); break; 
+    					case "统一社会信用代码" : o = ob.getYysjjyspt(); break; 
+    					case "经济规模" : o = ob.getJjgm(); break; 
+    					case "人员规模" : o = ob.getRygm(); break;
+    					case "成立时间" : o = ob.getClsj(); break; 
+    					case "注册资本" : o = ob.getZczb(); break; 
+    					case "通讯地址" : o = ob.getTxdz(); break; 
+    					case "邮编" : o = ob.getYb(); break; 
+    					case "联系人" : o = ob.getLxr(); break; 
+    					case "联系电话" : o = ob.getLxdh(); break; 
+    					case "email" : o = ob.getEmail(); break; 
+    					case "主营业务及核心产品(服务)" : o = ob.getZyywjhxcp(); break; 
+    					case "2018年度项目主营业务收入(万元)" : o = ob.getNdxmzyywsr18(); break; 
+    					case "2018年度项目净利润(万元)" : o = ob.getNdxmjlr18(); break; 
+    					case "2019年度项目主营业务收入(万元)" : o = ob.getNdxmzyywsr19(); break; 
+    					case "2019年度项目净利润(万元)" : o = ob.getNdxmjlr19(); break; 
+    					case "年度研发投入" : o = ob.getNdyftr(); break; 
+    					case "年度研发投入占营业收入比例" : o = ob.getNdyftrzyysrbl(); break; 
+    					case "是否曾获银行贷款" : o = ob.getSfchyhdk(); break;
+    					case "银行贷款" : o = ob.getSfchyhdkValue(); break;
+    					case "是否为高新技术企业编号 " : o = ob.getSfwgxjsqy(); break;
+    					case "高企证书编号 " : o = ob.getSfwgxjsqyValue(); break;
+    					case "是否为科技型中小企业" : o = ob.getSfwkjxzxqy(); break;
+    					case "科企证书编号" : o = ob.getSfwkjxzxqyValue(); break;
+    					case "专利数量" : o = ob.getZlsl(); break; 
+    					case "发明专利" : o = ob.getZlslFmzl(); break; 
+    					case "实用新型" : o = ob.getZlslSyxx(); break; 
+    					case "是否曾获科技专项资金" : o = ob.getSfchkjzxzj(); break; 
+    					case "是否有产学研合作" : o = ob.getSfycxyz(); break;
+    					case "产学研合作" : o = ob.getSfycxyzValue(); break;
+    					case "是否已获机构投资者投资 " : o = ob.getSfyhjgtzztz(); break;
+    					case "机构投资者投资 " : o = ob.getSfyhjgtzztzValue(); break;
+    					case "成果名称" : o = ob.getCgmc(); break;
+    					case "成果领域" : o = ob.getCgly(); break; 
+    					case "成果属性" : o = ob.getCgsx(); break; 
+    					case "成果体现形式" : o = ob.getCgtxxs(); break; 
+    					case "成果成熟度" : o = ob.getCgcsd(); break; 
+    					case "成果知识产权形式" : o = ob.getCgzscqxs(); break; 
+    					case "知识产权权属 " : o = ob.getZscqqs(); break; 
+    					case "专利状态" : o = ob.getZlzt(); break; 
+    					case "成果登记情况" : o = ob.getCgdjqk(); break;
+    					case "成果登记编号" : o = ob.getCgdjqkValue(); break;
+    					case "拟采取成果转移转化方式自主转化 " : o = ob.getNcqcgzyzhfszzzh(); break; 
+    					case "拟采取成果转移转化方式合作开发 " : o = ob.getNcqcgzyzhfshzkf(); break; 
+    					case "拟采取成果转移转化方式技术转让 " : o = ob.getNcqcgzyzhfsjszr(); break; 
+    					case "预计可转移转化时间" : o = ob.getYjkzyzhsj(); break; 
+    					case "成果简述" : o = ob.getCgjs(); 
+    					if (x==0)sheet.setColumnWidth(i, 20000);
+    					break; 
+    					case "是否有成果合作需求" : o = ob.getSfycghzxq(); break; 
+    					case "是否有意向合作单位" : o = ob.getSfyyxhzdw(); break;
+    					case "意向合作单位" : o = ob.getSfyyxhzdwValue(); break;
+    					case "意向合作方式" : o = ob.getYxhzfs(); break;
+    					case "企业已展开的国际与区域科技创新合作方式" : o = ob.getQyyzkdgjqykjcxhzqk();
+    					if (x==0)sheet.setColumnWidth(i, 20000);
     					break;
-    				case "主要合作方式 " : o = ob.getZyhzfs(); break;
-    				case "已享受的科技政策" : o = ob.getYssdkjzc(); break;
-    				case "拟申请的省级项目" : o = ob.getNsqdsjxm(); break; 
-    				case "是否授权省科技主管部门将上述有关信息对外公开发布" :
-    					if (ob.getSqskjzgbmxxdwgkfb()!=null) {
-    						o = ob.getSqskjzgbmxxdwgkfb().replace("\n", String.valueOf((char)10)); 
-						}
+    					case "主要合作方式 " : o = ob.getZyhzfs(); break;
+    					case "已享受的科技政策" : o = ob.getYssdkjzc(); break;
+    					case "拟申请的省级项目" : o = ob.getNsqdsjxm(); break; 
+    					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; 
+    					case "技术负责人手机" : o = ob.getJsfsj(); break; 
+    					case "需求名称" : o = ob.getXqmc(); break; 
+    					case "需求类别" : o = ob.getXqbl(); break; 
+    					case "技术需求类型" : o = ob.getJsxqlx(); break; 
+    					case "需求领域" : o = ob.getXqly(); break; 
+    					case "目前产品技术现状" : o = ob.getMqcpjsxz();
+    					if (x==0)sheet.setColumnWidth(i, 10000);
+    					break; 
+    					case "研发难点" : o = ob.getYfnd(); 
     					if (x==0)sheet.setColumnWidth(i, 10000);
     					break;
-    				case "技术负责人" : o = ob.getJsfzr(); break; 
-    				case "技术负责人手机" : o = ob.getJsfsj(); break; 
-    				case "需求名称" : o = ob.getXqmc(); break; 
-    				case "需求类别" : o = ob.getXqbl(); break; 
-    				case "技术需求类型" : o = ob.getJsxqlx(); break; 
-    				case "需求领域" : o = ob.getXqly(); break; 
-    				case "目前产品技术现状" : o = ob.getMqcpjsxz(); break; 
-    				case "研发难点" : o = ob.getYfnd(); break; 
-    				case "预期达到的效果(主要技术指标、技术成熟度、条件、成本等)" : o = ob.getYqdddxg(); break; 
-    				case "已经开展的工作" : o = ob.getYjzkdgz(); break; 
-    				case "现有研发条件情况(人员情况、仪器设备投入等)" : o = ob.getXyyftjqk(); break; 
-    				case "目前合作对象情况(合作对象、方式、已投入研发资金情况等)" : o = ob.getMqhzdxqk(); break; 
-    				case "是否有下一步合作需求" : o = ob.getSfyxybhzxq(); break; 
-    				case "意向合作对象" : o = ob.getYxhzdx(); break; 
-    				case "合作单位名称" : o = ob.getYxhzdxValue(); break;
-    				case "拟采取的合作方式" : o = ob.getNcqdhzfs(); break; 
-    				case "需求解决截止时间" : o = ob.getXqjjjzsj(); break; 
-    				case "为解决技术难题能提供的合作资金" : o = ob.getWjjjsntntgdhzzj(); break; 
-    				case "资金用途" : o = ob.getZjyt(); break; 
-    				case "资金缺口" : o = ob.getZjqk(); break; 
-    				case "需求解决方式" : o = ob.getXqjjfs(); break; 
-    				case "企业产品是否有销往国外": o = ob.getSfxwgw(); break;
-    				case "企业产品是否有意向出口": o = ob.getSfyxck(); break;
-    				case "创建时间": o = ob.getCreateTime(); break;
-    				default: o = ""; break;
+    					case "预期达到的效果(主要技术指标、技术成熟度、条件、成本等)" : o = ob.getYqdddxg(); 
+    					if (x==0)sheet.setColumnWidth(i, 10000);
+    					break; 
+    					case "已经开展的工作" : o = ob.getYjzkdgz(); 
+    					if (x==0)sheet.setColumnWidth(i, 10000);
+    					break; 
+    					case "现有研发条件情况(人员情况、仪器设备投入等)" : o = ob.getXyyftjqk();
+    					if (x==0)sheet.setColumnWidth(i, 10000);
+    					break; 
+    					case "目前合作对象情况(合作对象、方式、已投入研发资金情况等)" : o = ob.getMqhzdxqk(); 
+    					if (x==0)sheet.setColumnWidth(i, 10000);
+    					break; 
+    					case "是否有下一步合作需求" : o = ob.getSfyxybhzxq(); break; 
+    					case "意向合作对象" : o = ob.getYxhzdx(); break; 
+    					case "合作单位名称" : o = ob.getYxhzdxValue(); break;
+    					case "拟采取的合作方式" : o = ob.getNcqdhzfs(); break; 
+    					case "需求解决截止时间" : o = ob.getXqjjjzsj(); break; 
+    					case "为解决技术难题能提供的合作资金" : o = ob.getWjjjsntntgdhzzj(); break; 
+    					case "资金用途" : o = ob.getZjyt(); break; 
+    					case "资金缺口" : o = ob.getZjqk(); break; 
+    					case "需求解决方式" : o = ob.getXqjjfs(); break; 
+    					case "企业产品是否有销往国外": o = ob.getSfxwgw(); break;
+    					case "企业产品是否有意向出口": o = ob.getSfyxck(); break;
+    					case "创建时间": o = ob.getCreateTime(); break;
+    					default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);
     				c.setCellStyle(styleTitle);
     				c.setCellValue(o);
     			}
-    			
     			x++;
     		}
     		//返回名称及参数

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -1,11 +1,11 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=dev
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20181217?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.url=jdbc:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=dev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20