Browse Source

Accept Merge Request #218 回滚 : (master -> prod)

Merge Request: 回滚
Created By: @albertshaw
Accepted By: @albertshaw
URL: https://coding.net/t/aft/p/AFT/git/merge/218
albertshaw 8 years ago
parent
commit
8ca236e9d9

+ 15 - 8
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -103,9 +103,9 @@
 			jdbcType="VARCHAR" />
 		<result column="high_tech_name" property="highTechName"
 			jdbcType="VARCHAR" />
-
 		<result column="patent_prory_statement_url" property="patentProryStatementUrl"
 			jdbcType="VARCHAR" />
+		 <result column="international_flag" jdbcType="INTEGER" property="internationalFlag" />
 	</resultMap>
 	<sql id="Base_Column_List">
 		id, uid, contacts, contact_mobile, fixed_tel, qq,
@@ -138,7 +138,7 @@
 		tax_authority,
 		ratepay_method,
 		high_tech_zone, risk_investment, business_scope,
-		high_tech_name, patent_prory_statement_url
+		high_tech_name, patent_prory_statement_url, international_flag
 	</sql>
 	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
 		parameterType="java.lang.String">
@@ -184,7 +184,7 @@
 		register_type, foreign_investment, field,
 		tax_authority, ratepay_method, high_tech_zone,
 		risk_investment,
-		business_scope, high_tech_name, patent_prory_statement_url
+		business_scope, high_tech_name, patent_prory_statement_url,international_flag
 		)
 		values (#{id,jdbcType=VARCHAR},
 		#{uid,jdbcType=VARCHAR},
@@ -235,7 +235,7 @@
 		#{highTechZone,jdbcType=INTEGER},
 		#{riskInvestment,jdbcType=INTEGER},
 		#{businessScope,jdbcType=VARCHAR}, #{highTechName,jdbcType=VARCHAR},
-		#{patentProryStatementUrl,jdbcType=VARCHAR}
+		#{patentProryStatementUrl,jdbcType=VARCHAR},#{internationalFlag,jdbcType=INTEGER}
 		)
 	</insert>
 	<insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationIdentity">
@@ -439,10 +439,12 @@
 			<if test="highTechName != null">
 				high_tech_name,
 			</if>
-			
 			<if test="patentProryStatementUrl != null">
 				patent_prory_statement_url,
 			</if>
+			<if test="internationalFlag != null">
+      			international_flag,
+     		 </if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="id != null">
@@ -643,10 +645,12 @@
 			<if test="highTechName != null">
 				#{highTechName,jdbcType=VARCHAR},
 			</if>
-			
 			<if test="patentProryStatementUrl != null">
 				#{patentProryStatementUrl,jdbcType=VARCHAR},
 			</if>
+			<if test="internationalFlag != null">
+      			#{internationalFlag,jdbcType=INTEGER},
+      		</if>
 		</trim>
 	</insert>
 	<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationIdentity">
@@ -856,10 +860,12 @@
 			<if test="highTechName != null">
 				high_tech_name = #{highTechName,jdbcType=VARCHAR},
 			</if>
-			
 			<if test="patentProryStatementUrl != null">
 				patent_prory_statement_url = #{patentProryStatementUrl,jdbcType=VARCHAR},
 			</if>
+			<if test="internationalFlag != null">
+      			international_flag = #{internationalFlag,jdbcType=INTEGER},
+      		</if>
 		</set>
 		where id = #{id,jdbcType=VARCHAR}
 	</update>
@@ -931,7 +937,8 @@
 		risk_investment = #{riskInvestment,jdbcType=INTEGER},
 		business_scope = #{businessScope,jdbcType=VARCHAR},
 		high_tech_name = #{highTechName,jdbcType=VARCHAR},
-		patent_prory_statement_url = #{patentProryStatementUrl,jdbcType=VARCHAR}
+		patent_prory_statement_url = #{patentProryStatementUrl,jdbcType=VARCHAR},
+		international_flag = #{internationalFlag,jdbcType=INTEGER}
 		where id = #{id,jdbcType=VARCHAR}
 	</update>
 

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

@@ -14,11 +14,12 @@
     <result column="home_unit" property="homeUnit" jdbcType="VARCHAR" />
     <result column="logo_url" property="logoUrl" jdbcType="VARCHAR" />
     <result column="publicity_picture_url" property="publicityPictureUrl" jdbcType="VARCHAR" />
+    <result column="country_name_zh" jdbcType="VARCHAR" property="countryNameZh" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, identity_type, company_name, location_province, location_city,location_area,
     unit_size, company_introduction, 
-    home_unit,  logo_url, publicity_picture_url
+    home_unit,  logo_url, publicity_picture_url,country_name_zh
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -35,13 +36,13 @@
       company_name, location_province, location_city,location_area,
       unit_size, 
       company_introduction, home_unit,  
-      logo_url, publicity_picture_url)
+      logo_url, publicity_picture_url,country_name_zh)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{identityType,jdbcType=VARCHAR}, 
       #{companyName,jdbcType=VARCHAR},
       #{locationProvince,jdbcType=INTEGER}, #{locationCity,jdbcType=INTEGER}, #{locationArea,jdbcType=INTEGER}, 
       #{unitSize,jdbcType=VARCHAR}, 
       #{companyIntroduction,jdbcType=VARCHAR}, #{homeUnit,jdbcType=VARCHAR},  
-      #{logoUrl,jdbcType=VARCHAR}, #{publicityPictureUrl,jdbcType=VARCHAR})
+      #{logoUrl,jdbcType=VARCHAR}, #{publicityPictureUrl,jdbcType=VARCHAR}, #{countryNameZh,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
     insert into organization_info
@@ -82,6 +83,9 @@
       <if test="publicityPictureUrl != null" >
        publicity_picture_url,
       </if>
+      <if test="countryNameZh != null">
+      	country_name_zh,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -120,6 +124,9 @@
       <if test="publicityPictureUrl != null" >
         #{publicityPictureUrl,jdbcType=VARCHAR},
       </if>
+      <if test="countryNameZh != null">
+      	#{countryNameZh,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
@@ -158,6 +165,9 @@
       <if test="publicityPictureUrl != null" >
        publicity_picture_url = #{publicityPictureUrl,jdbcType=VARCHAR},
       </if>
+      <if test="countryNameZh != null">
+      	country_name_zh = #{countryNameZh,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -173,7 +183,8 @@
       company_introduction = #{companyIntroduction,jdbcType=VARCHAR},
       home_unit = #{homeUnit,jdbcType=VARCHAR},
       logo_url = #{logoUrl,jdbcType=VARCHAR},
-      publicity_picture_url = #{publicityPictureUrl,jdbcType=VARCHAR}
+      publicity_picture_url = #{publicityPictureUrl,jdbcType=VARCHAR},
+      country_name_zh = #{countryNameZh,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   

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

@@ -26,12 +26,13 @@
     <result column="payment_date" property="paymentDate" jdbcType="TIMESTAMP" />
     <result column="expert" property="expert" jdbcType="INTEGER" />
     <result column="celebrity" property="celebrity" jdbcType="INTEGER" />
+    <result column="international_flag" jdbcType="INTEGER" property="internationalFlag" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, username, sex, date_of_birth_year, date_of_birth_month, id_number, positive_id_url, 
     opposite_id_url, aft_username, province, city, area, contact_mobile, bank_name, bank_account, 
     bank_card_number, amount_money, audit_status, process , wrong_count, payment_date,
-    expert, celebrity
+    expert, celebrity, international_flag
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -51,7 +52,7 @@
       area, contact_mobile, bank_name, 
       bank_account, bank_card_number, amount_money, 
       audit_status, process, wrong_count, payment_date,
-      expert, celebrity)
+      expert, celebrity,international_flag)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 
       #{sex,jdbcType=VARCHAR}, #{dateOfBirthYear,jdbcType=VARCHAR}, #{dateOfBirthMonth,jdbcType=VARCHAR}, 
       #{idNumber,jdbcType=VARCHAR}, #{positiveIdUrl,jdbcType=VARCHAR}, #{oppositeIdUrl,jdbcType=VARCHAR}, 
@@ -59,7 +60,7 @@
       #{area,jdbcType=INTEGER}, #{contactMobile,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, 
       #{bankAccount,jdbcType=VARCHAR}, #{bankCardNumber,jdbcType=VARCHAR}, #{amountMoney,jdbcType=DECIMAL}, 
       #{auditStatus,jdbcType=INTEGER}, #{process,jdbcType=INTEGER}, #{wrongCount,jdbcType=INTEGER}, #{paymentDate,jdbcType=TIMESTAMP},
-      #{expert,jdbcType=INTEGER}, #{celebrity,jdbcType=INTEGER})
+      #{expert,jdbcType=INTEGER}, #{celebrity,jdbcType=INTEGER},#{internationalFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.UserIdentity" >
     insert into user_identity
@@ -136,6 +137,9 @@
       <if test="celebrity != null" >
         celebrity,
       </if>
+      <if test="internationalFlag != null">
+      	international_flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -210,6 +214,9 @@
        <if test="celebrity != null" >
         #{celebrity,jdbcType=INTEGER},
       </if>
+      <if test="internationalFlag != null">
+      	#{internationalFlag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserIdentity" >
@@ -284,6 +291,9 @@
        <if test="celebrity != null" >
         celebrity = #{celebrity,jdbcType=INTEGER},
       </if>
+      <if test="internationalFlag != null">
+      	international_flag = #{internationalFlag,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -311,7 +321,8 @@
       wrong_count = #{wrongCount,jdbcType=INTEGER},
       payment_date = #{paymentDate,jdbcType=TIMESTAMP},
       expert = #{expert,jdbcType=INTEGER},
-      celebrity = #{celebrity,jdbcType=INTEGER}
+      celebrity = #{celebrity,jdbcType=INTEGER},
+      international_flag = #{internationalFlag,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   

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

@@ -269,6 +269,16 @@ public class Achievement {
      * 技术经纪人ID
      */
     private String techBrokerId;
+    
+    /**
+     * 国际中文名
+     */
+    private String 	countryNameZh;
+
+    /**
+     *  是否国际化  0 - 否    1 - 是
+     */
+    private String internationalFlag;
 
 	public String getId() {
 		return id;
@@ -707,6 +717,22 @@ public class Achievement {
 		this.techBrokerId = techBrokerId;
 	}
 
+	public String getCountryNameZh() {
+		return countryNameZh;
+	}
+
+	public void setCountryNameZh(String countryNameZh) {
+		this.countryNameZh = countryNameZh;
+	}
+
+	public String getInternationalFlag() {
+		return internationalFlag;
+	}
+
+	public void setInternationalFlag(String internationalFlag) {
+		this.internationalFlag = internationalFlag;
+	}
+
 	public String getReleaseDateFormattedDate() {
 		if (this.releaseDate == null) {
 			return null;

+ 13 - 0
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -341,6 +341,11 @@ public class OrganizationIdentity {
 	 */
 	private String		patentProryStatementUrl;
 
+	/**
+     *  是否国际化  0 - 否    1 - 是
+     */
+    private String internationalFlag;
+    
 	public String getId() {
 		return id;
 	}
@@ -883,6 +888,14 @@ public class OrganizationIdentity {
 		this.patentProryStatementUrl = patentProryStatementUrl;
 	}
 
+	public String getInternationalFlag() {
+		return internationalFlag;
+	}
+
+	public void setInternationalFlag(String internationalFlag) {
+		this.internationalFlag = internationalFlag;
+	}
+
 	// 打款日期
 	public String getPaymentDateFormattedDate() {
 		if (this.paymentDate == null) {

+ 12 - 0
src/main/java/com/goafanti/common/model/OrganizationInfo.java

@@ -56,6 +56,11 @@ public class OrganizationInfo {
 	 */
 	private String	publicityPictureUrl;
 
+	/**
+     * 国际中文名
+     */
+    private String 	countryNameZh;
+    
 	public String getId() {
 		return id;
 	}
@@ -152,4 +157,11 @@ public class OrganizationInfo {
 		this.publicityPictureUrl = publicityPictureUrl;
 	}
 
+	public String getCountryNameZh() {
+		return countryNameZh;
+	}
+
+	public void setCountryNameZh(String countryNameZh) {
+		this.countryNameZh = countryNameZh;
+	}
 }

+ 13 - 0
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -124,6 +124,11 @@ public class UserIdentity {
      */
     private Integer celebrity;
 
+    /**
+     *  是否国际化  0 - 否    1 - 是
+     */
+    private String internationalFlag;
+    
     public String getId() {
         return id;
     }
@@ -318,6 +323,14 @@ public class UserIdentity {
 		this.celebrity = celebrity;
 	}
 
+	public String getInternationalFlag() {
+		return internationalFlag;
+	}
+
+	public void setInternationalFlag(String internationalFlag) {
+		this.internationalFlag = internationalFlag;
+	}
+
 	//打款日期
 	public String getPaymentDateFormattedDate(){
 		if (this.paymentDate == null) {