Переглянути джерело

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 роки тому
батько
коміт
a230d17616
19 змінених файлів з 11103 додано та 11 видалено
  1. 4 5
      GeneratorConfig.xml
  2. 4 0
      src/main/java/com/goafanti/common/controller/BaseController.java
  3. 7 1
      src/main/java/com/goafanti/common/controller/PortalController.java
  4. 2 2
      src/main/java/com/goafanti/common/controller/PublicController.java
  5. 76 0
      src/main/java/com/goafanti/common/dao/DemandCollectionMapper.java
  6. 1634 0
      src/main/java/com/goafanti/common/mapper/DemandCollectionMapper.xml
  7. 2057 0
      src/main/java/com/goafanti/common/model/DemandCollection.java
  8. 6073 0
      src/main/java/com/goafanti/common/model/DemandCollectionExample.java
  9. 88 0
      src/main/java/com/goafanti/common/utils/ExportExcelUtil.java
  10. 24 0
      src/main/java/com/goafanti/demandCollection/bo/InputDemandCollection.java
  11. 830 0
      src/main/java/com/goafanti/demandCollection/bo/OutDemandCollection.java
  12. 71 0
      src/main/java/com/goafanti/demandCollection/controller/OpenDemandCollectionApiController.java
  13. 20 0
      src/main/java/com/goafanti/demandCollection/service/DemandCollectionService.java
  14. 188 0
      src/main/java/com/goafanti/demandCollection/service/impl/DemandCollectionServiceImpl.java
  15. 0 3
      src/main/java/com/goafanti/order/controller/AdminJtOrderController.java
  16. 1 0
      src/main/resources/props/config_local.properties
  17. 1 0
      src/main/resources/shiro_base_auth.ini
  18. 1 0
      src/main/webapp/WEB-INF/views/common.html
  19. 22 0
      src/main/webapp/WEB-INF/views/skjt/s_index.html

+ 4 - 5
GeneratorConfig.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
-   <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.44.jar" />
-  <!-- <classPathEntry location="E:/mysql-connector-java-5.1.46.jar" /> -->
+   <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.39.jar" /> 
+   <!-- <classPathEntry location="C:\Users\Administrator\.dbeaver-drivers\maven\maven-central\mysql\mysql-connector-java-5.1.44.jar" /> -->
   <context id="context1">	
- 	<property name="javaFileEncoding" value="UTF-8"/>
-    <jdbcConnection connectionURL="jdbc:mysql://192.168.0.17:3306/aft" 
+     <jdbcConnection connectionURL="jdbc:mysql://localhost:3306/aft"  
     	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="jitao-server" />
    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="jitao-server" />
    <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="jitao-server" type="XMLMAPPER" />
-   <table schema="aft" tableName="jt_video"/>
+   <table schema="aft" tableName="demand_collection"/>
   </context>
 </generatorConfiguration>

+ 4 - 0
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -32,6 +32,9 @@ public class BaseController {
 
 	@Value(value = "${static.host}")
 	private String					staticHost			= null;
+	
+	@Value(value = "${skjt.host}")
+	private String					skjtHost			= null;
 
 	@Value(value = "${avatar.host}")
 	private String					avatarHost			= null;
@@ -114,6 +117,7 @@ public class BaseController {
 
 		model.addAttribute("staticDomain", avatarHost);
 		model.addAttribute("staticHost", staticHost);
+		model.addAttribute("skjtHost", skjtHost);
 		model.addAttribute("avatarHost", avatarHost);
 		model.addAttribute("avatarUploadHost", avatarUploadHost);
 		model.addAttribute("portalHost", portalHost);

+ 7 - 1
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -82,7 +82,13 @@ public class PortalController extends BaseController {
 	private PolicyService policyService;
 	@Resource
 	private NewsService newsService;
-
+	
+	@RequestMapping(value = "/skjt", method = RequestMethod.GET)
+	public ModelAndView jkjt(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/skjt/s_index");
+		return modelview;
+	}
+	
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
 		return home(request, modelview);

+ 2 - 2
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -35,6 +35,7 @@ import com.goafanti.comment.service.CommentService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.enums.UserType;
+import com.goafanti.common.model.DemandCollection;
 import com.goafanti.common.model.JtBusinessProject;
 import com.goafanti.common.model.JtVoucherDetail;
 import com.goafanti.common.model.User;
@@ -889,8 +890,7 @@ public class PublicController extends BaseController {
 			}
 		}
 		map.put( "zffc",zfList);
-		
-		
 		return res.data(map);
 	}
+	
 }

+ 76 - 0
src/main/java/com/goafanti/common/dao/DemandCollectionMapper.java

@@ -0,0 +1,76 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.DemandCollection;
+import com.goafanti.common.model.DemandCollectionExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DemandCollectionMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	long countByExample(DemandCollectionExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	int deleteByExample(DemandCollectionExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	int insert(DemandCollection record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	int insertSelective(DemandCollection record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	List<DemandCollection> selectByExample(DemandCollectionExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	DemandCollection selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") DemandCollection record,
+			@Param("example") DemandCollectionExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	int updateByExample(@Param("record") DemandCollection record, @Param("example") DemandCollectionExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	int updateByPrimaryKeySelective(DemandCollection record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 */
+	int updateByPrimaryKey(DemandCollection record);
+}

Різницю між файлами не показано, бо вона завелика
+ 1634 - 0
src/main/java/com/goafanti/common/mapper/DemandCollectionMapper.xml


Різницю між файлами не показано, бо вона завелика
+ 2057 - 0
src/main/java/com/goafanti/common/model/DemandCollection.java


Різницю між файлами не показано, бо вона завелика
+ 6073 - 0
src/main/java/com/goafanti/common/model/DemandCollectionExample.java


+ 88 - 0
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -0,0 +1,88 @@
+package com.goafanti.common.utils;
+
+
+
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+
+public class ExportExcelUtil {
+	
+	//设置单元格格式
+	public static XSSFCellStyle setCellStyle1(XSSFWorkbook workbook){
+		// 设置字体  
+		XSSFFont font = workbook.createFont();  
+		// font.setColor(HSSFFont.COLOR_RED);  
+		font.setFontName("微软雅黑");
+		font.setFontHeightInPoints((short) 14);//字体大小  
+		  
+		// 设置样式  
+		XSSFCellStyle cellStyle = workbook.createCellStyle();  
+		cellStyle.setFont(font);  //字体
+        
+        // 设置单元格内容水平对其方式   
+        // XSSFCellStyle.ALIGN_CENTER       居中对齐   
+        // XSSFCellStyle.ALIGN_LEFT         左对齐   
+        // XSSFCellStyle.ALIGN_RIGHT        右对齐   
+		cellStyle.setAlignment(HorizontalAlignment.CENTER);  
+		//设置自动换行
+		cellStyle.setWrapText(true);
+		return cellStyle;
+	}
+	public static XSSFCellStyle setCellStyle2(XSSFWorkbook workbook){
+		// 设置字体  
+		XSSFFont font = workbook.createFont();  
+		// font.setColor(HSSFFont.COLOR_RED);  
+		font.setFontName("微软雅黑");
+		font.setFontHeightInPoints((short) 12);//字体大小  
+		  
+		// 设置样式  
+		XSSFCellStyle cellStyle = workbook.createCellStyle();  
+		cellStyle.setFont(font);  //字体
+        
+        // 设置单元格内容水平对其方式   
+        // XSSFCellStyle.ALIGN_CENTER       居中对齐   
+        // XSSFCellStyle.ALIGN_LEFT         左对齐   
+        // XSSFCellStyle.ALIGN_RIGHT        右对齐   
+		cellStyle.setAlignment(HorizontalAlignment.CENTER);  
+		//设置自动换行
+		cellStyle.setWrapText(true);
+		return cellStyle;
+	}
+	
+
+	
+	public static XSSFWorkbook exportTemplateInfoS(String[] comment,String fileName){
+		//map 数据 ,comment表头 (列名称)
+		//1,创建一个workbook,对应的是一个excel文件
+		XSSFWorkbook wb = new XSSFWorkbook();
+		//遍历map
+		XSSFSheet sheet = wb.createSheet(fileName);
+		//3。创建一个row
+		XSSFRow row = sheet.createRow(0);
+		//4.创建一个cell
+		XSSFCell cell = row.createCell(0);
+		cell.setCellValue(fileName);
+		XSSFCellStyle style1 = ExportExcelUtil.setCellStyle1(wb);//标题
+		XSSFCellStyle style2 = ExportExcelUtil.setCellStyle2(wb);//正文
+		cell.setCellStyle(style1);
+		//合并列
+		sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, comment.length-1));//合并单元格
+		//设置其他单位格式
+		//创建表头
+		XSSFRow row2 = sheet.createRow(1);
+		for(int i = 0; i < comment.length; i++){
+			sheet.setColumnWidth(i, 3000);//设置列宽
+			XSSFCell c = row2.createCell(i);
+			c.setCellValue(comment[i]);
+			c.setCellStyle(style2);
+		}
+		return wb;
+	}
+}

+ 24 - 0
src/main/java/com/goafanti/demandCollection/bo/InputDemandCollection.java

@@ -0,0 +1,24 @@
+package com.goafanti.demandCollection.bo;
+
+public class InputDemandCollection {
+	private Integer pageSize;
+	private Integer pageNo;
+	public Integer getPageSize() {
+		if (pageSize==null||pageSize<1) {
+			return 10;
+		}
+		return pageSize;
+	}
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+	public Integer getPageNo() {
+		if (pageNo==null||pageNo<1) {
+			return 1;
+		}
+		return pageNo;
+	}
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+}

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

@@ -0,0 +1,830 @@
+package com.goafanti.demandCollection.bo;
+
+public class OutDemandCollection {
+	private String id;
+	private String dwmc;
+	private String dwxz;
+	private String htly;
+	private String ssszp;
+	private String ssszc;
+	private String ssyq;
+	private String yysjjyspt;
+	private String tyshxydm;
+	private String jjgm;
+	private String rygm;
+	private String zczb;
+	private String txdz;
+	private String yb;
+	private String lxr;
+	private String lxdh;
+	private String email;
+	private String zyywjhxcp;
+	private String ndxmzyywsr18;
+	private String ndxmjlr18;
+	private String ndxmzyywsr19;
+	private String ndxmjlr19;
+	private String ndyftr;
+	private String ndyftrzyysrbl;
+	private String sfchyhdk;
+	private String sfchyhdkValue;
+	private String sfwgxjsqy;
+	private String sfwgxjsqyValue;
+	private String sfwkjxzxqy;
+	private String sfwkjxzxqyValue;
+	private String zlsl;
+	private String zlslFmzl;
+	private String zlslSyxx;
+	private String sfchkjzxzj;
+	private String sfycxyz;
+	private String sfycxyzValue;
+	private String sfyhjgtzztz;
+	private String sfyhjgtzztzValue;
+	private String cgly;
+	private String cgsx;
+	private String cgtxxs;
+	private String cgtxxsValue;
+	private String cgcsd;
+	private String cgzscqxs;
+	private String zscqqs;
+	private String zlzt;
+	private String cgdjqk;
+	private String cgdjqkValue;
+	private String ncqcgzyzhfszzzh;
+	private String ncqcgzyzhfshzkf;
+	private String ncqcgzyzhfsjszr;
+	private String yjkzyzhsj;
+	private String cgjs;
+	private String sfycghzxq;
+	private String sfyyxhzdw;
+	private String sfyyxhzdwValue;
+	private String yxhzfs;
+	private String yxhzfsValue;
+	private String yssdkjzc;
+	private String yssdkjzcValue;
+	private String nsqdsjxm;
+	private String sqskjzgbmxxdwgkfb;
+	private String sqskjzgbmxxdwgkfbValue;
+	private String tbr;
+	private String tbrsj;
+	private String jsfzr;
+	private String jsfsj;
+	private String xqmc;
+	private String xqbl;
+	private String jsxqlx;
+	private String xqly;
+	private String mqcpjsxz;
+	private String yfnd;
+	private String yqdddxg;
+	private String yjzkdgz;
+	private String xyyftjqk;
+	private String mqhzdxqk;
+	private String sfyxybhzxq;
+	private String yxhzdx;
+	private String yxhzdxValue;
+	private String ncqdhzfs;
+	private String ncqdhzfsValue;
+	private String xqjjjzsj;
+	private String xqsfkegk;
+	private String wjjjsntntgdhzzj;
+	private String zjyt;
+	private String zjqk;
+	private String xqjjfs;
+	private String createTime;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getDwmc() {
+		return dwmc;
+	}
+	public void setDwmc(String dwmc) {
+		this.dwmc = dwmc;
+	}
+	public String getDwxz() {
+		if (dwxz.equals("0")) {
+			return "其他";
+		}else if (dwxz.equals("1")) {
+			return "高等院校";
+		}else if (dwxz.equals("2")) {
+			return "国有科研机构";
+		}else if (dwxz.equals("3")) {
+			return "新型独立研发机构";
+		}else if (dwxz.equals("4")) {
+			return "国有企业";
+		}else if (dwxz.equals("5")) {
+			return "民营企业";
+		}else if (dwxz.equals("6")) {
+			return "科技中介服务机构";
+		} else if (dwxz.equals("7")) {
+			return "省产业技术创新战略联盟";
+		} else if (dwxz.equals("8")) {
+			return "全省性科技行业协会";
+		}
+		return dwxz;
+	}
+	public void setDwxz(String dwxz) {
+		this.dwxz = dwxz;
+	}
+	public String getHtly() {
+		if(htly.equals("0"))return "其他";
+		else if(htly.equals("1"))return "新型材料";
+		else if(htly.equals("2"))return "电子信息";
+		else if(htly.equals("3"))return "机械";
+		else if(htly.equals("4"))return "电气自动化";
+		else if(htly.equals("5"))return "新能源";
+		else if(htly.equals("6"))return "环保和资源";
+		else if(htly.equals("7"))return "轻工纺织";
+		else if(htly.equals("8"))return "航空航天";
+		else if(htly.equals("9"))return "医药医疗";
+		else if(htly.equals("10"))return "包装印刷";
+		else if(htly.equals("11"))return "海洋工程";
+		else if(htly.equals("12"))return "仪器仪表";
+		else if(htly.equals("13"))return "建筑建材";
+		else if(htly.equals("14"))return "农林牧渔";
+		else if(htly.equals("15"))return "食品饮料";
+		else if(htly.equals("16"))return "采矿冶金";
+		else if(htly.equals("17"))return "生活家居";
+		else if(htly.equals("18"))return "化学化工";
+		else if(htly.equals("19"))return "安全防护";
+		else if(htly.equals("20"))return "交通运输";
+		else if(htly.equals("21"))return "橡胶塑料";
+		else if(htly.equals("22"))return "教育";
+		else if(htly.equals("23"))return "休闲";
+		return htly;
+	}
+	public void setHtly(String htly) {
+		this.htly = htly;
+	}
+	public String getSsszp() {
+		return ssszp;
+	}
+	public void setSsszp(String ssszp) {
+		this.ssszp = ssszp;
+	}
+	public String getSsszc() {
+		return ssszc;
+	}
+	public void setSsszc(String ssszc) {
+		this.ssszc = ssszc;
+	}
+	public String getSsyq() {
+		return ssyq;
+	}
+	public void setSsyq(String ssyq) {
+		this.ssyq = ssyq;
+	}
+	public String getYysjjyspt() {
+		return yysjjyspt;
+	}
+	public void setYysjjyspt(String yysjjyspt) {
+		this.yysjjyspt = yysjjyspt;
+	}
+	public String getTyshxydm() {
+		return tyshxydm;
+	}
+	public void setTyshxydm(String tyshxydm) {
+		this.tyshxydm = tyshxydm;
+	}
+	public String getJjgm() {
+		return jjgm;
+	}
+	public void setJjgm(String jjgm) {
+		this.jjgm = jjgm;
+	}
+	public String getRygm() {
+		return rygm;
+	}
+	public void setRygm(String rygm) {
+		this.rygm = rygm;
+	}
+	public String getZczb() {
+		return zczb;
+	}
+	public void setZczb(String zczb) {
+		this.zczb = zczb;
+	}
+	public String getTxdz() {
+		return txdz;
+	}
+	public void setTxdz(String txdz) {
+		this.txdz = txdz;
+	}
+	public String getYb() {
+		return yb;
+	}
+	public void setYb(String yb) {
+		this.yb = yb;
+	}
+	public String getLxr() {
+		return lxr;
+	}
+	public void setLxr(String lxr) {
+		this.lxr = lxr;
+	}
+	public String getLxdh() {
+		return lxdh;
+	}
+	public void setLxdh(String lxdh) {
+		this.lxdh = lxdh;
+	}
+	public String getEmail() {
+		return email;
+	}
+	public void setEmail(String email) {
+		this.email = email;
+	}
+	public String getZyywjhxcp() {
+		return zyywjhxcp;
+	}
+	public void setZyywjhxcp(String zyywjhxcp) {
+		this.zyywjhxcp = zyywjhxcp;
+	}
+	public String getNdxmzyywsr18() {
+		return ndxmzyywsr18;
+	}
+	public void setNdxmzyywsr18(String ndxmzyywsr18) {
+		this.ndxmzyywsr18 = ndxmzyywsr18;
+	}
+	public String getNdxmjlr18() {
+		return ndxmjlr18;
+	}
+	public void setNdxmjlr18(String ndxmjlr18) {
+		this.ndxmjlr18 = ndxmjlr18;
+	}
+	public String getNdxmzyywsr19() {
+		return ndxmzyywsr19;
+	}
+	public void setNdxmzyywsr19(String ndxmzyywsr19) {
+		this.ndxmzyywsr19 = ndxmzyywsr19;
+	}
+	public String getNdxmjlr19() {
+		return ndxmjlr19;
+	}
+	public void setNdxmjlr19(String ndxmjlr19) {
+		this.ndxmjlr19 = ndxmjlr19;
+	}
+	public String getNdyftr() {
+		if(ndyftr.equals("1")) { return "1~50万元";}
+		else if(ndyftr.equals("2")) { return "50~500万元";}
+		else if(ndyftr.equals("3")) { return "500~1000万";}
+		else if(ndyftr.equals("4")) { return "1000万元以上 ";}
+		
+		return ndyftr;
+	}
+	public void setNdyftr(String ndyftr) {
+		this.ndyftr = ndyftr;
+	}
+	public String getNdyftrzyysrbl() {
+		if(ndyftrzyysrbl.equals("1")) { return "1%以内";}
+		else if(ndyftrzyysrbl.equals("2")) { return "1%~3%";}
+		else if(ndyftrzyysrbl.equals("3")) { return "3%~5%";}
+		else if(ndyftrzyysrbl.equals("4")) { return "5%~10%";}
+		else if(ndyftrzyysrbl.equals("5")) { return "10%以上";}
+		return ndyftrzyysrbl;
+	}
+	public void setNdyftrzyysrbl(String ndyftrzyysrbl) {
+		this.ndyftrzyysrbl = ndyftrzyysrbl;
+	}
+	public String getSfchyhdk() {
+		return sfchyhdk.equals("1")?"是":"否";
+	}
+	public void setSfchyhdk(String sfchyhdk) {
+		this.sfchyhdk = sfchyhdk;
+	}
+	public String getSfchyhdkValue() {
+		return sfchyhdkValue;
+	}
+	public void setSfchyhdkValue(String sfchyhdkValue) {
+		this.sfchyhdkValue = sfchyhdkValue;
+	}
+	public String getSfwgxjsqy() {
+		return sfwgxjsqy.equals("1")?"是":"否";
+	}
+	public void setSfwgxjsqy(String sfwgxjsqy) {
+		this.sfwgxjsqy = sfwgxjsqy;
+	}
+	public String getSfwgxjsqyValue() {
+		return sfwgxjsqyValue;
+	}
+	public void setSfwgxjsqyValue(String sfwgxjsqyValue) {
+		this.sfwgxjsqyValue = sfwgxjsqyValue;
+	}
+	public String getSfwkjxzxqy() {
+		return sfwkjxzxqy.equals("1")?"是":"否";
+	}
+	public void setSfwkjxzxqy(String sfwkjxzxqy) {
+		this.sfwkjxzxqy = sfwkjxzxqy;
+	}
+	public String getSfwkjxzxqyValue() {
+		return sfwkjxzxqyValue;
+	}
+	public void setSfwkjxzxqyValue(String sfwkjxzxqyValue) {
+		this.sfwkjxzxqyValue = sfwkjxzxqyValue;
+	}
+	public String getZlsl() {
+		return zlsl.equals("1")?"有":"无";
+	}
+	public void setZlsl(String zlsl) {
+		this.zlsl = zlsl;
+	}
+	public String getZlslFmzl() {
+		return zlslFmzl;
+	}
+	public void setZlslFmzl(String zlslFmzl) {
+		this.zlslFmzl = zlslFmzl;
+	}
+	public String getZlslSyxx() {
+		return zlslSyxx;
+	}
+	public void setZlslSyxx(String zlslSyxx) {
+		this.zlslSyxx = zlslSyxx;
+	}
+	public String getSfchkjzxzj() {
+		
+		return sfchkjzxzj.equals("1")?"是":"否";
+	}
+	public void setSfchkjzxzj(String sfchkjzxzj) {
+		this.sfchkjzxzj = sfchkjzxzj;
+	}
+	public String getSfycxyz() {
+		
+		return sfycxyz.equals("1")?"是":"否";
+	}
+	public void setSfycxyz(String sfycxyz) {
+		this.sfycxyz = sfycxyz;
+	}
+	public String getSfycxyzValue() {
+		return sfycxyzValue;
+	}
+	public void setSfycxyzValue(String sfycxyzValue) {
+		this.sfycxyzValue = sfycxyzValue;
+	}
+	public String getSfyhjgtzztz() {
+		return sfyhjgtzztz.equals("1")?"是":"否";
+	}
+	public void setSfyhjgtzztz(String sfyhjgtzztz) {
+		this.sfyhjgtzztz = sfyhjgtzztz;
+	}
+	public String getSfyhjgtzztzValue() {
+		return sfyhjgtzztzValue;
+	}
+	public void setSfyhjgtzztzValue(String sfyhjgtzztzValue) {
+		this.sfyhjgtzztzValue = sfyhjgtzztzValue;
+	}
+	public String getCgly() {
+		if(cgly.equals("0"))return "其他";
+		else if(cgly.equals("1"))return "新型材料";
+		else if(cgly.equals("2"))return "电子信息";
+		else if(cgly.equals("3"))return "机械";
+		else if(cgly.equals("4"))return "电气自动化";
+		else if(cgly.equals("5"))return "新能源";
+		else if(cgly.equals("6"))return "环保和资源";
+		else if(cgly.equals("7"))return "轻工纺织";
+		else if(cgly.equals("8"))return "航空航天";
+		else if(cgly.equals("9"))return "医药医疗";
+		else if(cgly.equals("10"))return "包装印刷";
+		else if(cgly.equals("11"))return "海洋工程";
+		else if(cgly.equals("12"))return "仪器仪表";
+		else if(cgly.equals("13"))return "建筑建材";
+		else if(cgly.equals("14"))return "农林牧渔";
+		else if(cgly.equals("15"))return "食品饮料";
+		else if(cgly.equals("16"))return "采矿冶金";
+		else if(cgly.equals("17"))return "生活家居";
+		else if(cgly.equals("18"))return "化学化工";
+		else if(cgly.equals("19"))return "安全防护";
+		else if(cgly.equals("20"))return "交通运输";
+		else if(cgly.equals("21"))return "橡胶塑料";
+		else if(cgly.equals("22"))return "教育";
+		else if(cgly.equals("23"))return "休闲";
+		return cgly;
+	}
+	public void setCgly(String cgly) {
+		this.cgly = cgly;
+	}
+	
+	public String getCgsx() {
+		if(cgsx.equals("1"))return "原始性创新";
+		else if(cgsx.equals("2"))return "国外引进、消化吸收创新";
+		else if(cgsx.equals("3"))return "国内技术二次开发";
+		return cgsx;
+	}
+	public void setCgsx(String cgsx) {
+		this.cgsx = cgsx;
+	}
+	public String getCgtxxs() {
+		if(cgtxxs.equals("0"))return cgtxxsValue;
+		else if(cgtxxs.equals("1"))return "学术论文/专著";
+		else if(cgtxxs.equals("2"))return "标准";
+		else if(cgtxxs.equals("3"))return "专利";
+		else if(cgtxxs.equals("4"))return "软件著作权";
+		else if(cgtxxs.equals("5"))return "工艺";
+		else if(cgtxxs.equals("6"))return "产品";
+		else if(cgtxxs.equals("7"))return "材料";
+		else if(cgtxxs.equals("8"))return "装备";
+		else if(cgtxxs.equals("9"))return "农业、生物品种 ";
+		else if(cgtxxs.equals("10"))return "矿产品种";
+		else if(cgtxxs.equals("11"))return "新药";
+		return cgtxxs;
+	}
+	public void setCgtxxs(String cgtxxs) {
+		this.cgtxxs = cgtxxs;
+	}
+	public String getCgtxxsValue() {
+		return cgtxxsValue;
+	}
+	public void setCgtxxsValue(String cgtxxsValue) {
+		this.cgtxxsValue = cgtxxsValue;
+	}
+	public String getCgcsd() {
+		if(cgcsd.equals("1"))return "实验室阶段";
+		else if(cgcsd.equals("2"))return "小试阶段 ";
+		else if(cgcsd.equals("3"))return "中试产品阶段";
+		else if(cgcsd.equals("4"))return "市场化产品阶段";
+		return cgcsd;
+	}
+	public void setCgcsd(String cgcsd) {
+		this.cgcsd = cgcsd;
+	}
+	public String getCgzscqxs() {
+		if(cgzscqxs.equals("0"))return "其它";
+		else if(cgzscqxs.equals("1"))return "专利权";
+		else if(cgzscqxs.equals("2"))return "软件著作权";
+		else if(cgzscqxs.equals("3"))return "集成电路布图设计专有权";
+		else if(cgzscqxs.equals("4"))return "新药";
+		else if(cgzscqxs.equals("5"))return "植物新品种权";
+		
+		return cgzscqxs;
+	}
+	public void setCgzscqxs(String cgzscqxs) {
+		this.cgzscqxs = cgzscqxs;
+	}
+	public String getZscqqs() {
+		if(zscqqs.equals("0"))return "其它";
+		else if(zscqqs.equals("1"))return "独占";
+		else if(zscqqs.equals("2"))return "共有";
+		return zscqqs;
+	}
+	public void setZscqqs(String zscqqs) {
+		this.zscqqs = zscqqs;
+	}
+	public String getZlzt() {
+		if(zlzt.equals("1"))return "已受理";
+		else if(zlzt.equals("2"))return "已公示";
+		else if(zlzt.equals("3"))return "已授权";
+		
+		return zlzt;
+	}
+	public void setZlzt(String zlzt) {
+		this.zlzt = zlzt;
+	}
+	public String getCgdjqk() {
+		if(cgdjqk.equals("0"))return "未登记";
+		else if(cgdjqk.equals("1"))return "已登记";
+		return cgdjqk;
+	}
+	public void setCgdjqk(String cgdjqk) {
+		this.cgdjqk = cgdjqk;
+	}
+	public String getCgdjqkValue() {
+		return cgdjqkValue;
+	}
+	public void setCgdjqkValue(String cgdjqkValue) {
+		this.cgdjqkValue = cgdjqkValue;
+	}
+	public String getNcqcgzyzhfszzzh() {
+		if(ncqcgzyzhfszzzh.equals("0")) return "其他";
+		else if(ncqcgzyzhfszzzh.equals("1"))return "执行投资";
+		else if(ncqcgzyzhfszzzh.equals("2"))return "银行贷款";
+		else if(ncqcgzyzhfszzzh.equals("3"))return "股权融资";
+		return ncqcgzyzhfszzzh;
+	}
+	public void setNcqcgzyzhfszzzh(String ncqcgzyzhfszzzh) {
+		this.ncqcgzyzhfszzzh = ncqcgzyzhfszzzh;
+	}
+	
+	public String getNcqcgzyzhfshzkf() {
+		if(ncqcgzyzhfshzkf.equals("0")) return "其他";
+		else if(ncqcgzyzhfshzkf.equals("1"))return "产学研合作";
+		else if(ncqcgzyzhfshzkf.equals("2"))return "共建经济实体";
+		else if(ncqcgzyzhfshzkf.equals("3"))return "企-企联合开发";
+		return ncqcgzyzhfshzkf;
+	}
+	public void setNcqcgzyzhfshzkf(String ncqcgzyzhfshzkf) {
+		this.ncqcgzyzhfshzkf = ncqcgzyzhfshzkf;
+	}
+	
+	public String getNcqcgzyzhfsjszr() {
+		if(ncqcgzyzhfsjszr.equals("0")) return "其他";
+		else if(ncqcgzyzhfsjszr.equals("1"))return "完全转让";
+		else if(ncqcgzyzhfsjszr.equals("2"))return "许可转让";
+		else if(ncqcgzyzhfsjszr.equals("3"))return "技术入股";
+		else if(ncqcgzyzhfsjszr.equals("4"))return "5年独占许可";
+		return ncqcgzyzhfsjszr;
+	}
+	public void setNcqcgzyzhfsjszr(String ncqcgzyzhfsjszr) {
+		this.ncqcgzyzhfsjszr = ncqcgzyzhfsjszr;
+	}
+	
+	public String getYjkzyzhsj() {
+		if(yjkzyzhsj.equals("0")) return "其他";
+		else if(yjkzyzhsj.equals("1"))return "已经可转化 ";
+		else if(yjkzyzhsj.equals("2"))return "1年内可转化";
+		else if(yjkzyzhsj.equals("3"))return "2年内可转化";
+		else if(yjkzyzhsj.equals("4"))return "3-5年内可转化";
+		
+		return yjkzyzhsj;
+	}
+	public void setYjkzyzhsj(String yjkzyzhsj) {
+		this.yjkzyzhsj = yjkzyzhsj;
+	}
+	public String getCgjs() {
+		return cgjs;
+	}
+	public void setCgjs(String cgjs) {
+		this.cgjs = cgjs;
+	}
+	public String getSfycghzxq() {
+		return sfycghzxq.equals("1")?"是":"否";
+	}
+	public void setSfycghzxq(String sfycghzxq) {
+		this.sfycghzxq = sfycghzxq;
+	}
+	public String getSfyyxhzdw() {
+		
+		return sfyyxhzdw.equals("1")?"是":"否";
+	}
+	public void setSfyyxhzdw(String sfyyxhzdw) {
+		this.sfyyxhzdw = sfyyxhzdw;
+	}
+	public String getSfyyxhzdwValue() {
+		return sfyyxhzdwValue;
+	}
+	public void setSfyyxhzdwValue(String sfyyxhzdwValue) {
+		this.sfyyxhzdwValue = sfyyxhzdwValue;
+	}
+	public String getYxhzfs() {
+		if(yxhzfs.equals("0")) return yxhzfsValue;
+		else if(yxhzfs.equals("1"))return "技术转让";
+		else if(yxhzfs.equals("2"))return "技术入股";
+		else if(yxhzfs.equals("3"))return "联合开发";
+		else if(yxhzfs.equals("4"))return "委托研发";
+		else if(yxhzfs.equals("5"))return "委托团队、专家长期技术服务";
+		else if(yxhzfs.equals("6"))return "共建新研发、生产实体";
+
+		return yxhzfs;
+	}
+	public void setYxhzfs(String yxhzfs) {
+		this.yxhzfs = yxhzfs;
+	}
+	public String getYxhzfsValue() {
+		return yxhzfsValue;
+	}
+	public void setYxhzfsValue(String yxhzfsValue) {
+		this.yxhzfsValue = yxhzfsValue;
+	}
+	public String getYssdkjzc() {
+		if(yssdkjzc.equals("0")) return yssdkjzcValue;
+		else if(yssdkjzc.equals("1"))return "研发奖补 ";
+		else if(yssdkjzc.equals("2"))return "省重点研发计划";
+		else if(yssdkjzc.equals("3"))return "省科技人才计划";
+		else if(yssdkjzc.equals("4"))return "省级研发平台";
+		
+		return yssdkjzc;
+	}
+	public void setYssdkjzc(String yssdkjzc) {
+		this.yssdkjzc = yssdkjzc;
+	}
+	public String getYssdkjzcValue() {
+		return yssdkjzcValue;
+	}
+	public void setYssdkjzcValue(String yssdkjzcValue) {
+		this.yssdkjzcValue = yssdkjzcValue;
+	}
+	public String getNsqdsjxm() {
+		if(nsqdsjxm.equals("0")) return "其他";
+		else if(nsqdsjxm.equals("1"))return "研发奖补 ";
+		else if(nsqdsjxm.equals("2"))return "省重点研发计划";
+		else if(nsqdsjxm.equals("3"))return "省科技人才计划";
+		else if(nsqdsjxm.equals("4"))return "省级研发平台";
+		
+		return nsqdsjxm;
+	}
+	public void setNsqdsjxm(String nsqdsjxm) {
+		this.nsqdsjxm = nsqdsjxm;
+	}
+	public String getSqskjzgbmxxdwgkfb() {
+		if(sqskjzgbmxxdwgkfb.equals("1")) return "同意授权公开单位信息";
+		else if(sqskjzgbmxxdwgkfb.equals("2"))return "同意授权公开成果信息";
+		else if(sqskjzgbmxxdwgkfb.equals("3"))return "其他,请具体描述同意授权公开的范围内容";
+		else if(sqskjzgbmxxdwgkfb.equals("4"))return "不同意授权";
+		
+		return sqskjzgbmxxdwgkfb;
+	}
+	public void setSqskjzgbmxxdwgkfb(String sqskjzgbmxxdwgkfb) {
+		this.sqskjzgbmxxdwgkfb = sqskjzgbmxxdwgkfb;
+	}
+	public String getTbr() {
+		return tbr;
+	}
+	public void setTbr(String tbr) {
+		this.tbr = tbr;
+	}
+	public String getTbrsj() {
+		return tbrsj;
+	}
+	public void setTbrsj(String tbrsj) {
+		this.tbrsj = tbrsj;
+	}
+	public String getJsfzr() {
+		return jsfzr;
+	}
+	public void setJsfzr(String jsfzr) {
+		this.jsfzr = jsfzr;
+	}
+	public String getJsfsj() {
+		return jsfsj;
+	}
+	public void setJsfsj(String jsfsj) {
+		this.jsfsj = jsfsj;
+	}
+	public String getXqmc() {
+		return xqmc;
+	}
+	public void setXqmc(String xqmc) {
+		this.xqmc = xqmc;
+	}
+	public String getXqbl() {
+		if(xqbl.equals("1")) return "技术研发(关键技术)";
+		else if(xqbl.equals("2"))return "产品研发(产品升级、新产品研发)";
+		else if(xqbl.equals("3"))return "技术改造(设备、研发生产条件)";
+		else if(xqbl.equals("4"))return "技术配套(技术、产品等配套合作)";
+		return xqbl;
+	}
+	public void setXqbl(String xqbl) {
+		this.xqbl = xqbl;
+	}
+	public String getJsxqlx() {
+		return jsxqlx;
+	}
+	public void setJsxqlx(String jsxqlx) {
+		this.jsxqlx = jsxqlx;
+	}
+	public String getXqly() {
+		if(xqly.equals("0"))return "其他";
+		else if(xqly.equals("1"))return "新型材料";
+		else if(xqly.equals("2"))return "电子信息";
+		else if(xqly.equals("3"))return "机械";
+		else if(xqly.equals("4"))return "电气自动化";
+		else if(xqly.equals("5"))return "新能源";
+		else if(xqly.equals("6"))return "环保和资源";
+		else if(xqly.equals("7"))return "轻工纺织";
+		else if(xqly.equals("8"))return "航空航天";
+		else if(xqly.equals("9"))return "医药医疗";
+		else if(xqly.equals("10"))return "包装印刷";
+		else if(xqly.equals("11"))return "海洋工程";
+		else if(xqly.equals("12"))return "仪器仪表";
+		else if(xqly.equals("13"))return "建筑建材";
+		else if(xqly.equals("14"))return "农林牧渔";
+		else if(xqly.equals("15"))return "食品饮料";
+		else if(xqly.equals("16"))return "采矿冶金";
+		else if(xqly.equals("17"))return "生活家居";
+		else if(xqly.equals("18"))return "化学化工";
+		else if(xqly.equals("19"))return "安全防护";
+		else if(xqly.equals("20"))return "交通运输";
+		else if(xqly.equals("21"))return "橡胶塑料";
+		else if(xqly.equals("22"))return "教育";
+		else if(xqly.equals("23"))return "休闲";
+		return xqly;
+	}
+	public void setXqly(String xqly) {
+		this.xqly = xqly;
+	}
+	public String getMqcpjsxz() {
+		return mqcpjsxz;
+	}
+	public void setMqcpjsxz(String mqcpjsxz) {
+		this.mqcpjsxz = mqcpjsxz;
+	}
+	public String getYfnd() {
+		return yfnd;
+	}
+	public void setYfnd(String yfnd) {
+		this.yfnd = yfnd;
+	}
+	public String getYqdddxg() {
+		return yqdddxg;
+	}
+	public void setYqdddxg(String yqdddxg) {
+		this.yqdddxg = yqdddxg;
+	}
+	public String getYjzkdgz() {
+		return yjzkdgz;
+	}
+	public void setYjzkdgz(String yjzkdgz) {
+		this.yjzkdgz = yjzkdgz;
+	}
+	public String getXyyftjqk() {
+		return xyyftjqk;
+	}
+	public void setXyyftjqk(String xyyftjqk) {
+		this.xyyftjqk = xyyftjqk;
+	}
+	public String getMqhzdxqk() {
+		return mqhzdxqk;
+	}
+	public void setMqhzdxqk(String mqhzdxqk) {
+		this.mqhzdxqk = mqhzdxqk;
+	}
+	public String getSfyxybhzxq() {
+		return sfyxybhzxq.equals("1")?"有":"无";
+	}
+	public void setSfyxybhzxq(String sfyxybhzxq) {
+		this.sfyxybhzxq = sfyxybhzxq;
+	}
+	public String getYxhzdx() {
+		return yxhzdx.equals("1")?"有":"无";
+	}
+	public void setYxhzdx(String yxhzdx) {
+		this.yxhzdx = yxhzdx;
+	}
+	public String getYxhzdxValue() {
+		return yxhzdxValue;
+	}
+	public void setYxhzdxValue(String yxhzdxValue) {
+		this.yxhzdxValue = yxhzdxValue;
+	}
+	public String getNcqdhzfs() {
+		if(ncqdhzfs.equals("0")) return ncqdhzfsValue;
+		else if(ncqdhzfs.equals("1"))return "技术转让";
+		else if(ncqdhzfs.equals("2"))return "技术入股";
+		else if(ncqdhzfs.equals("3"))return "联合开发";
+		else if(ncqdhzfs.equals("4"))return "委托研发";
+		else if(ncqdhzfs.equals("5"))return "委托团队、专家长期技术服务";
+		else if(ncqdhzfs.equals("6"))return "共建新研发、生产实体";
+		return ncqdhzfs;
+	}
+	public void setNcqdhzfs(String ncqdhzfs) {
+		this.ncqdhzfs = ncqdhzfs;
+	}
+	public String getNcqdhzfsValue() {
+		return ncqdhzfsValue;
+	}
+	public void setNcqdhzfsValue(String ncqdhzfsValue) {
+		this.ncqdhzfsValue = ncqdhzfsValue;
+	}
+	public String getXqjjjzsj() {
+		return xqjjjzsj;
+	}
+	public void setXqjjjzsj(String xqjjjzsj) {
+		this.xqjjjzsj = xqjjjzsj;
+	}
+	public String getXqsfkegk() {
+		if(xqsfkegk.equals("1")) return "是";
+		else if(xqsfkegk.equals("0"))return "否";
+		return xqsfkegk;
+	}
+	public void setXqsfkegk(String xqsfkegk) {
+		this.xqsfkegk = xqsfkegk;
+	}
+	public String getWjjjsntntgdhzzj() {
+		return wjjjsntntgdhzzj;
+	}
+	public void setWjjjsntntgdhzzj(String wjjjsntntgdhzzj) {
+		this.wjjjsntntgdhzzj = wjjjsntntgdhzzj;
+	}
+	public String getZjyt() {
+		return zjyt;
+	}
+	public void setZjyt(String zjyt) {
+		this.zjyt = zjyt;
+	}
+	public String getZjqk() {
+		return zjqk;
+	}
+	public void setZjqk(String zjqk) {
+		this.zjqk = zjqk;
+	}
+	public String getXqjjfs() {
+		return xqjjfs;
+	}
+	public void setXqjjfs(String xqjjfs) {
+		this.xqjjfs = xqjjfs;
+	}
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+	public String getSqskjzgbmxxdwgkfbValue() {
+		return sqskjzgbmxxdwgkfbValue;
+	}
+	public void setSqskjzgbmxxdwgkfbValue(String sqskjzgbmxxdwgkfbValue) {
+		this.sqskjzgbmxxdwgkfbValue = sqskjzgbmxxdwgkfbValue;
+	}
+	
+	
+}

+ 71 - 0
src/main/java/com/goafanti/demandCollection/controller/OpenDemandCollectionApiController.java

@@ -0,0 +1,71 @@
+package com.goafanti.demandCollection.controller;
+
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.model.DemandCollection;
+import com.goafanti.demandCollection.bo.InputDemandCollection;
+import com.goafanti.demandCollection.service.DemandCollectionService;
+
+@RestController
+@RequestMapping(value = "/open")
+public class OpenDemandCollectionApiController  extends CertifyApiController {
+	@Resource
+	private DemandCollectionService		demandCollectionService;
+	
+	/**
+	 * 新增需求收集
+	 * @param d
+	 * @return
+	 */
+	@RequestMapping(value="/addDemandCollection",method = RequestMethod.POST)
+	public Result addDemandCollection(DemandCollection d){
+		Result res =new Result();
+		if (d.getDwmc()==null) {
+			res.getError().add(buildError("名称必须指定","名称必须指定"));
+			return res;
+		}
+		res.data(demandCollectionService.addDemandCollection(d));
+		return res;
+		
+	}
+	/**
+	   * 需求收集列表
+	 * @param d
+	 * @return
+	 */
+	@RequestMapping(value="/demandCollectionList",method = RequestMethod.GET)
+	public Result demandCollectionList(InputDemandCollection i){
+		Result res =new Result();
+		res.data(demandCollectionService.demandCollectionList(i));
+		return res;
+		
+	}
+	
+	/**
+	 * 	导出变更列表
+     * 
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/exportDemandCollectionList" , method = RequestMethod.GET)
+    public Result exportDemandCollectionList(HttpServletResponse response,InputDemandCollection i)  {
+    	Result res=new Result();
+			try {
+				demandCollectionService.exportDemandCollectionList( response, i);
+			} catch (Exception e) {
+				res.getError().add(buildError("格式不正确"));
+				e.printStackTrace();
+				return res;
+			}
+         res.data(1); 
+    	return res;
+    }
+   
+}

+ 20 - 0
src/main/java/com/goafanti/demandCollection/service/DemandCollectionService.java

@@ -0,0 +1,20 @@
+package com.goafanti.demandCollection.service;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.goafanti.common.model.DemandCollection;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.demandCollection.bo.InputDemandCollection;
+import com.goafanti.demandCollection.bo.OutDemandCollection;
+
+public interface DemandCollectionService {
+
+	int addDemandCollection(DemandCollection d);
+
+	Pagination<OutDemandCollection> demandCollectionList(InputDemandCollection i);
+
+	void exportDemandCollectionList(HttpServletResponse response, InputDemandCollection i) throws IOException;
+
+}

+ 188 - 0
src/main/java/com/goafanti/demandCollection/service/impl/DemandCollectionServiceImpl.java

@@ -0,0 +1,188 @@
+package com.goafanti.demandCollection.service.impl;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.dao.DemandCollectionMapper;
+import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.DemandCollection;
+import com.goafanti.common.utils.ExportExcelUtil;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.demandCollection.bo.InputDemandCollection;
+import com.goafanti.demandCollection.bo.OutDemandCollection;
+import com.goafanti.demandCollection.service.DemandCollectionService;
+
+@Service
+public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollectionMapper> implements DemandCollectionService {
+
+	@Autowired
+	private DemandCollectionMapper	demandCollectionMapper;
+	@Override
+	public int addDemandCollection(DemandCollection d) {
+		return demandCollectionMapper.insertSelective(d);
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OutDemandCollection> demandCollectionList(InputDemandCollection i) {
+		Map<String, Object> map=new HashMap<>();
+		
+		return (Pagination<OutDemandCollection>) findPage("findDemandCollectionList","findDemandCollectionCount",
+				map, i.getPageNo(), i.getPageSize());
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public void exportDemandCollectionList(HttpServletResponse response, InputDemandCollection idc) throws IOException {
+		OutputStream out = response.getOutputStream();
+		try {
+			List<OutDemandCollection>list=(List<OutDemandCollection>) demandCollectionList(idc).getList();
+					 
+			String[] comment = { "编号", "单位名称", "单位性质", "行业领域", "所属市州-省", "所属市州-市", "所属园区", "拥有的省级及以上平台", "统一社会信用代码",
+					"经济规模", "人员规模", "注册资本", "通讯地址", "邮编", "联系人", "联系电话", "email", "主营业务及核心产品(服务)", "2018年度项目主营业务收入(万元)",
+					"2018年度项目净利润(万元)", "2019年度项目主营业务收入(万元)", "2019年度项目净利润(万元)", "年度研发投入", "年度研发投入占营业收入比例", "是否曾获银行贷款",
+					"是否为高新技术企业编号 ", "是否为科技型中小企业", "专利数量", "发明专利", "实用新型", "是否曾获科技专项资金", "是否有产学研合作", "是否已获机构投资者投资 ",
+					"成果领域", "成果属性", "成果体现形式", "成果体现形式 ", "成果成熟度", "成果知识产权形式", "知识产权权属 ", "专利状态", "成果登记情况",
+					"拟采取成果转移转化方式自主转化 ", "拟采取成果转移转化方式合作开发 ", "拟采取成果转移转化方式技术转让 ", "预计可转移转化时间", "成果简述", "是否有成果合作需求",
+					"是否有意向合作单位", "是否有意向合作单位", "意向合作方式", "意向合作方式", "已享受的科技政策", "拟申请的省级项目", "是否授权省科技主管部门将上述有关信息对外公开发布",
+					"填报人", "填报人手机", "技术负责人", "技术负责人手机", "需求名称", "需求类别", "技术需求类型", "需求领域", "目前产品技术现状", "研发难点",
+					"预期达到的效果(主要技术指标、技术成熟度、条件、成本等)", "已经开展的工作", "现有研发条件情况(人员情况、仪器设备投入等)", "目前合作对象情况(合作对象、方式、已投入研发资金情况等)",
+					"是否有下一步合作需求", "意向合作对象", "拟采取的合作方式", "需求解决截止时间", "需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口",
+					"需求解决方式", "创建时间"};
+    		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);
+    		for (OutDemandCollection ob : (List<OutDemandCollection>)list) {
+    			//新增一行
+    			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.getSsszp(); break; 
+    				case "所属市州-市" : o = ob.getSsszc(); break; 
+    				case "所属园区" : o = ob.getSsyq(); break; 
+    				case "拥有的省级及以上平台" : o = ob.getYysjjyspt(); break; 
+    				case "统一社会信用代码" : o = ob.getYysjjyspt(); break; 
+    				case "经济规模" : o = ob.getJjgm(); break; 
+    				case "人员规模" : o = ob.getRygm(); 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.getSfwkjxzxqy(); 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.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(); break; 
+    				case "是否有成果合作需求" : o = ob.getSfycghzxq(); break; 
+    				case "是否有意向合作单位" : o = ob.getSfyyxhzdw(); break;
+    				case "意向合作单位" : o = ob.getSfyyxhzdwValue(); break;
+    				case "意向合作方式" : o = ob.getYxhzfs(); break;
+    				case "已享受的科技政策" : o = ob.getYssdkjzc(); break;
+    				case "拟申请的省级项目" : o = ob.getNsqdsjxm(); break; 
+    				case "是否授权省科技主管部门将上述有关信息对外公开发布" : o = ob.getSqskjzgbmxxdwgkfb(); break;
+    				case "同意授权公开的范围内容" : o = ob.getSqskjzgbmxxdwgkfbValue(); break;
+    				case "填报人" : o = ob.getTbr(); break; 
+    				case "填报人手机" : o = ob.getTbrsj(); 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.getXqsfkegk(); break; 
+    				case "为解决技术难题能提供的合作资金" : o = ob.getWjjjsntntgdhzzj(); break; 
+    				case "资金用途" : o = ob.getZjyt(); break; 
+    				case "资金缺口" : o = ob.getZjqk(); break; 
+    				case "需求解决方式" : o = ob.getXqjjfs(); break; 
+    				case "创建时间": o = ob.getCreateTime(); break;
+    				default: o = ""; break;
+    				}
+    				XSSFCell c = r.createCell(i);
+    				c.setCellValue(o);
+    			}
+    		}
+    		//返回名称及参数
+			 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));  
+			 response.setContentType("application/octet-stream;charset=utf-8");
+    		 // 返回数据流
+			 wb.write(out); 
+			 out.flush();
+			 out.close();
+		} catch (Exception e) {
+			logger.error(e.getLocalizedMessage());
+			throw new BusinessException(new Error("表格生成错误。"));
+		}finally {
+			out.flush(); 
+			 out.close(); 
+		}
+	}
+	
+	
+}

+ 0 - 3
src/main/java/com/goafanti/order/controller/AdminJtOrderController.java

@@ -1,7 +1,5 @@
 package com.goafanti.order.controller;
 
-import java.util.Date;
-
 import javax.annotation.Resource;
 
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -9,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.order.service.JtOrderService;
 

+ 1 - 0
src/main/resources/props/config_local.properties

@@ -40,6 +40,7 @@ template.cacheable=false
 
 static.host=//ss.jishutao.com/client/1.2.5
 portal.host=//ss.jishutao.com/portal/1.2.5
+skjt.host=//statics.jishutao.com/skjt
 #本地
 #static.host=//sclient.jishutao.com:8088/client/1.0.2
 #portal.host=//sportal.jishutao.com:80/portal/1.0.2

+ 1 - 0
src/main/resources/shiro_base_auth.ini

@@ -10,6 +10,7 @@
 /admin/login.html=anon
 /mlogin=anon
 /signin=anon
+/skjt=anon
 /managesignin=anon
 /register=anon
 /mregister=anon

+ 1 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -555,6 +555,7 @@
 			window.globalConfig = {};
 			globalConfig.context = /*[[${basePath}]]*/'';
 			globalConfig.portalHost = /*[[${portalHost}]]*/'';
+			globalConfig.skjtHost = /*[[${skjtHost}]]*/'';
 			globalConfig.staticDomain = /*[[${staticDomain}]]*/'';
 			globalConfig.staticHost = /*[[${staticHost}]]*/'';
 			globalConfig.uploadPath = /*[[${uploadPath}]]*/'';

+ 22 - 0
src/main/webapp/WEB-INF/views/skjt/s_index.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html  xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+<meta charset=utf-8>
+<meta name=viewport content="width=device-width,initial-scale=1">
+<title>省科技厅技术需求征集</title>
+
+<link th:href="${skjtHost+'/css/app.6c8ea938fcf6465811c4abac53341e96.css'}" rel=stylesheet>
+</head>
+<body>
+	<!-- <h1>版本升级,敬请期待!</h1> -->
+	<div id=app></div>
+	<script type=text/javascript
+		th:src="${skjtHost+'/js/manifest.2ae2e69a05c33dfc65f8.js'}"></script>
+	<script type=text/javascript
+		th:src="${skjtHost+'/js/vendor.00db0a27f9c97eca50a9.js'}"></script>
+	<script type=text/javascript 
+		th:src="${skjtHost+'/js/app.a8fb8f5916058bce58de.js'}"></script>
+</body>
+</html>