Browse Source

update DB MWB

Antiloveg 8 years ago
parent
commit
f7f040c967

+ 1 - 4
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -644,11 +644,8 @@ public class AdminApiController extends BaseApiController {
 	 * @throws ParseException 
 	 */
 	@RequestMapping(value= "/disposeAchievement", method = RequestMethod.POST)
-	public Result disposeAchievement(OrgTechAchievement achievement, String acquisitionTimeFormattedDate) throws ParseException{
+	public Result disposeAchievement(OrgTechAchievement achievement) throws ParseException{
 		Result res = new Result();
-		if (!StringUtils.isBlank(acquisitionTimeFormattedDate)){
-			achievement.setAcquisitionTime(DateUtils.parseDate(acquisitionTimeFormattedDate, "yyyy-MM-dd"));
-		}
 		if (null == achievement.getId()){
 			achievement.setId(UUID.randomUUID().toString());
 			achievement.setDeletedSign(0);

+ 4 - 0
src/main/java/com/goafanti/common/dao/OrgHumanResourceMapper.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import com.goafanti.common.model.OrgHumanResource;
 
 public interface OrgHumanResourceMapper {
@@ -16,4 +18,6 @@ public interface OrgHumanResourceMapper {
     int updateByPrimaryKey(OrgHumanResource record);
 
 	OrgHumanResource selectOrgHumanResourceByUserId(String uid);
+
+	int batchDeleteByPrimaryKey(List<String> id);
 }

+ 28 - 6
src/main/java/com/goafanti/common/mapper/OrgActivityMapper.xml

@@ -8,6 +8,7 @@
     <result column="activity_name" property="activityName" jdbcType="VARCHAR" />
     <result column="start_date" property="startDate" jdbcType="TIMESTAMP" />
     <result column="end_date" property="endDate" jdbcType="TIMESTAMP" />
+    <result column="participant" property="participant" jdbcType="VARCHAR" />
     <result column="technical_field1" property="technicalField1" jdbcType="VARCHAR" />
     <result column="technical_field2" property="technicalField2" jdbcType="VARCHAR" />
     <result column="technical_field3" property="technicalField3" jdbcType="VARCHAR" />
@@ -20,13 +21,14 @@
     <result column="implement" property="implement" jdbcType="VARCHAR" />
     <result column="technology_innovation" property="technologyInnovation" jdbcType="VARCHAR" />
     <result column="achievement" property="achievement" jdbcType="VARCHAR" />
+    <result column="proof_url" property="proofUrl" jdbcType="VARCHAR" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, uid, activity_number, activity_name, start_date, end_date, technical_field1, 
+    id, uid, activity_number, activity_name, start_date, end_date, participant, technical_field1, 
     technical_field2, technical_field3, technical_source, intellectual_property_number, 
     budget, first_year_expenditure, second_year_expenditure, third_year_expenditure, 
-    implement, technology_innovation, achievement, deleted_sign
+    implement, technology_innovation, achievement, proof_url, deleted_sign
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -40,20 +42,20 @@
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.OrgActivity" >
     insert into org_activity (id, uid, activity_number, 
-      activity_name, start_date, end_date, 
+      activity_name, start_date, end_date, participant,
       technical_field1, technical_field2, technical_field3, 
       technical_source, intellectual_property_number, 
       budget, first_year_expenditure, second_year_expenditure, 
       third_year_expenditure, implement, technology_innovation, 
-      achievement, deleted_sign
+      achievement, proof_url, deleted_sign
       )
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{activityNumber,jdbcType=VARCHAR}, 
-      #{activityName,jdbcType=VARCHAR}, #{startDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, 
+      #{activityName,jdbcType=VARCHAR}, #{startDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{participant,jdbcType=VARCHAR},
       #{technicalField1,jdbcType=VARCHAR}, #{technicalField2,jdbcType=VARCHAR}, #{technicalField3,jdbcType=VARCHAR}, 
       #{technicalSource,jdbcType=INTEGER}, #{intellectualPropertyNumber,jdbcType=VARCHAR}, 
       #{budget,jdbcType=INTEGER}, #{firstYearExpenditure,jdbcType=INTEGER}, #{secondYearExpenditure,jdbcType=INTEGER}, 
       #{thirdYearExpenditure,jdbcType=INTEGER}, #{implement,jdbcType=VARCHAR}, #{technologyInnovation,jdbcType=VARCHAR}, 
-      #{achievement,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}
+      #{achievement,jdbcType=VARCHAR}, #{proofUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgActivity" >
@@ -77,6 +79,9 @@
       <if test="endDate != null" >
         end_date,
       </if>
+      <if test="participant != null" >
+        participant,
+      </if>
       <if test="technicalField1 != null" >
         technical_field1,
       </if>
@@ -113,6 +118,9 @@
       <if test="achievement != null" >
         achievement,
       </if>
+      <if test="proofUrl != null" >
+        proof_url,
+      </if>
       <if test="deletedSign != null" >
         deleted_sign,
       </if>
@@ -136,6 +144,9 @@
       <if test="endDate != null" >
         #{endDate,jdbcType=TIMESTAMP},
       </if>
+       <if test="participant != null" >
+        #{participant,jdbcType=VARCHAR},
+      </if>
       <if test="technicalField1 != null" >
         #{technicalField1,jdbcType=VARCHAR},
       </if>
@@ -172,6 +183,9 @@
       <if test="achievement != null" >
         #{achievement,jdbcType=VARCHAR},
       </if>
+       <if test="proofUrl != null" >
+        #{proofUrl,jdbcType=VARCHAR},
+      </if>
        <if test="deletedSign != null" >
         #{deletedSign,jdbcType=INTEGER},
       </if>
@@ -195,6 +209,9 @@
       <if test="endDate != null" >
         end_date = #{endDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="participant != null" >
+        participant = #{participant,jdbcType=VARCHAR},
+      </if>
       <if test="technicalField1 != null" >
         technical_field1 = #{technicalField1,jdbcType=VARCHAR},
       </if>
@@ -231,6 +248,9 @@
       <if test="achievement != null" >
         achievement = #{achievement,jdbcType=VARCHAR},
       </if>
+       <if test="proofUrl != null" >
+        proofUrl = #{proofUrl,jdbcType=VARCHAR},
+      </if>
       <if test="deletedSign != null" >
         deleted_sign = #{deletedSign,jdbcType=INTEGER},
       </if>
@@ -244,6 +264,7 @@
       activity_name = #{activityName,jdbcType=VARCHAR},
       start_date = #{startDate,jdbcType=TIMESTAMP},
       end_date = #{endDate,jdbcType=TIMESTAMP},
+      participant = #{participant,jdbcType=VARCHAR},
       technical_field1 = #{technicalField1,jdbcType=VARCHAR},
       technical_field2 = #{technicalField2,jdbcType=VARCHAR},
       technical_field3 = #{technicalField3,jdbcType=VARCHAR},
@@ -268,6 +289,7 @@
       enterprise_filler = #{enterpriseFiller,jdbcType=VARCHAR},
       sign_date = #{signDate,jdbcType=TIMESTAMP},
       sort_number = #{sortNumber,jdbcType=VARCHAR},
+      proof_url = #{proofUrl,jdbcType=VARCHAR},
       deleted_sign = #{deletedSign,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>

+ 37 - 8
src/main/java/com/goafanti/common/mapper/OrgHumanResourceMapper.xml

@@ -32,13 +32,15 @@
     <result column="above_fifty" property="aboveFifty" jdbcType="INTEGER" />
     <result column="year" property="year" jdbcType="INTEGER" />
     <result column="roster_url" property="rosterUrl" jdbcType="VARCHAR" />
+    <result column="social_security_url" property="socialSecurityUrl" jdbcType="VARCHAR" />
+    <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, firm_total, tech_total, firm_in_service, tech_in_service, firm_part_time, 
     tech_part_time, firm_temporary, tech_temporary, firm_foreign, tech_foreign, firm_abroad, 
     tech_abroad, firm_core, tech_core, doctor, master, undergraduate, college, 
     senior_title, intermediate_title, junior_title, senior_mechanic, below_thirty, 
-    thirtyone_to_thirtyfour, fortyone_to_fifty, above_fifty, year, roster_url
+    thirtyone_to_thirtyfour, fortyone_to_fifty, above_fifty, year, roster_url, social_security_url, deleted_sign
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -60,7 +62,7 @@
       undergraduate, college, senior_title, 
       intermediate_title, junior_title, senior_mechanic, 
       below_thirty, thirtyone_to_thirtyfour, fortyone_to_fifty, 
-      above_fifty, year, roster_url)
+      above_fifty, year, roster_url, social_security_url, deleted_sign)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{firmTotal,jdbcType=INTEGER}, 
       #{techTotal,jdbcType=INTEGER}, #{firmInService,jdbcType=INTEGER}, #{techInService,jdbcType=INTEGER}, 
       #{firmPartTime,jdbcType=INTEGER}, #{techPartTime,jdbcType=INTEGER}, #{firmTemporary,jdbcType=INTEGER}, 
@@ -70,7 +72,8 @@
       #{undergraduate,jdbcType=INTEGER}, #{college,jdbcType=INTEGER}, #{seniorTitle,jdbcType=INTEGER}, 
       #{intermediateTitle,jdbcType=INTEGER}, #{juniorTitle,jdbcType=INTEGER}, #{seniorMechanic,jdbcType=INTEGER}, 
       #{belowThirty,jdbcType=INTEGER}, #{thirtyoneToThirtyfour,jdbcType=INTEGER}, #{fortyoneToFifty,jdbcType=INTEGER}, 
-      #{aboveFifty,jdbcType=INTEGER}, #{year,jdbcType=INTEGER}, #{rosterUrl,jdbcType=VARCHAR})
+      #{aboveFifty,jdbcType=INTEGER}, #{year,jdbcType=INTEGER}, #{rosterUrl,jdbcType=VARCHAR}, #{socialSecurityUrl,jdbcType=VARCHAR},
+      #{deletedSign,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgHumanResource" >
     insert into org_human_resource
@@ -165,6 +168,12 @@
       <if test="rosterUrl != null" >
         roster_url,
       </if>
+      <if test="socialSecurityUrl != null">
+      	social_security_url,
+      </if>
+       <if test="deletedSign != null">
+      	deleted_sign,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -257,6 +266,12 @@
       <if test="rosterUrl != null" >
         #{rosterUrl,jdbcType=VARCHAR},
       </if>
+      <if test="socialSecurityUrl != null">
+        #{socialSecurityUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="deletedSign != null">
+        #{deleted_sign,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrgHumanResource" >
@@ -349,6 +364,12 @@
       <if test="rosterUrl != null" >
         roster_url = #{rosterUrl,jdbcType=VARCHAR},
       </if>
+      <if test="socialSecurityUrl != null">
+      	social_security_url = #{socialSecurityUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="deletedSign != null">
+      	deleted_sign = #{deletedSign,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -382,7 +403,9 @@
       fortyone_to_fifty = #{fortyoneToFifty,jdbcType=INTEGER},
       above_fifty = #{aboveFifty,jdbcType=INTEGER},
       year = #{year,jdbcType=INTEGER},
-      roster_url = #{rosterUrl,jdbcType=VARCHAR}
+      roster_url = #{rosterUrl,jdbcType=VARCHAR},
+      social_security_url = #{socialSecurityUrl,jdbcType=VARCHAR},
+      deleted_sign = #{deletedSign,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -390,7 +413,7 @@
   	 select 
     <include refid="Base_Column_List" />
     from org_human_resource
-    where 1=1
+    where deleted_sign = 0
     <if test="uid != null">
 	    and  uid = #{uid,jdbcType=VARCHAR}
 	</if>
@@ -407,14 +430,20 @@
   <select id="findOrgHumanResourceCount" resultType="java.lang.Integer" parameterType="String">
    	select count(1) 
 	    from org_human_resource
-	     where 1=1
+	     where deleted_sign = 0
 	    <if test="uid != null">
 		    and  uid = #{uid,jdbcType=VARCHAR}
 		</if>
 		<if test="year != null">
 		and year = #{year,jdbcType=INTEGER}
 	    </if>
-    </select>
-  
+  </select>
   
+  <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
+  	update org_human_resource set deleted_sign = 1
+  	where  id in 
+	<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+		#{item}
+	</foreach>
+  </update>
 </mapper>

+ 15 - 4
src/main/java/com/goafanti/common/mapper/OrgIntellectualPropertyMapper.xml

@@ -13,11 +13,12 @@
     <result column="authorization_number" property="authorizationNumber" jdbcType="VARCHAR" />
     <result column="authorization_date" property="authorizationDate" jdbcType="TIMESTAMP" />
     <result column="evaluation_category" property="evaluationCategory" jdbcType="INTEGER" />
+    <result column="property_right_url" property="propertyRightUrl" jdbcType="VARCHAR" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, pid, intellectual_property_number, intellectual_property_name, sort_number, catagory, 
-    obtain_way, authorization_number, authorization_date, evaluation_category, deleted_sign
+    obtain_way, authorization_number, authorization_date, evaluation_category, property_right_url, deleted_sign
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -33,11 +34,11 @@
     insert into org_intellectual_property (id, uid, pid, intellectual_property_number, 
       intellectual_property_name, sort_number, catagory, 
       obtain_way, authorization_number, authorization_date, 
-      evaluation_category, deleted_sign)
+      evaluation_category, property_right_url, deleted_sign)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{intellectualPropertyNumber,jdbcType=VARCHAR}, 
       #{intellectualPropertyName,jdbcType=VARCHAR}, #{sortNumber,jdbcType=VARCHAR}, #{catagory,jdbcType=INTEGER}, 
       #{obtainWay,jdbcType=INTEGER}, #{authorizationNumber,jdbcType=VARCHAR}, #{authorizationDate,jdbcType=TIMESTAMP}, 
-      #{evaluationCategory,jdbcType=INTEGER}, #{deletedSign,jdbcType=INTEGER})
+      #{evaluationCategory,jdbcType=INTEGER}, #{propertyRightUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgIntellectualProperty" >
     insert into org_intellectual_property
@@ -75,6 +76,9 @@
       <if test="evaluationCategory != null" >
         evaluation_category,
       </if>
+      <if test="propertyRightUrl != null" >
+        property_right_url,
+      </if>
       <if test="deletedSign != null" >
         deleted_sign,
       </if>
@@ -113,6 +117,9 @@
       <if test="evaluationCategory != null" >
         #{evaluationCategory,jdbcType=INTEGER},
       </if>
+      <if test="propertyRightUrl != null" >
+        #{propertyRightUrl,jdbcType=VARCHAR},
+      </if>
       <if test="deletedSign != null" >
         #{deletedSign,jdbcType=INTEGER},
       </if>
@@ -151,6 +158,9 @@
       <if test="evaluationCategory != null" >
         evaluation_category = #{evaluationCategory,jdbcType=INTEGER},
       </if>
+      <if test="propertyRightUrl != null" >
+        property_right_url = #{propertyRightUrl,jdbcType=VARCHAR},
+      </if>
       <if test="deletedSign != null" >
         deleted_sign = #{deletedSign,jdbcType=INTEGER},
       </if>
@@ -169,6 +179,7 @@
       authorization_number = #{authorizationNumber,jdbcType=VARCHAR},
       authorization_date = #{authorizationDate,jdbcType=TIMESTAMP},
       evaluation_category = #{evaluationCategory,jdbcType=INTEGER},
+      property_right_url = #{propertyRightUrl,jdbcType=VARCHAR},
       deleted_sign = #{deletedSign,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -198,7 +209,7 @@
 		</if>
     </select>
     
-   <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
+  <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
   	update org_intellectual_property set deleted_sign = 1
   	where  id in 
 	<foreach item="item" index="index" collection="list" open="(" separator="," close=")">

+ 45 - 20
src/main/java/com/goafanti/common/mapper/OrgTechAchievementMapper.xml

@@ -5,13 +5,16 @@
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
     <result column="achievement_name" property="achievementName" jdbcType="VARCHAR" />
-    <result column="source" property="source" jdbcType="INTEGER" />
-    <result column="acquisition_time" property="acquisitionTime" jdbcType="TIMESTAMP" />
+    <result column="source" property="source" jdbcType="VARCHAR" />
+    <result column="conversion_form" property="conversionForm" jdbcType="INTEGER" />
+    <result column="conversion_result" property="conversionResult" jdbcType="VARCHAR" />
+    <result column="year" property="year" jdbcType="INTEGER" />
     <result column="enclosure_url" property="enclosureUrl" jdbcType="VARCHAR" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, uid, achievement_name, source, acquisition_time, enclosure_url, deleted_sign
+    id, uid, achievement_name, source, conversion_form, conversion_result, year, enclosure_url, 
+    deleted_sign
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -25,11 +28,13 @@
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.OrgTechAchievement" >
     insert into org_tech_achievement (id, uid, achievement_name, 
-      source, acquisition_time, enclosure_url, 
-      deleted_sign)
+      source, conversion_form, conversion_result, 
+      year, enclosure_url, deleted_sign
+      )
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{achievementName,jdbcType=VARCHAR}, 
-      #{source,jdbcType=INTEGER}, #{acquisitionTime,jdbcType=TIMESTAMP}, #{enclosureUrl,jdbcType=VARCHAR}, 
-      #{deletedSign,jdbcType=INTEGER})
+      #{source,jdbcType=VARCHAR}, #{conversionForm,jdbcType=INTEGER}, #{conversionResult,jdbcType=VARCHAR}, 
+      #{year,jdbcType=INTEGER}, #{enclosureUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgTechAchievement" >
     insert into org_tech_achievement
@@ -46,8 +51,14 @@
       <if test="source != null" >
         source,
       </if>
-      <if test="acquisitionTime != null" >
-        acquisition_time,
+      <if test="conversionForm != null" >
+        conversion_form,
+      </if>
+      <if test="conversionResult != null" >
+        conversion_result,
+      </if>
+      <if test="year != null" >
+        year,
       </if>
       <if test="enclosureUrl != null" >
         enclosure_url,
@@ -67,10 +78,16 @@
         #{achievementName,jdbcType=VARCHAR},
       </if>
       <if test="source != null" >
-        #{source,jdbcType=INTEGER},
+        #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="conversionForm != null" >
+        #{conversionForm,jdbcType=INTEGER},
+      </if>
+      <if test="conversionResult != null" >
+        #{conversionResult,jdbcType=VARCHAR},
       </if>
-      <if test="acquisitionTime != null" >
-        #{acquisitionTime,jdbcType=TIMESTAMP},
+      <if test="year != null" >
+        #{year,jdbcType=INTEGER},
       </if>
       <if test="enclosureUrl != null" >
         #{enclosureUrl,jdbcType=VARCHAR},
@@ -90,10 +107,16 @@
         achievement_name = #{achievementName,jdbcType=VARCHAR},
       </if>
       <if test="source != null" >
-        source = #{source,jdbcType=INTEGER},
+        source = #{source,jdbcType=VARCHAR},
       </if>
-      <if test="acquisitionTime != null" >
-        acquisition_time = #{acquisitionTime,jdbcType=TIMESTAMP},
+      <if test="conversionForm != null" >
+        conversion_form = #{conversionForm,jdbcType=INTEGER},
+      </if>
+      <if test="conversionResult != null" >
+        conversion_result = #{conversionResult,jdbcType=VARCHAR},
+      </if>
+      <if test="year != null" >
+        year = #{year,jdbcType=INTEGER},
       </if>
       <if test="enclosureUrl != null" >
         enclosure_url = #{enclosureUrl,jdbcType=VARCHAR},
@@ -108,14 +131,17 @@
     update org_tech_achievement
     set uid = #{uid,jdbcType=VARCHAR},
       achievement_name = #{achievementName,jdbcType=VARCHAR},
-      source = #{source,jdbcType=INTEGER},
-      acquisition_time = #{acquisitionTime,jdbcType=TIMESTAMP},
+      source = #{source,jdbcType=VARCHAR},
+      conversion_form = #{conversionForm,jdbcType=INTEGER},
+      conversion_result = #{conversionResult,jdbcType=VARCHAR},
+      year = #{year,jdbcType=INTEGER},
       enclosure_url = #{enclosureUrl,jdbcType=VARCHAR},
       deleted_sign = #{deletedSign,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-   <select id="findOrgTechAchievementListByPage" parameterType="java.lang.String" resultMap="BaseResultMap">
+  
+  <select id="findOrgTechAchievementListByPage" parameterType="java.lang.String" resultMap="BaseResultMap">
   	 select 
     <include refid="Base_Column_List" />
     from org_tech_achievement
@@ -123,7 +149,7 @@
     <if test="uid != null">
 	    and  uid = #{uid,jdbcType=VARCHAR}
 	</if>
-	order by acquisition_time desc
+	order by year desc
     <if test="page_sql != null">
     	${page_sql}
     </if>
@@ -146,5 +172,4 @@
 		#{item}
 	</foreach>
   </update>
-  
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrgTechProductMapper.xml

@@ -262,7 +262,7 @@
 	    </if>
     </select>
     
-   <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
+  <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
   	update org_tech_product set deleted_sign = 1
   	where  id in 
 	<foreach item="item" index="index" collection="list" open="(" separator="," close=")">

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrganizationTechMapper.xml

@@ -106,6 +106,6 @@
   	 select 
     <include refid="Base_Column_List" />
     from organization_tech
-    where uid = #{uid,jdbcType=VARCHAR}
+    where  uid = #{uid,jdbcType=VARCHAR}
   </select>
 </mapper>

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

@@ -30,6 +30,11 @@ public class OrgActivity {
     * 结束日期
     */
     private Date endDate;
+    
+    /**
+     * 参与人员
+     */
+    private String participant;
 
     /**
     * 技术领域1st select
@@ -92,6 +97,11 @@ public class OrgActivity {
     private String achievement;
     
     /**
+     * 立项证明材料URL
+     */
+    private String proofUrl;
+    
+    /**
      * 删除标记
      */
     private Integer deletedSign;
@@ -140,8 +150,16 @@ public class OrgActivity {
     public Date getEndDate() {
         return endDate;
     }
+    
+    public String getParticipant() {
+		return participant;
+	}
+
+	public void setParticipant(String participant) {
+		this.participant = participant;
+	}
 
-    public void setEndDate(Date endDate) {
+	public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
 
@@ -243,7 +261,15 @@ public class OrgActivity {
     
     
     
-    @JsonIgnore
+    public String getProofUrl() {
+		return proofUrl;
+	}
+
+	public void setProofUrl(String proofUrl) {
+		this.proofUrl = proofUrl;
+	}
+
+	@JsonIgnore
 	public Integer getDeletedSign() {
 		return deletedSign;
 	}

+ 31 - 0
src/main/java/com/goafanti/common/model/OrgHumanResource.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 public class OrgHumanResource {
     private String id;
 
@@ -144,6 +146,16 @@ public class OrgHumanResource {
      * 花名册URL
      */
     private String rosterUrl;
+    
+    /**
+     * 社保情况URL
+     */
+    private String socialSecurityUrl;
+    
+    /**
+     * 删除标记
+     */
+    private String deleteSign;
 
     public String getId() {
         return id;
@@ -386,6 +398,25 @@ public class OrgHumanResource {
 	public void setRosterUrl(String rosterUrl) {
 		this.rosterUrl = rosterUrl;
 	}
+
+	public String getSocialSecurityUrl() {
+		return socialSecurityUrl;
+	}
+
+	public void setSocialSecurityUrl(String socialSecurityUrl) {
+		this.socialSecurityUrl = socialSecurityUrl;
+	}
+    
+	@JsonIgnore
+	public String getDeleteSign() {
+		return deleteSign;
+	}
+
+	public void setDeleteSign(String deleteSign) {
+		this.deleteSign = deleteSign;
+	}
+	
     
+	
     
 }

+ 15 - 1
src/main/java/com/goafanti/common/model/OrgIntellectualProperty.java

@@ -56,6 +56,11 @@ public class OrgIntellectualProperty {
     private Integer evaluationCategory;
     
     /**
+     * 知识产权URL
+     */
+    private String propertyUrl;
+    
+    /**
      * 删除标记
      */
     private Integer deletedSign;
@@ -142,7 +147,16 @@ public class OrgIntellectualProperty {
         this.authorizationDate = authorizationDate;
     }
     
-    @JsonIgnore
+    
+    public String getPropertyUrl() {
+		return propertyUrl;
+	}
+
+	public void setPropertyUrl(String propertyUrl) {
+		this.propertyUrl = propertyUrl;
+	}
+
+	@JsonIgnore
     public Integer getEvaluationCategory() {
         return evaluationCategory;
     }

+ 38 - 28
src/main/java/com/goafanti/common/model/OrgTechAchievement.java

@@ -1,9 +1,5 @@
 package com.goafanti.common.model;
 
-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.fasterxml.jackson.annotation.JsonIgnore;
@@ -21,15 +17,25 @@ public class OrgTechAchievement {
     /**
     * 来源
     */
-    private Integer source;
+    private String source;
+
+    /**
+    * 转化方式
+    */
+    private Integer conversionForm;
 
     /**
-    * 获得时间
+    * 转化结果
     */
-    private Date acquisitionTime;
+    private String conversionResult;
 
     /**
-    * 附件材料URL
+    * 转化年份
+    */
+    private Integer year;
+
+    /**
+    * 证明材料附件URL
     */
     private String enclosureUrl;
 
@@ -61,22 +67,38 @@ public class OrgTechAchievement {
     public void setAchievementName(String achievementName) {
         this.achievementName = achievementName;
     }
-    
-    @JsonFormat(shape = Shape.STRING)
-    public Integer getSource() {
+
+    public String getSource() {
         return source;
     }
 
-    public void setSource(Integer source) {
+    public void setSource(String source) {
         this.source = source;
     }
+    
+    @JsonFormat(shape = Shape.STRING)
+    public Integer getConversionForm() {
+        return conversionForm;
+    }
+
+    public void setConversionForm(Integer conversionForm) {
+        this.conversionForm = conversionForm;
+    }
 
-    public Date getAcquisitionTime() {
-        return acquisitionTime;
+    public String getConversionResult() {
+        return conversionResult;
     }
 
-    public void setAcquisitionTime(Date acquisitionTime) {
-        this.acquisitionTime = acquisitionTime;
+    public void setConversionResult(String conversionResult) {
+        this.conversionResult = conversionResult;
+    }
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
     }
 
     public String getEnclosureUrl() {
@@ -95,16 +117,4 @@ public class OrgTechAchievement {
     public void setDeletedSign(Integer deletedSign) {
         this.deletedSign = deletedSign;
     }
-    
-    public String getAcquisitionTimeFormattedDate(){
-		if (this.acquisitionTime == null) {
-			return null;
-		} else {
-			return DateFormatUtils.format(this.getAcquisitionTime(), "yyyy-MM-dd");
-		}
-	}
-	
-	public void setAcquisitionTimeFormattedDate(String acquisitionTimeFormattedDate){
-		
-	}
 }

+ 1 - 4
src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java

@@ -620,11 +620,8 @@ public class CognizanceApiController extends BaseApiController {
 	 * @throws ParseException 
 	 */
 	@RequestMapping(value = "/disposeAchievement", method = RequestMethod.POST)
-	public Result disposeAchievement(OrgTechAchievement achievement, String acquisitionTimeFormattedDate) throws ParseException {
+	public Result disposeAchievement(OrgTechAchievement achievement) throws ParseException {
 		Result res = new Result();
-		if (!StringUtils.isBlank(acquisitionTimeFormattedDate)){
-			achievement.setAcquisitionTime(DateUtils.parseDate(acquisitionTimeFormattedDate, "yyyy-MM-dd"));
-		}
 		if (null == achievement.getId()) {
 			achievement.setId(UUID.randomUUID().toString());
 			achievement.setUid(TokenManager.getUserId());

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

@@ -2,6 +2,7 @@ package com.goafanti.user.controller;
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -13,6 +14,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.goafanti.common.bo.Result;
@@ -642,6 +644,20 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
+	
+	/**
+	 * 删除团体人力资源
+	 * @return
+	 */
+	public Result deleteHumanResource(@RequestParam(name = "ids[]", required = true) String[] ids){
+		Result res = new Result();
+		List<String> id = new ArrayList<String>();
+		for (String s : ids) {
+			id.add(s);
+		}
+		orgHumanResourceService.batchDeleteByPrimaryKey(id);
+		return res;
+	}
 
 	/**
 	 * 首页

+ 4 - 0
src/main/java/com/goafanti/user/service/OrgHumanResourceService.java

@@ -1,5 +1,7 @@
 package com.goafanti.user.service;
 
+import java.util.List;
+
 import com.goafanti.common.model.OrgHumanResource;
 import com.goafanti.core.mybatis.page.Pagination;
 
@@ -11,4 +13,6 @@ public interface OrgHumanResourceService {
 
 	int updateByPrimaryKeySelective(OrgHumanResource orgHumanResource);
 
+	int batchDeleteByPrimaryKey(List<String> id);
+
 }

+ 6 - 0
src/main/java/com/goafanti/user/service/impl/OrgHumanResourceServiceImpl.java

@@ -1,6 +1,7 @@
 package com.goafanti.user.service.impl;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
@@ -52,4 +53,9 @@ public class OrgHumanResourceServiceImpl extends BaseMybatisDao<OrgHumanResource
 		return orgHumanResourceMapper.updateByPrimaryKeySelective(orgHumanResource);
 	}
 
+	@Override
+	public int batchDeleteByPrimaryKey(List<String> id) {
+		return orgHumanResourceMapper.batchDeleteByPrimaryKey(id);
+	}
+
 }