Browse Source

成果列表

Antiloveg 8 years ago
parent
commit
f0ef15ff9e

+ 54 - 0
schema/2017-05-17.sql

@@ -0,0 +1,54 @@
+CREATE TABLE `achievement` (
+  `id` VARCHAR(36) NOT NULL,
+  `serial_number` INT(36) NOT NULL COMMENT '编号'  AUTO_INCREMENT,
+  `data_category` INT(1) NOT NULL COMMENT '数据类别 (0--成果, 1--技术, 2--项目)',
+  `name` VARCHAR(32) NOT NULL COMMENT '名称',
+  `keyword` VARCHAR(45) NOT NULL COMMENT '关键词',
+  `category` INT(1) NOT NULL COMMENT '类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)',
+  `summary` VARCHAR(300) NULL COMMENT '摘要',
+  `introduction` VARCHAR(300) NULL COMMENT '成果简介',
+  `technical_picture_url` VARCHAR(500) NULL COMMENT '技术图片',
+  `field_a` INT(2) NULL COMMENT '应用领域1',
+  `field_b` INT(2) NULL COMMENT '应用领域2',
+  `field_c` INT(2) NULL COMMENT '应用领域3',
+  `maturity` INT(1) NULL COMMENT '成熟度(1--正在研发, 2-- 已有样品, 3-- 通过小试, 4-- 通过中试, 5-- 可以量产)',
+  `maturity_picture_url` VARCHAR(500) NULL COMMENT '成熟度资料--图片URL',
+  `maturity_text_file_url` VARCHAR(255) NULL COMMENT '成熟度资料--文本文件URL',
+  `maturity_video_url` VARCHAR(255) NULL COMMENT '成熟度资料--视屏URL',
+  `innovation` INT(1) NULL COMMENT '创新度(0--行业先进,1--行业领先,2--国内先进,3--国内领先,4--国际先进,5--国际领先)',
+  `owner_name` VARCHAR(16) NOT NULL COMMENT '成果所有人名称',
+  `owner_type` INT(1) NOT NULL COMMENT '所有人类型(0-个人,1-组织)',
+  `owner_id_number` VARCHAR(36) NOT NULL COMMENT '所有人证件号',
+  `owner_mobile` VARCHAR(12) NOT NULL COMMENT '所有人联系电话',
+  `owner_email` VARCHAR(255) NOT NULL COMMENT '所有人电子邮箱',
+  `owner_postal_address` VARCHAR(255) NOT NULL COMMENT '所有人通讯地址',
+  `cooperation_mode` INT(1) NOT NULL COMMENT '合作方式(0--技术转让,1--授权生产)',
+  `transfer_mode` INT(1) NULL COMMENT '转让方式(0--完全转让,1--许可转让,2--技术入股)',
+  `bargaining_mode` INT(1) NULL COMMENT '议价方式(0--面议,1--定价)',
+  `transfer_price` DECIMAL(8,2) NULL COMMENT '转让价格',
+  `technical_scene` VARCHAR(300) NULL COMMENT '技术场景',
+  `breakthrough` VARCHAR(300) NULL COMMENT '技术突破',
+  `patent_case` VARCHAR(300) NULL COMMENT '专利情况',
+  `awards` VARCHAR(300) NULL COMMENT '获奖情况',
+  `team_des` VARCHAR(300) NULL COMMENT '技术团队情况',
+  `parameter` VARCHAR(255) NULL COMMENT '技术参数',
+  `tech_plan_url` VARCHAR(255) NULL COMMENT '技术方案URL',
+  `business_plan_url` VARCHAR(255) NULL COMMENT '商业计划书URL',
+  `org_id` VARCHAR(36) NULL COMMENT '所属组织ID',
+  `org_name` VARCHAR(45) NULL COMMENT '所属组织名称',
+  `org_address` VARCHAR(255) NULL COMMENT '所属组织地址',
+  `org_email` VARCHAR(255) NULL COMMENT '所属组织邮箱',
+  `org_contacts` VARCHAR(45) NULL COMMENT '所属组织联系人名称',
+  `org_contacts_mobile` VARCHAR(45) NULL COMMENT '所属组织联系人电话',
+  `contacts` VARCHAR(45) NULL COMMENT '联系人及联系电话',
+  `manager_id` VARCHAR(36) NULL COMMENT '客户经理ID',
+  `salesman_id` VARCHAR(36) NULL COMMENT '营销员ID',
+  `status` INT(1) NULL COMMENT '状态',
+  `create_time` DATETIME NULL COMMENT '成果记录创建时间',
+  `release_status` INT(1) NULL COMMENT '是否发布(0--未发布,1--已发布)',
+  `release_date` DATETIME NULL COMMENT '发布时间',
+  `deleted_sign` INT(1) NULL COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  INDEX `serialNumber` (`serial_number` ASC))
+ENGINE = InnoDB AUTO_INCREMENT= 600000
+COMMENT = '技术成果'

+ 169 - 0
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -0,0 +1,169 @@
+package com.goafanti.achievement.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
+
+public class AchievementListBo {
+
+	private String	id;
+
+	/**
+	 * 编号
+	 */
+	private Integer	serialNumber;
+
+	/**
+	 * 数据类别 (0--成果, 1--技术, 2--项目)
+	 */
+	private Integer	dataCategory;
+
+	/**
+	 * 名称
+	 */
+	private String	name;
+
+	/**
+	 * 关键词
+	 */
+	private String	keyword;
+
+	/**
+	 * 类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
+	 */
+	private Integer	category;
+
+	/**
+	 * 成果所有人名称
+	 */
+	private String	ownerName;
+
+	/**
+	 * 所有人类型(0-个人,1-组织)
+	 */
+	private Integer	ownerType;
+
+	/**
+	 * 所有人联系电话
+	 */
+	private String	ownerMobile;
+
+	/**
+	 * 状态
+	 */
+	private Integer	status;
+
+
+	/**
+	 * 发布时间
+	 */
+	private Date	releaseDate;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getDataCategory() {
+		return dataCategory;
+	}
+
+	public void setDataCategory(Integer dataCategory) {
+		this.dataCategory = dataCategory;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getKeyword() {
+		return keyword;
+	}
+
+	public void setKeyword(String keyword) {
+		this.keyword = keyword;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getCategory() {
+		return category;
+	}
+
+	public void setCategory(Integer category) {
+		this.category = category;
+	}
+
+	public String getOwnerName() {
+		return ownerName;
+	}
+
+	public void setOwnerName(String ownerName) {
+		this.ownerName = ownerName;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getOwnerType() {
+		return ownerType;
+	}
+
+	public void setOwnerType(Integer ownerType) {
+		this.ownerType = ownerType;
+	}
+
+	public String getOwnerMobile() {
+		return ownerMobile;
+	}
+
+	public void setOwnerMobile(String ownerMobile) {
+		this.ownerMobile = ownerMobile;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Date getReleaseDate() {
+		return releaseDate;
+	}
+
+	public void setReleaseDate(Date releaseDate) {
+		this.releaseDate = releaseDate;
+	}
+
+	public String getReleaseDateFormattedDate() {
+		if (this.releaseDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setReleaseDateFormattedDate(String releaseDateFormattedDate) {
+
+	}
+
+}

+ 12 - 0
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -0,0 +1,12 @@
+package com.goafanti.achievement.service;
+
+import com.goafanti.achievement.bo.AchievementListBo;
+import com.goafanti.core.mybatis.page.Pagination;
+
+public interface AchievementService {
+
+	Pagination<AchievementListBo> listAchievement(Integer serialNumber, String name, String keyword, Integer category,
+			Integer ownerType, Integer status, String releaseDateStartDate,
+			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize);
+
+}

+ 94 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -0,0 +1,94 @@
+package com.goafanti.achievement.service.impl;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.achievement.bo.AchievementListBo;
+import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.AchievementMapper;
+import com.goafanti.common.utils.DateUtils;
+
+@Service
+public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> implements AchievementService {
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<AchievementListBo> listAchievement(Integer serialNumber, String name, String keyword,
+			Integer category, Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,
+			Integer releaseStatus, Integer pNo, Integer pSize) {
+
+		Map<String, Object> params = new HashMap<>();
+
+		Date rStart = null;
+		Date rEnd = null;
+
+		if (!StringUtils.isBlank(releaseDateStartDate)) {
+			try {
+				rStart = DateUtils.parseDate(releaseDateStartDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+
+		if (!StringUtils.isBlank(releaseDateEndDate)) {
+			try {
+				rEnd = DateUtils.parseDate(releaseDateEndDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+
+		if (null != rStart) {
+			params.put("rStart", rStart);
+		}
+
+		if (null != rEnd) {
+			params.put("rEnd", rEnd);
+		}
+
+		if (null != serialNumber) {
+			params.put("serialNumber", serialNumber);
+		}
+
+		if (!StringUtils.isBlank(name)) {
+			params.put("name", name);
+		}
+
+		if (!StringUtils.isBlank(keyword)) {
+			params.put("keyword", keyword);
+		}
+
+		if (null != category) {
+			params.put("category", category);
+		}
+
+		if (null != ownerType) {
+			params.put("ownerType", ownerType);
+		}
+
+		if (null != status) {
+			params.put("status", status);
+		}
+		
+		if (null != releaseStatus) {
+			params.put("releaseStatus", releaseStatus);
+		}
+
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0) {
+			pSize = 10;
+		}
+		return (Pagination<AchievementListBo>) findPage("findManageAchievementListByPage", "findManageAchievementCount",
+				params, pNo, pSize);
+	}
+
+}

+ 31 - 0
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -1,10 +1,41 @@
 package com.goafanti.admin.controller;
 
+import javax.annotation.Resource;
+
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.utils.StringUtils;
+
 @RestController
 @RequestMapping(value = "/api/admin/achievement")
 public class AdminAchievementApiController {
+	@Resource
+	private AchievementService achievementService;
+
+	/**
+	 * 成果列表
+	 */
+	@RequestMapping(value = "/list", method = RequestMethod.GET)
+	private Result list(Integer serialNumber, String name, String keyword, Integer category, Integer ownerType,
+			Integer status, String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus,
+			String pageNo, String pageSize) {
+		Result res = new Result();
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(achievementService.listAchievement(serialNumber, name, keyword, category, ownerType, status,
+				releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
+		return res;
+	}
 
 }

+ 17 - 0
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -0,0 +1,17 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.Achievement;
+
+public interface AchievementMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(Achievement record);
+
+    int insertSelective(Achievement record);
+
+    Achievement selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(Achievement record);
+
+    int updateByPrimaryKey(Achievement record);
+}

+ 689 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -0,0 +1,689 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.AchievementMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.Achievement">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="serial_number" jdbcType="INTEGER" property="serialNumber" />
+    <result column="data_category" jdbcType="INTEGER" property="dataCategory" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="keyword" jdbcType="VARCHAR" property="keyword" />
+    <result column="category" jdbcType="INTEGER" property="category" />
+    <result column="summary" jdbcType="VARCHAR" property="summary" />
+    <result column="introduction" jdbcType="VARCHAR" property="introduction" />
+    <result column="technical_picture_url" jdbcType="VARCHAR" property="technicalPictureUrl" />
+    <result column="field_a" jdbcType="INTEGER" property="fieldA" />
+    <result column="field_b" jdbcType="INTEGER" property="fieldB" />
+    <result column="field_c" jdbcType="INTEGER" property="fieldC" />
+    <result column="maturity" jdbcType="INTEGER" property="maturity" />
+    <result column="maturity_picture_url" jdbcType="VARCHAR" property="maturityPictureUrl" />
+    <result column="maturity_text_file_url" jdbcType="VARCHAR" property="maturityTextFileUrl" />
+    <result column="maturity_video_url" jdbcType="VARCHAR" property="maturityVideoUrl" />
+    <result column="innovation" jdbcType="INTEGER" property="innovation" />
+    <result column="owner_name" jdbcType="VARCHAR" property="ownerName" />
+    <result column="owner_type" jdbcType="INTEGER" property="ownerType" />
+    <result column="owner_id_number" jdbcType="VARCHAR" property="ownerIdNumber" />
+    <result column="owner_mobile" jdbcType="VARCHAR" property="ownerMobile" />
+    <result column="owner_email" jdbcType="VARCHAR" property="ownerEmail" />
+    <result column="owner_postal_address" jdbcType="VARCHAR" property="ownerPostalAddress" />
+    <result column="cooperation_mode" jdbcType="INTEGER" property="cooperationMode" />
+    <result column="transfer_mode" jdbcType="INTEGER" property="transferMode" />
+    <result column="bargaining_mode" jdbcType="INTEGER" property="bargainingMode" />
+    <result column="transfer_price" jdbcType="DECIMAL" property="transferPrice" />
+    <result column="technical_scene" jdbcType="VARCHAR" property="technicalScene" />
+    <result column="breakthrough" jdbcType="VARCHAR" property="breakthrough" />
+    <result column="patent_case" jdbcType="VARCHAR" property="patentCase" />
+    <result column="awards" jdbcType="VARCHAR" property="awards" />
+    <result column="team_des" jdbcType="VARCHAR" property="teamDes" />
+    <result column="parameter" jdbcType="VARCHAR" property="parameter" />
+    <result column="tech_plan_url" jdbcType="VARCHAR" property="techPlanUrl" />
+    <result column="business_plan_url" jdbcType="VARCHAR" property="businessPlanUrl" />
+    <result column="org_id" jdbcType="VARCHAR" property="orgId" />
+    <result column="org_name" jdbcType="VARCHAR" property="orgName" />
+    <result column="org_address" jdbcType="VARCHAR" property="orgAddress" />
+    <result column="org_email" jdbcType="VARCHAR" property="orgEmail" />
+    <result column="org_contacts" jdbcType="VARCHAR" property="orgContacts" />
+    <result column="org_contacts_mobile" jdbcType="VARCHAR" property="orgContactsMobile" />
+    <result column="contacts" jdbcType="VARCHAR" property="contacts" />
+    <result column="manager_id" jdbcType="VARCHAR" property="managerId" />
+    <result column="salesman_id" jdbcType="VARCHAR" property="salesmanId" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="release_status" jdbcType="INTEGER" property="releaseStatus" />
+    <result column="release_date" jdbcType="TIMESTAMP" property="releaseDate" />
+    <result column="deleted_sign" jdbcType="INTEGER" property="deletedSign" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, serial_number, data_category, name, keyword, category, summary, introduction, 
+    technical_picture_url, field_a, field_b, field_c, maturity, maturity_picture_url, 
+    maturity_text_file_url, maturity_video_url, innovation, owner_name, owner_type, owner_id_number, 
+    owner_mobile, owner_email, owner_postal_address, cooperation_mode, transfer_mode, 
+    bargaining_mode, transfer_price, technical_scene, breakthrough, patent_case, awards, 
+    team_des, parameter, tech_plan_url, business_plan_url, org_id, org_name, org_address, 
+    org_email, org_contacts, org_contacts_mobile, contacts, manager_id, salesman_id, 
+    status, create_time, release_status, release_date, deleted_sign
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from achievement
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from achievement
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.Achievement">
+    insert into achievement (id, serial_number, data_category, 
+      name, keyword, category, 
+      summary, introduction, technical_picture_url, 
+      field_a, field_b, field_c, 
+      maturity, maturity_picture_url, maturity_text_file_url, 
+      maturity_video_url, innovation, owner_name, 
+      owner_type, owner_id_number, owner_mobile, 
+      owner_email, owner_postal_address, cooperation_mode, 
+      transfer_mode, bargaining_mode, transfer_price, 
+      technical_scene, breakthrough, patent_case, 
+      awards, team_des, parameter, 
+      tech_plan_url, business_plan_url, org_id, 
+      org_name, org_address, org_email, 
+      org_contacts, org_contacts_mobile, contacts, 
+      manager_id, salesman_id, status, 
+      create_time, release_status, release_date, 
+      deleted_sign)
+    values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
+      #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{category,jdbcType=INTEGER}, 
+      #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR}, 
+      #{fieldA,jdbcType=INTEGER}, #{fieldB,jdbcType=INTEGER}, #{fieldC,jdbcType=INTEGER}, 
+      #{maturity,jdbcType=INTEGER}, #{maturityPictureUrl,jdbcType=VARCHAR}, #{maturityTextFileUrl,jdbcType=VARCHAR}, 
+      #{maturityVideoUrl,jdbcType=VARCHAR}, #{innovation,jdbcType=INTEGER}, #{ownerName,jdbcType=VARCHAR}, 
+      #{ownerType,jdbcType=INTEGER}, #{ownerIdNumber,jdbcType=VARCHAR}, #{ownerMobile,jdbcType=VARCHAR}, 
+      #{ownerEmail,jdbcType=VARCHAR}, #{ownerPostalAddress,jdbcType=VARCHAR}, #{cooperationMode,jdbcType=INTEGER}, 
+      #{transferMode,jdbcType=INTEGER}, #{bargainingMode,jdbcType=INTEGER}, #{transferPrice,jdbcType=DECIMAL}, 
+      #{technicalScene,jdbcType=VARCHAR}, #{breakthrough,jdbcType=VARCHAR}, #{patentCase,jdbcType=VARCHAR}, 
+      #{awards,jdbcType=VARCHAR}, #{teamDes,jdbcType=VARCHAR}, #{parameter,jdbcType=VARCHAR}, 
+      #{techPlanUrl,jdbcType=VARCHAR}, #{businessPlanUrl,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR}, 
+      #{orgName,jdbcType=VARCHAR}, #{orgAddress,jdbcType=VARCHAR}, #{orgEmail,jdbcType=VARCHAR}, 
+      #{orgContacts,jdbcType=VARCHAR}, #{orgContactsMobile,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
+      #{managerId,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, 
+      #{deletedSign,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.Achievement">
+    insert into achievement
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="serialNumber != null">
+        serial_number,
+      </if>
+      <if test="dataCategory != null">
+        data_category,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="keyword != null">
+        keyword,
+      </if>
+      <if test="category != null">
+        category,
+      </if>
+      <if test="summary != null">
+        summary,
+      </if>
+      <if test="introduction != null">
+        introduction,
+      </if>
+      <if test="technicalPictureUrl != null">
+        technical_picture_url,
+      </if>
+      <if test="fieldA != null">
+        field_a,
+      </if>
+      <if test="fieldB != null">
+        field_b,
+      </if>
+      <if test="fieldC != null">
+        field_c,
+      </if>
+      <if test="maturity != null">
+        maturity,
+      </if>
+      <if test="maturityPictureUrl != null">
+        maturity_picture_url,
+      </if>
+      <if test="maturityTextFileUrl != null">
+        maturity_text_file_url,
+      </if>
+      <if test="maturityVideoUrl != null">
+        maturity_video_url,
+      </if>
+      <if test="innovation != null">
+        innovation,
+      </if>
+      <if test="ownerName != null">
+        owner_name,
+      </if>
+      <if test="ownerType != null">
+        owner_type,
+      </if>
+      <if test="ownerIdNumber != null">
+        owner_id_number,
+      </if>
+      <if test="ownerMobile != null">
+        owner_mobile,
+      </if>
+      <if test="ownerEmail != null">
+        owner_email,
+      </if>
+      <if test="ownerPostalAddress != null">
+        owner_postal_address,
+      </if>
+      <if test="cooperationMode != null">
+        cooperation_mode,
+      </if>
+      <if test="transferMode != null">
+        transfer_mode,
+      </if>
+      <if test="bargainingMode != null">
+        bargaining_mode,
+      </if>
+      <if test="transferPrice != null">
+        transfer_price,
+      </if>
+      <if test="technicalScene != null">
+        technical_scene,
+      </if>
+      <if test="breakthrough != null">
+        breakthrough,
+      </if>
+      <if test="patentCase != null">
+        patent_case,
+      </if>
+      <if test="awards != null">
+        awards,
+      </if>
+      <if test="teamDes != null">
+        team_des,
+      </if>
+      <if test="parameter != null">
+        parameter,
+      </if>
+      <if test="techPlanUrl != null">
+        tech_plan_url,
+      </if>
+      <if test="businessPlanUrl != null">
+        business_plan_url,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="orgName != null">
+        org_name,
+      </if>
+      <if test="orgAddress != null">
+        org_address,
+      </if>
+      <if test="orgEmail != null">
+        org_email,
+      </if>
+      <if test="orgContacts != null">
+        org_contacts,
+      </if>
+      <if test="orgContactsMobile != null">
+        org_contacts_mobile,
+      </if>
+      <if test="contacts != null">
+        contacts,
+      </if>
+      <if test="managerId != null">
+        manager_id,
+      </if>
+      <if test="salesmanId != null">
+        salesman_id,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="releaseStatus != null">
+        release_status,
+      </if>
+      <if test="releaseDate != null">
+        release_date,
+      </if>
+      <if test="deletedSign != null">
+        deleted_sign,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="serialNumber != null">
+        #{serialNumber,jdbcType=INTEGER},
+      </if>
+      <if test="dataCategory != null">
+        #{dataCategory,jdbcType=INTEGER},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="keyword != null">
+        #{keyword,jdbcType=VARCHAR},
+      </if>
+      <if test="category != null">
+        #{category,jdbcType=INTEGER},
+      </if>
+      <if test="summary != null">
+        #{summary,jdbcType=VARCHAR},
+      </if>
+      <if test="introduction != null">
+        #{introduction,jdbcType=VARCHAR},
+      </if>
+      <if test="technicalPictureUrl != null">
+        #{technicalPictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="fieldA != null">
+        #{fieldA,jdbcType=INTEGER},
+      </if>
+      <if test="fieldB != null">
+        #{fieldB,jdbcType=INTEGER},
+      </if>
+      <if test="fieldC != null">
+        #{fieldC,jdbcType=INTEGER},
+      </if>
+      <if test="maturity != null">
+        #{maturity,jdbcType=INTEGER},
+      </if>
+      <if test="maturityPictureUrl != null">
+        #{maturityPictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="maturityTextFileUrl != null">
+        #{maturityTextFileUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="maturityVideoUrl != null">
+        #{maturityVideoUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="innovation != null">
+        #{innovation,jdbcType=INTEGER},
+      </if>
+      <if test="ownerName != null">
+        #{ownerName,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerType != null">
+        #{ownerType,jdbcType=INTEGER},
+      </if>
+      <if test="ownerIdNumber != null">
+        #{ownerIdNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerMobile != null">
+        #{ownerMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerEmail != null">
+        #{ownerEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerPostalAddress != null">
+        #{ownerPostalAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="cooperationMode != null">
+        #{cooperationMode,jdbcType=INTEGER},
+      </if>
+      <if test="transferMode != null">
+        #{transferMode,jdbcType=INTEGER},
+      </if>
+      <if test="bargainingMode != null">
+        #{bargainingMode,jdbcType=INTEGER},
+      </if>
+      <if test="transferPrice != null">
+        #{transferPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="technicalScene != null">
+        #{technicalScene,jdbcType=VARCHAR},
+      </if>
+      <if test="breakthrough != null">
+        #{breakthrough,jdbcType=VARCHAR},
+      </if>
+      <if test="patentCase != null">
+        #{patentCase,jdbcType=VARCHAR},
+      </if>
+      <if test="awards != null">
+        #{awards,jdbcType=VARCHAR},
+      </if>
+      <if test="teamDes != null">
+        #{teamDes,jdbcType=VARCHAR},
+      </if>
+      <if test="parameter != null">
+        #{parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="techPlanUrl != null">
+        #{techPlanUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="businessPlanUrl != null">
+        #{businessPlanUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=VARCHAR},
+      </if>
+      <if test="orgName != null">
+        #{orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="orgAddress != null">
+        #{orgAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="orgEmail != null">
+        #{orgEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="orgContacts != null">
+        #{orgContacts,jdbcType=VARCHAR},
+      </if>
+      <if test="orgContactsMobile != null">
+        #{orgContactsMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="contacts != null">
+        #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        #{managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="salesmanId != null">
+        #{salesmanId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="releaseStatus != null">
+        #{releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="releaseDate != null">
+        #{releaseDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deletedSign != null">
+        #{deletedSign,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Achievement">
+    update achievement
+    <set>
+      <if test="serialNumber != null">
+        serial_number = #{serialNumber,jdbcType=INTEGER},
+      </if>
+      <if test="dataCategory != null">
+        data_category = #{dataCategory,jdbcType=INTEGER},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="keyword != null">
+        keyword = #{keyword,jdbcType=VARCHAR},
+      </if>
+      <if test="category != null">
+        category = #{category,jdbcType=INTEGER},
+      </if>
+      <if test="summary != null">
+        summary = #{summary,jdbcType=VARCHAR},
+      </if>
+      <if test="introduction != null">
+        introduction = #{introduction,jdbcType=VARCHAR},
+      </if>
+      <if test="technicalPictureUrl != null">
+        technical_picture_url = #{technicalPictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="fieldA != null">
+        field_a = #{fieldA,jdbcType=INTEGER},
+      </if>
+      <if test="fieldB != null">
+        field_b = #{fieldB,jdbcType=INTEGER},
+      </if>
+      <if test="fieldC != null">
+        field_c = #{fieldC,jdbcType=INTEGER},
+      </if>
+      <if test="maturity != null">
+        maturity = #{maturity,jdbcType=INTEGER},
+      </if>
+      <if test="maturityPictureUrl != null">
+        maturity_picture_url = #{maturityPictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="maturityTextFileUrl != null">
+        maturity_text_file_url = #{maturityTextFileUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="maturityVideoUrl != null">
+        maturity_video_url = #{maturityVideoUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="innovation != null">
+        innovation = #{innovation,jdbcType=INTEGER},
+      </if>
+      <if test="ownerName != null">
+        owner_name = #{ownerName,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerType != null">
+        owner_type = #{ownerType,jdbcType=INTEGER},
+      </if>
+      <if test="ownerIdNumber != null">
+        owner_id_number = #{ownerIdNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerMobile != null">
+        owner_mobile = #{ownerMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerEmail != null">
+        owner_email = #{ownerEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerPostalAddress != null">
+        owner_postal_address = #{ownerPostalAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="cooperationMode != null">
+        cooperation_mode = #{cooperationMode,jdbcType=INTEGER},
+      </if>
+      <if test="transferMode != null">
+        transfer_mode = #{transferMode,jdbcType=INTEGER},
+      </if>
+      <if test="bargainingMode != null">
+        bargaining_mode = #{bargainingMode,jdbcType=INTEGER},
+      </if>
+      <if test="transferPrice != null">
+        transfer_price = #{transferPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="technicalScene != null">
+        technical_scene = #{technicalScene,jdbcType=VARCHAR},
+      </if>
+      <if test="breakthrough != null">
+        breakthrough = #{breakthrough,jdbcType=VARCHAR},
+      </if>
+      <if test="patentCase != null">
+        patent_case = #{patentCase,jdbcType=VARCHAR},
+      </if>
+      <if test="awards != null">
+        awards = #{awards,jdbcType=VARCHAR},
+      </if>
+      <if test="teamDes != null">
+        team_des = #{teamDes,jdbcType=VARCHAR},
+      </if>
+      <if test="parameter != null">
+        parameter = #{parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="techPlanUrl != null">
+        tech_plan_url = #{techPlanUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="businessPlanUrl != null">
+        business_plan_url = #{businessPlanUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=VARCHAR},
+      </if>
+      <if test="orgName != null">
+        org_name = #{orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="orgAddress != null">
+        org_address = #{orgAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="orgEmail != null">
+        org_email = #{orgEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="orgContacts != null">
+        org_contacts = #{orgContacts,jdbcType=VARCHAR},
+      </if>
+      <if test="orgContactsMobile != null">
+        org_contacts_mobile = #{orgContactsMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="contacts != null">
+        contacts = #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        manager_id = #{managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="salesmanId != null">
+        salesman_id = #{salesmanId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="releaseStatus != null">
+        release_status = #{releaseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="releaseDate != null">
+        release_date = #{releaseDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deletedSign != null">
+        deleted_sign = #{deletedSign,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.Achievement">
+    update achievement
+    set serial_number = #{serialNumber,jdbcType=INTEGER},
+      data_category = #{dataCategory,jdbcType=INTEGER},
+      name = #{name,jdbcType=VARCHAR},
+      keyword = #{keyword,jdbcType=VARCHAR},
+      category = #{category,jdbcType=INTEGER},
+      summary = #{summary,jdbcType=VARCHAR},
+      introduction = #{introduction,jdbcType=VARCHAR},
+      technical_picture_url = #{technicalPictureUrl,jdbcType=VARCHAR},
+      field_a = #{fieldA,jdbcType=INTEGER},
+      field_b = #{fieldB,jdbcType=INTEGER},
+      field_c = #{fieldC,jdbcType=INTEGER},
+      maturity = #{maturity,jdbcType=INTEGER},
+      maturity_picture_url = #{maturityPictureUrl,jdbcType=VARCHAR},
+      maturity_text_file_url = #{maturityTextFileUrl,jdbcType=VARCHAR},
+      maturity_video_url = #{maturityVideoUrl,jdbcType=VARCHAR},
+      innovation = #{innovation,jdbcType=INTEGER},
+      owner_name = #{ownerName,jdbcType=VARCHAR},
+      owner_type = #{ownerType,jdbcType=INTEGER},
+      owner_id_number = #{ownerIdNumber,jdbcType=VARCHAR},
+      owner_mobile = #{ownerMobile,jdbcType=VARCHAR},
+      owner_email = #{ownerEmail,jdbcType=VARCHAR},
+      owner_postal_address = #{ownerPostalAddress,jdbcType=VARCHAR},
+      cooperation_mode = #{cooperationMode,jdbcType=INTEGER},
+      transfer_mode = #{transferMode,jdbcType=INTEGER},
+      bargaining_mode = #{bargainingMode,jdbcType=INTEGER},
+      transfer_price = #{transferPrice,jdbcType=DECIMAL},
+      technical_scene = #{technicalScene,jdbcType=VARCHAR},
+      breakthrough = #{breakthrough,jdbcType=VARCHAR},
+      patent_case = #{patentCase,jdbcType=VARCHAR},
+      awards = #{awards,jdbcType=VARCHAR},
+      team_des = #{teamDes,jdbcType=VARCHAR},
+      parameter = #{parameter,jdbcType=VARCHAR},
+      tech_plan_url = #{techPlanUrl,jdbcType=VARCHAR},
+      business_plan_url = #{businessPlanUrl,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=VARCHAR},
+      org_name = #{orgName,jdbcType=VARCHAR},
+      org_address = #{orgAddress,jdbcType=VARCHAR},
+      org_email = #{orgEmail,jdbcType=VARCHAR},
+      org_contacts = #{orgContacts,jdbcType=VARCHAR},
+      org_contacts_mobile = #{orgContactsMobile,jdbcType=VARCHAR},
+      contacts = #{contacts,jdbcType=VARCHAR},
+      manager_id = #{managerId,jdbcType=VARCHAR},
+      salesman_id = #{salesmanId,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      release_status = #{releaseStatus,jdbcType=INTEGER},
+      release_date = #{releaseDate,jdbcType=TIMESTAMP},
+      deleted_sign = #{deletedSign,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="findManageAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
+  	select 
+  		id, serial_number as serialNumber, data_category as dataCategory, 
+  		name, keyword, category, 
+  		owner_name as ownerName, owner_type as ownerType, owner_mobile as ownerMobile,
+  		status, release_date as releaseDate
+  	from achievement
+  	where deleted_sign = 0
+  	<if test="serialNumber != null">
+		and  serial_number = #{serialNumber,jdbcType=INTEGER}
+	</if>
+	<if test="name != null">
+		and  name = #{name,jdbcType=VARCHAR}
+	</if>
+	<if test="keyword != null">
+		and  keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
+	</if>
+	<if test="category != null">
+		and  category = #{category,jdbcType=INTEGER}
+	</if>
+	<if test="ownerType != null">
+		and  owner_type = #{ownerType,jdbcType=INTEGER}
+	</if>
+	<if test="status != null">
+		and  status = #{status,jdbcType=INTEGER}
+	</if>
+	<if test="rStart != null">
+       and	release_date <![CDATA[ > ]]> #{rStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="rEnd != null">
+	   and release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test="releaseStatus != null">
+	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
+	</if>
+	order by serial_number desc
+	<if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+  
+  <select id="findManageAchievementCount" parameterType="String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from achievement
+  	where deleted_sign = 0
+  	<if test="serialNumber != null">
+		and  serial_number = #{serialNumber,jdbcType=INTEGER}
+	</if>
+	<if test="name != null">
+		and  name = #{name,jdbcType=VARCHAR}
+	</if>
+	<if test="keyword != null">
+		and  keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
+	</if>
+	<if test="category != null">
+		and  category = #{category,jdbcType=INTEGER}
+	</if>
+	<if test="ownerType != null">
+		and  owner_type = #{ownerType,jdbcType=INTEGER}
+	</if>
+	<if test="status != null">
+		and  status = #{status,jdbcType=INTEGER}
+	</if>
+	<if test="rStart != null">
+       and	release_date <![CDATA[ > ]]> #{rStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="rEnd != null">
+	   and release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test="releaseStatus != null">
+	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
+	</if>
+  </select>
+</mapper>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -550,7 +550,7 @@
 		and  d.demand_type = #{demandType,jdbcType=INTEGER}
 	</if>
 	<if test="status != null">
-		and  d.status = #{status,jdbcType=VARCHAR}
+		and  d.status = #{status,jdbcType=INTEGER}
 	</if>
 	<if test="releaseStatus != null">
 		and  d.release_status = #{releaseStatus,jdbcType=INTEGER}
@@ -612,7 +612,7 @@
 		and  d.demand_type = #{demandType,jdbcType=INTEGER}
 	</if>
 	<if test="status != null">
-		and  d.status = #{status,jdbcType=VARCHAR}
+		and  d.status = #{status,jdbcType=INTEGER}
 	</if>
 	<if test="releaseStatus != null">
 		and  d.release_status = #{releaseStatus,jdbcType=VARCHAR}

+ 670 - 0
src/main/java/com/goafanti/common/model/Achievement.java

@@ -0,0 +1,670 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class Achievement {
+	private String		id;
+
+	/**
+	 * 编号
+	 */
+	private Integer		serialNumber;
+
+	/**
+	 * 数据类别 (0--成果, 1--技术, 2--项目)
+	 */
+	private Integer		dataCategory;
+
+	/**
+	 * 名称
+	 */
+	private String		name;
+
+	/**
+	 * 关键词
+	 */
+	private String		keyword;
+
+	/**
+	 * 类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
+	 */
+	private Integer		category;
+
+	/**
+	 * 摘要
+	 */
+	private String		summary;
+
+	/**
+	 * 成果简介
+	 */
+	private String		introduction;
+
+	/**
+	 * 技术图片
+	 */
+	private String		technicalPictureUrl;
+
+	/**
+	 * 应用领域1
+	 */
+	private Integer		fieldA;
+
+	/**
+	 * 应用领域2
+	 */
+	private Integer		fieldB;
+
+	/**
+	 * 应用领域3
+	 */
+	private Integer		fieldC;
+
+	/**
+	 * 成熟度(1--正在研发, 2-- 已有样品, 3-- 通过小试, 4-- 通过中试, 5-- 可以量产)
+	 */
+	private Integer		maturity;
+
+	/**
+	 * 成熟度资料--图片URL
+	 */
+	private String		maturityPictureUrl;
+
+	/**
+	 * 成熟度资料--文本文件URL
+	 */
+	private String		maturityTextFileUrl;
+
+	/**
+	 * 成熟度资料--视屏URL
+	 */
+	private String		maturityVideoUrl;
+
+	/**
+	 * 创新度(0--行业先进,1--行业领先,2--国内先进,3--国内领先,4--国际先进,5--国际领先)
+	 */
+	private Integer		innovation;
+
+	/**
+	 * 成果所有人名称
+	 */
+	private String		ownerName;
+
+	/**
+	 * 所有人类型(0-个人,1-组织)
+	 */
+	private Integer		ownerType;
+
+	/**
+	 * 所有人证件号
+	 */
+	private String		ownerIdNumber;
+
+	/**
+	 * 所有人联系电话
+	 */
+	private String		ownerMobile;
+
+	/**
+	 * 所有人电子邮箱
+	 */
+	private String		ownerEmail;
+
+	/**
+	 * 所有人通讯地址
+	 */
+	private String		ownerPostalAddress;
+
+	/**
+	 * 合作方式(0--技术转让,1--授权生产)
+	 */
+	private Integer		cooperationMode;
+
+	/**
+	 * 转让方式(0--完全转让,1--许可转让,2--技术入股)
+	 */
+	private Integer		transferMode;
+
+	/**
+	 * 议价方式(0--面议,1--定价)
+	 */
+	private Integer		bargainingMode;
+
+	/**
+	 * 转让价格
+	 */
+	private BigDecimal	transferPrice;
+
+	/**
+	 * 技术场景
+	 */
+	private String		technicalScene;
+
+	/**
+	 * 技术突破
+	 */
+	private String		breakthrough;
+
+	/**
+	 * 专利情况
+	 */
+	private String		patentCase;
+
+	/**
+	 * 获奖情况
+	 */
+	private String		awards;
+
+	/**
+	 * 技术团队情况
+	 */
+	private String		teamDes;
+
+	/**
+	 * 技术参数
+	 */
+	private String		parameter;
+
+	/**
+	 * 技术方案URL
+	 */
+	private String		techPlanUrl;
+
+	/**
+	 * 商业计划书URL
+	 */
+	private String		businessPlanUrl;
+
+	/**
+	 * 所属组织ID
+	 */
+	private String		orgId;
+
+	/**
+	 * 所属组织名称
+	 */
+	private String		orgName;
+
+	/**
+	 * 所属组织地址
+	 */
+	private String		orgAddress;
+
+	/**
+	 * 所属组织邮箱
+	 */
+	private String		orgEmail;
+
+	/**
+	 * 所属组织联系人名称
+	 */
+	private String		orgContacts;
+
+	/**
+	 * 所属组织联系人电话
+	 */
+	private String		orgContactsMobile;
+
+	/**
+	 * 联系人及联系电话
+	 */
+	private String		contacts;
+
+	/**
+	 * 客户经理ID
+	 */
+	private String		managerId;
+
+	/**
+	 * 营销员ID
+	 */
+	private String		salesmanId;
+
+	/**
+	 * 状态
+	 */
+	private Integer		status;
+
+	/**
+	 * 成果记录创建时间
+	 */
+	private Date		createTime;
+
+	/**
+	 * 是否发布(0--未发布,1--已发布)
+	 */
+	private Integer		releaseStatus;
+
+	/**
+	 * 发布时间
+	 */
+	private Date		releaseDate;
+
+	/**
+	 * 删除标记
+	 */
+	private Integer		deletedSign;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getDataCategory() {
+		return dataCategory;
+	}
+
+	public void setDataCategory(Integer dataCategory) {
+		this.dataCategory = dataCategory;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getKeyword() {
+		return keyword;
+	}
+
+	public void setKeyword(String keyword) {
+		this.keyword = keyword;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getCategory() {
+		return category;
+	}
+
+	public void setCategory(Integer category) {
+		this.category = category;
+	}
+
+	public String getSummary() {
+		return summary;
+	}
+
+	public void setSummary(String summary) {
+		this.summary = summary;
+	}
+
+	public String getIntroduction() {
+		return introduction;
+	}
+
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
+
+	public String getTechnicalPictureUrl() {
+		return technicalPictureUrl;
+	}
+
+	public void setTechnicalPictureUrl(String technicalPictureUrl) {
+		this.technicalPictureUrl = technicalPictureUrl;
+	}
+
+	public Integer getFieldA() {
+		return fieldA;
+	}
+
+	public void setFieldA(Integer fieldA) {
+		this.fieldA = fieldA;
+	}
+
+	public Integer getFieldB() {
+		return fieldB;
+	}
+
+	public void setFieldB(Integer fieldB) {
+		this.fieldB = fieldB;
+	}
+
+	public Integer getFieldC() {
+		return fieldC;
+	}
+
+	public void setFieldC(Integer fieldC) {
+		this.fieldC = fieldC;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getMaturity() {
+		return maturity;
+	}
+
+	public void setMaturity(Integer maturity) {
+		this.maturity = maturity;
+	}
+
+	public String getMaturityPictureUrl() {
+		return maturityPictureUrl;
+	}
+
+	public void setMaturityPictureUrl(String maturityPictureUrl) {
+		this.maturityPictureUrl = maturityPictureUrl;
+	}
+
+	public String getMaturityTextFileUrl() {
+		return maturityTextFileUrl;
+	}
+
+	public void setMaturityTextFileUrl(String maturityTextFileUrl) {
+		this.maturityTextFileUrl = maturityTextFileUrl;
+	}
+
+	public String getMaturityVideoUrl() {
+		return maturityVideoUrl;
+	}
+
+	public void setMaturityVideoUrl(String maturityVideoUrl) {
+		this.maturityVideoUrl = maturityVideoUrl;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getInnovation() {
+		return innovation;
+	}
+
+	public void setInnovation(Integer innovation) {
+		this.innovation = innovation;
+	}
+
+	public String getOwnerName() {
+		return ownerName;
+	}
+
+	public void setOwnerName(String ownerName) {
+		this.ownerName = ownerName;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getOwnerType() {
+		return ownerType;
+	}
+
+	public void setOwnerType(Integer ownerType) {
+		this.ownerType = ownerType;
+	}
+
+	public String getOwnerIdNumber() {
+		return ownerIdNumber;
+	}
+
+	public void setOwnerIdNumber(String ownerIdNumber) {
+		this.ownerIdNumber = ownerIdNumber;
+	}
+
+	public String getOwnerMobile() {
+		return ownerMobile;
+	}
+
+	public void setOwnerMobile(String ownerMobile) {
+		this.ownerMobile = ownerMobile;
+	}
+
+	public String getOwnerEmail() {
+		return ownerEmail;
+	}
+
+	public void setOwnerEmail(String ownerEmail) {
+		this.ownerEmail = ownerEmail;
+	}
+
+	public String getOwnerPostalAddress() {
+		return ownerPostalAddress;
+	}
+
+	public void setOwnerPostalAddress(String ownerPostalAddress) {
+		this.ownerPostalAddress = ownerPostalAddress;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getCooperationMode() {
+		return cooperationMode;
+	}
+
+	public void setCooperationMode(Integer cooperationMode) {
+		this.cooperationMode = cooperationMode;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getTransferMode() {
+		return transferMode;
+	}
+
+	public void setTransferMode(Integer transferMode) {
+		this.transferMode = transferMode;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getBargainingMode() {
+		return bargainingMode;
+	}
+
+	public void setBargainingMode(Integer bargainingMode) {
+		this.bargainingMode = bargainingMode;
+	}
+
+	public BigDecimal getTransferPrice() {
+		return transferPrice;
+	}
+
+	public void setTransferPrice(BigDecimal transferPrice) {
+		this.transferPrice = transferPrice;
+	}
+
+	public String getTechnicalScene() {
+		return technicalScene;
+	}
+
+	public void setTechnicalScene(String technicalScene) {
+		this.technicalScene = technicalScene;
+	}
+
+	public String getBreakthrough() {
+		return breakthrough;
+	}
+
+	public void setBreakthrough(String breakthrough) {
+		this.breakthrough = breakthrough;
+	}
+
+	public String getPatentCase() {
+		return patentCase;
+	}
+
+	public void setPatentCase(String patentCase) {
+		this.patentCase = patentCase;
+	}
+
+	public String getAwards() {
+		return awards;
+	}
+
+	public void setAwards(String awards) {
+		this.awards = awards;
+	}
+
+	public String getTeamDes() {
+		return teamDes;
+	}
+
+	public void setTeamDes(String teamDes) {
+		this.teamDes = teamDes;
+	}
+
+	public String getParameter() {
+		return parameter;
+	}
+
+	public void setParameter(String parameter) {
+		this.parameter = parameter;
+	}
+
+	public String getTechPlanUrl() {
+		return techPlanUrl;
+	}
+
+	public void setTechPlanUrl(String techPlanUrl) {
+		this.techPlanUrl = techPlanUrl;
+	}
+
+	public String getBusinessPlanUrl() {
+		return businessPlanUrl;
+	}
+
+	public void setBusinessPlanUrl(String businessPlanUrl) {
+		this.businessPlanUrl = businessPlanUrl;
+	}
+
+	public String getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(String orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+	public String getOrgAddress() {
+		return orgAddress;
+	}
+
+	public void setOrgAddress(String orgAddress) {
+		this.orgAddress = orgAddress;
+	}
+
+	public String getOrgEmail() {
+		return orgEmail;
+	}
+
+	public void setOrgEmail(String orgEmail) {
+		this.orgEmail = orgEmail;
+	}
+
+	public String getOrgContacts() {
+		return orgContacts;
+	}
+
+	public void setOrgContacts(String orgContacts) {
+		this.orgContacts = orgContacts;
+	}
+
+	public String getOrgContactsMobile() {
+		return orgContactsMobile;
+	}
+
+	public void setOrgContactsMobile(String orgContactsMobile) {
+		this.orgContactsMobile = orgContactsMobile;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getManagerId() {
+		return managerId;
+	}
+
+	public void setManagerId(String managerId) {
+		this.managerId = managerId;
+	}
+
+	public String getSalesmanId() {
+		return salesmanId;
+	}
+
+	public void setSalesmanId(String salesmanId) {
+		this.salesmanId = salesmanId;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getReleaseStatus() {
+		return releaseStatus;
+	}
+
+	public void setReleaseStatus(Integer releaseStatus) {
+		this.releaseStatus = releaseStatus;
+	}
+
+	public Date getReleaseDate() {
+		return releaseDate;
+	}
+
+	public void setReleaseDate(Date releaseDate) {
+		this.releaseDate = releaseDate;
+	}
+
+	@JsonIgnore
+	public Integer getDeletedSign() {
+		return deletedSign;
+	}
+
+	public void setDeletedSign(Integer deletedSign) {
+		this.deletedSign = deletedSign;
+	}
+
+	public String getReleaseDateFormattedDate() {
+		if (this.releaseDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setReleaseDateFormattedDate(String releaseDateFormattedDate) {
+
+	}
+}

+ 2 - 2
src/main/java/com/goafanti/common/model/Demand.java

@@ -476,7 +476,7 @@ public class Demand {
 		if (this.validityPeriod == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getValidityPeriod(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getValidityPeriod(), AFTConstants.YYYYMMDD);
 		}
 	}
 
@@ -488,7 +488,7 @@ public class Demand {
 		if (this.releaseDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 

+ 2 - 2
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -148,7 +148,7 @@ public class DemandListBo {
 		if (this.validityPeriod == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getValidityPeriod(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getValidityPeriod(), AFTConstants.YYYYMMDD);
 		}
 	}
 
@@ -160,7 +160,7 @@ public class DemandListBo {
 		if (this.releaseDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDD);
 		}
 	}