Antiloveg 8 年 前
コミット
06f70a018d

+ 9 - 0
schema/2017-05-25.sql

@@ -0,0 +1,9 @@
+CREATE TABLE `achievement_demand` (
+  `id` VARCHAR(36) NOT NULL,
+  `achievement_id` VARCHAR(36) NOT NULL COMMENT '科技成果ID',
+  `demand_id` VARCHAR(36) NOT NULL COMMENT '科技需求ID',
+  `keyword` VARCHAR(16) NOT NULL COMMENT '关键词',
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB
+COMMENT = '科技成果及科技需求匹配'
+	

+ 0 - 25
src/main/java/com/goafanti/achievement/controller/AchievementApiController.java

@@ -263,36 +263,11 @@ public class AchievementApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (StringUtils.isBlank(ia.getOwnerName())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果所有人名称", "成果所有人名称"));
-			return res;
-		}
-
 		if (null == ia.getOwnerType()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人类型", "所有人类型"));
 			return res;
 		}
 
-		if (StringUtils.isBlank(ia.getOwnerIdNumber())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人证件号", "所有人证件号"));
-			return res;
-		}
-
-		if (StringUtils.isBlank(ia.getOwnerMobile())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人联系电话", "所有人联系电话"));
-			return res;
-		}
-
-		if (StringUtils.isBlank(ia.getOwnerEmail())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人电子邮箱", "所有人电子邮箱"));
-			return res;
-		}
-
-		if (StringUtils.isBlank(ia.getOwnerPostalAddress())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人通讯地址", "所有人通讯地址"));
-			return res;
-		}
-
 		if (null == ia.getCooperationMode()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合作方式", "合作方式"));
 			return res;

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

@@ -42,7 +42,6 @@ public class AdminAchievementApiController extends CertifyApiController {
 	public Result getAchievementUserOwner(String name){
 		Result res = new Result();
 		if (StringUtils.isBlank(name)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果所有人", "成果所有人"));
 			return res;
 		}
 		res.setData(userService.selectAchievementUserOwner(name));
@@ -56,7 +55,6 @@ public class AdminAchievementApiController extends CertifyApiController {
 	public Result getAchievementOrgOwner(String name){
 		Result res = new Result();
 		if (StringUtils.isBlank(name)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果所有人", "成果所有人"));
 			return res;
 		}
 		res.setData(userService.selectAchievementOrgOwner(name));
@@ -324,36 +322,12 @@ public class AdminAchievementApiController extends CertifyApiController {
 			return res;
 		}
 		
-		if (StringUtils.isBlank(ia.getOwnerName())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果所有人名称", "成果所有人名称"));
-			return res;
-		}
 
 		if (null == ia.getOwnerType()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人类型", "所有人类型"));
 			return res;
 		}
 
-		if (StringUtils.isBlank(ia.getOwnerIdNumber())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人证件号", "所有人证件号"));
-			return res;
-		}
-
-		if (StringUtils.isBlank(ia.getOwnerMobile())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人联系电话", "所有人联系电话"));
-			return res;
-		}
-
-		if (StringUtils.isBlank(ia.getOwnerEmail())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人电子邮箱", "所有人电子邮箱"));
-			return res;
-		}
-
-		if (StringUtils.isBlank(ia.getOwnerPostalAddress())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人通讯地址", "所有人通讯地址"));
-			return res;
-		}
-
 		if (null == ia.getCooperationMode()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合作方式", "合作方式"));
 			return res;

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

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

+ 82 - 0
src/main/java/com/goafanti/common/mapper/AchievementDemandMapper.xml

@@ -0,0 +1,82 @@
+<?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.AchievementDemandMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.AchievementDemand" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="achievement_id" property="achievementId" jdbcType="VARCHAR" />
+    <result column="demand_id" property="demandId" jdbcType="VARCHAR" />
+    <result column="keyword" property="keyword" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, achievement_id, demand_id, keyword
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from achievement_demand
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from achievement_demand
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.AchievementDemand" >
+    insert into achievement_demand (id, achievement_id, demand_id, 
+      keyword)
+    values (#{id,jdbcType=VARCHAR}, #{achievementId,jdbcType=VARCHAR}, #{demandId,jdbcType=VARCHAR}, 
+      #{keyword,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.AchievementDemand" >
+    insert into achievement_demand
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="achievementId != null" >
+        achievement_id,
+      </if>
+      <if test="demandId != null" >
+        demand_id,
+      </if>
+      <if test="keyword != null" >
+        keyword,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="achievementId != null" >
+        #{achievementId,jdbcType=VARCHAR},
+      </if>
+      <if test="demandId != null" >
+        #{demandId,jdbcType=VARCHAR},
+      </if>
+      <if test="keyword != null" >
+        #{keyword,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.AchievementDemand" >
+    update achievement_demand
+    <set >
+      <if test="achievementId != null" >
+        achievement_id = #{achievementId,jdbcType=VARCHAR},
+      </if>
+      <if test="demandId != null" >
+        demand_id = #{demandId,jdbcType=VARCHAR},
+      </if>
+      <if test="keyword != null" >
+        keyword = #{keyword,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.AchievementDemand" >
+    update achievement_demand
+    set achievement_id = #{achievementId,jdbcType=VARCHAR},
+      demand_id = #{demandId,jdbcType=VARCHAR},
+      keyword = #{keyword,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 52 - 0
src/main/java/com/goafanti/common/model/AchievementDemand.java

@@ -0,0 +1,52 @@
+package com.goafanti.common.model;
+
+public class AchievementDemand {
+    private String id;
+
+    /**
+    * 科技成果ID
+    */
+    private String achievementId;
+
+    /**
+    * 科技需求ID
+    */
+    private String demandId;
+
+    /**
+    * 关键词
+    */
+    private String keyword;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getAchievementId() {
+        return achievementId;
+    }
+
+    public void setAchievementId(String achievementId) {
+        this.achievementId = achievementId;
+    }
+
+    public String getDemandId() {
+        return demandId;
+    }
+
+    public void setDemandId(String demandId) {
+        this.demandId = demandId;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+}