Explorar o código

企业创新能力接口

Antiloveg %!s(int64=9) %!d(string=hai) anos
pai
achega
c59a64fd84

+ 53 - 4
src/main/java/com/goafanti/common/mapper/UserAbilityMapper.xml

@@ -5,9 +5,13 @@
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
     <result column="ability_label" property="abilityLabel" jdbcType="VARCHAR" />
+    <result column="intellect_right" property="intellectRight" jdbcType="VARCHAR" />
+    <result column="science_achievement" property="scienceAchievement" jdbcType="VARCHAR" />
+    <result column="research_innovation" property="researchInnovation" jdbcType="VARCHAR" />
+    <result column="personnel" property="personnel" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, uid, ability_label
+    id, uid, ability_label, intellect_right, science_achievement, research_innovation, personnel
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -20,9 +24,11 @@
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.UserAbility" >
-    insert into user_ability (id, uid, ability_label
+    insert into user_ability (id, uid, ability_label, intellect_right, science_achievement, research_innovation, personnel
       )
-    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{abilityLabel,jdbcType=VARCHAR}
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{abilityLabel,jdbcType=VARCHAR},
+    #{intellectRight,jdbcType=VARCHAR}, #{scienceAchievement,jdbcType=VARCHAR}, 
+    #{researchInnovation,jdbcType=VARCHAR}, #{personnel,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.UserAbility" >
@@ -37,6 +43,19 @@
       <if test="abilityLabel != null" >
         ability_label,
       </if>
+      
+      <if test="intellectRight != null" >
+        intellect_right,
+      </if>
+      <if test="scienceAchievement != null" >
+        science_achievement,
+      </if>
+      <if test="researchInnovation != null" >
+        research_innovation,
+      </if>
+      <if test="personnel != null" >
+        personnel,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -48,6 +67,19 @@
       <if test="abilityLabel != null" >
         #{abilityLabel,jdbcType=VARCHAR},
       </if>
+      
+      <if test="intellectRight != null" >
+        #{intellectRight,jdbcType=VARCHAR},
+      </if>
+      <if test="scienceAchievement != null" >
+        #{scienceAchievement,jdbcType=VARCHAR},
+      </if>
+      <if test="researchInnovation != null" >
+        #{researchInnovation,jdbcType=VARCHAR},
+      </if>
+      <if test="personnel != null" >
+        #{personnel,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserAbility" >
@@ -59,13 +91,30 @@
       <if test="abilityLabel != null" >
         ability_label = #{abilityLabel,jdbcType=VARCHAR},
       </if>
+      
+      <if test="intellectRight != null" >
+        intellect_right = #{intellectRight,jdbcType=VARCHAR},
+      </if>
+      <if test="scienceAchievement != null" >
+        science_achievement = #{scienceAchievement,jdbcType=VARCHAR},
+      </if>
+      <if test="researchInnovation != null" >
+        research_innovation = #{researchInnovation,jdbcType=VARCHAR},
+      </if>
+      <if test="personnel != null" >
+        personnel = #{personnel,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserAbility" >
     update user_ability
     set uid = #{uid,jdbcType=VARCHAR},
-      ability_label = #{abilityLabel,jdbcType=VARCHAR}
+      ability_label = #{abilityLabel,jdbcType=VARCHAR},
+      intellect_right = #{intellectRight,jdbcType=VARCHAR},
+      science_achievement = #{scienceAchievement,jdbcType=VARCHAR},
+      research_innovation = #{researchInnovation,jdbcType=VARCHAR},
+      personnel = #{personnel,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   

+ 56 - 0
src/main/java/com/goafanti/common/model/UserAbility.java

@@ -9,6 +9,28 @@ public class UserAbility {
     * 能力标签
     */
     private String abilityLabel;
+    
+    /**
+     * 知识产权对企业竞争力的作用  
+     */
+    private String intellectRight;
+    
+    /**
+     * 科技成果转化情况
+     */
+    private String scienceAchievement;
+    
+    
+    /**
+     * 研究开发与技术创新组织管理情况
+     */
+    private String researchInnovation;
+    
+    
+    /**
+     * 管理与科技人员情况
+     */
+    private String personnel;
 
     public String getId() {
         return id;
@@ -33,4 +55,38 @@ public class UserAbility {
     public void setAbilityLabel(String abilityLabel) {
         this.abilityLabel = abilityLabel;
     }
+
+	public String getIntellectRight() {
+		return intellectRight;
+	}
+
+	public void setIntellectRight(String intellectRight) {
+		this.intellectRight = intellectRight;
+	}
+
+	public String getScienceAchievement() {
+		return scienceAchievement;
+	}
+
+	public void setScienceAchievement(String scienceAchievement) {
+		this.scienceAchievement = scienceAchievement;
+	}
+
+	public String getResearchInnovation() {
+		return researchInnovation;
+	}
+
+	public void setResearchInnovation(String researchInnovation) {
+		this.researchInnovation = researchInnovation;
+	}
+
+	public String getPersonnel() {
+		return personnel;
+	}
+
+	public void setPersonnel(String personnel) {
+		this.personnel = personnel;
+	}
+    
+    
 }

+ 0 - 2
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -598,8 +598,6 @@ public class UserApiController extends BaseApiController {
 	public Result ability() {
 		Result res = new Result();
 		UidAndTypeBo ub = basicInfo(userService);
-		// UserAbility u =
-		// userAbilityService.selectUserAbilityByUserId(basicInfo(userService).getUid());
 		UserAbility u = userAbilityService.selectUserAbilityByUserId(ub.getUid());
 		res.setData(u);
 		return res;