Browse Source

信息删除默认保存

anderx 7 years ago
parent
commit
b8ffd34074

+ 1 - 1
GeneratorConfig.xml

@@ -10,6 +10,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="AFT" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="AFT" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
-    <table schema="aft" tableName="contract_task_log"/> 
+    <table schema="aft" tableName="organization_identity"/> 
   </context>
 </generatorConfiguration>

+ 11 - 11
src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java

@@ -14,69 +14,69 @@ import org.apache.ibatis.annotations.Param;
 public interface OrganizationIdentityMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	long countByExample(OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	int deleteByExample(OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	int insert(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	int insertSelective(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	List<OrganizationIdentity> selectByExample(OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	OrganizationIdentity selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") OrganizationIdentity record,
 			@Param("example") OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	int updateByExample(@Param("record") OrganizationIdentity record,
 			@Param("example") OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	int updateByPrimaryKeySelective(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	int updateByPrimaryKey(OrganizationIdentity record);
 

+ 89 - 24
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -70,12 +70,17 @@
     <result column="international" jdbcType="INTEGER" property="international" />
     <result column="review_instructions" jdbcType="VARCHAR" property="reviewInstructions" />
     <result column="investment" jdbcType="INTEGER" property="investment" />
+    <result column="year_sales_amount" jdbcType="DECIMAL" property="yearSalesAmount" />
+    <result column="last_year_research_amount" jdbcType="DECIMAL" property="lastYearResearchAmount" />
+    <result column="assets" jdbcType="DECIMAL" property="assets" />
+    <result column="qualification" jdbcType="VARCHAR" property="qualification" />
+    <result column="cooperation_situation" jdbcType="VARCHAR" property="cooperationSituation" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -109,7 +114,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -143,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     id, uid, contacts, contact_mobile, fixed_tel, qq, postal_address, postcode, unit_name, 
     registered_capital, licence_number, licence_province, licence_city, licence_area, 
@@ -155,13 +160,14 @@
     legal_person_fax, legal_person_email, registration_time, ratepay_code, industry, 
     enterprise_scale, register_type, foreign_investment, field, tax_authority, ratepay_method, 
     high_tech_zone, risk_investment, business_scope, high_tech_name, patent_prory_statement_url, 
-    international, review_instructions, investment
+    international, review_instructions, investment, year_sales_amount, last_year_research_amount, 
+    assets, qualification, cooperation_situation
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationIdentityExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     select
     <if test="distinct">
@@ -180,7 +186,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -191,7 +197,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     delete from organization_identity
     where id = #{id,jdbcType=VARCHAR}
@@ -200,7 +206,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     delete from organization_identity
     <if test="_parameter != null">
@@ -211,7 +217,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     insert into organization_identity (id, uid, contacts, 
       contact_mobile, fixed_tel, qq, 
@@ -234,7 +240,9 @@
       tax_authority, ratepay_method, high_tech_zone, 
       risk_investment, business_scope, high_tech_name, 
       patent_prory_statement_url, international, 
-      review_instructions, investment)
+      review_instructions, investment, year_sales_amount, 
+      last_year_research_amount, assets, qualification, 
+      cooperation_situation)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
       #{contactMobile,jdbcType=VARCHAR}, #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
       #{postalAddress,jdbcType=VARCHAR}, #{postcode,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, 
@@ -256,13 +264,15 @@
       #{taxAuthority,jdbcType=INTEGER}, #{ratepayMethod,jdbcType=INTEGER}, #{highTechZone,jdbcType=INTEGER}, 
       #{riskInvestment,jdbcType=INTEGER}, #{businessScope,jdbcType=VARCHAR}, #{highTechName,jdbcType=VARCHAR}, 
       #{patentProryStatementUrl,jdbcType=VARCHAR}, #{international,jdbcType=INTEGER}, 
-      #{reviewInstructions,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER})
+      #{reviewInstructions,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER}, #{yearSalesAmount,jdbcType=DECIMAL}, 
+      #{lastYearResearchAmount,jdbcType=DECIMAL}, #{assets,jdbcType=DECIMAL}, #{qualification,jdbcType=VARCHAR}, 
+      #{cooperationSituation,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationIdentity">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     insert into organization_identity
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -455,6 +465,21 @@
       <if test="investment != null">
         investment,
       </if>
+      <if test="yearSalesAmount != null">
+        year_sales_amount,
+      </if>
+      <if test="lastYearResearchAmount != null">
+        last_year_research_amount,
+      </if>
+      <if test="assets != null">
+        assets,
+      </if>
+      <if test="qualification != null">
+        qualification,
+      </if>
+      <if test="cooperationSituation != null">
+        cooperation_situation,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -646,13 +671,28 @@
       <if test="investment != null">
         #{investment,jdbcType=INTEGER},
       </if>
+      <if test="yearSalesAmount != null">
+        #{yearSalesAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="lastYearResearchAmount != null">
+        #{lastYearResearchAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="assets != null">
+        #{assets,jdbcType=DECIMAL},
+      </if>
+      <if test="qualification != null">
+        #{qualification,jdbcType=VARCHAR},
+      </if>
+      <if test="cooperationSituation != null">
+        #{cooperationSituation,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.OrganizationIdentityExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     select count(*) from organization_identity
     <if test="_parameter != null">
@@ -663,7 +703,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     update organization_identity
     <set>
@@ -856,6 +896,21 @@
       <if test="record.investment != null">
         investment = #{record.investment,jdbcType=INTEGER},
       </if>
+      <if test="record.yearSalesAmount != null">
+        year_sales_amount = #{record.yearSalesAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.lastYearResearchAmount != null">
+        last_year_research_amount = #{record.lastYearResearchAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.assets != null">
+        assets = #{record.assets,jdbcType=DECIMAL},
+      </if>
+      <if test="record.qualification != null">
+        qualification = #{record.qualification,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cooperationSituation != null">
+        cooperation_situation = #{record.cooperationSituation,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -865,7 +920,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     update organization_identity
     set id = #{record.id,jdbcType=VARCHAR},
@@ -930,7 +985,12 @@
       patent_prory_statement_url = #{record.patentProryStatementUrl,jdbcType=VARCHAR},
       international = #{record.international,jdbcType=INTEGER},
       review_instructions = #{record.reviewInstructions,jdbcType=VARCHAR},
-      investment = #{record.investment,jdbcType=INTEGER}
+      investment = #{record.investment,jdbcType=INTEGER},
+      year_sales_amount = #{record.yearSalesAmount,jdbcType=DECIMAL},
+      last_year_research_amount = #{record.lastYearResearchAmount,jdbcType=DECIMAL},
+      assets = #{record.assets,jdbcType=DECIMAL},
+      qualification = #{record.qualification,jdbcType=VARCHAR},
+      cooperation_situation = #{record.cooperationSituation,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -939,7 +999,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     update organization_identity
     <set>
@@ -1129,7 +1189,7 @@
       <if test="investment != null">
         investment = #{investment,jdbcType=INTEGER},
       </if>
-      <if test=" yearSalesAmount!= null">
+      <if test="yearSalesAmount != null">
         year_sales_amount = #{yearSalesAmount,jdbcType=DECIMAL},
       </if>
       <if test="lastYearResearchAmount != null">
@@ -1138,11 +1198,11 @@
       <if test="assets != null">
         assets = #{assets,jdbcType=DECIMAL},
       </if>
-      <if test=" qualification!= null">
+      <if test="qualification != null">
         qualification = #{qualification,jdbcType=VARCHAR},
       </if>
-      <if test=" cooperationSituation!= null">
-        cooperation_situation= #{cooperationSituation,jdbcType=VARCHAR},
+      <if test="cooperationSituation != null">
+        cooperation_situation = #{cooperationSituation,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
@@ -1151,7 +1211,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Jun 06 10:26:09 CST 2018.
     -->
     update organization_identity
     set uid = #{uid,jdbcType=VARCHAR},
@@ -1215,7 +1275,12 @@
       patent_prory_statement_url = #{patentProryStatementUrl,jdbcType=VARCHAR},
       international = #{international,jdbcType=INTEGER},
       review_instructions = #{reviewInstructions,jdbcType=VARCHAR},
-      investment = #{investment,jdbcType=INTEGER}
+      investment = #{investment,jdbcType=INTEGER},
+      year_sales_amount = #{yearSalesAmount,jdbcType=DECIMAL},
+      last_year_research_amount = #{lastYearResearchAmount,jdbcType=DECIMAL},
+      assets = #{assets,jdbcType=DECIMAL},
+      qualification = #{qualification,jdbcType=VARCHAR},
+      cooperation_situation = #{cooperationSituation,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 	<select id="selectOrgIdentityByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">

File diff suppressed because it is too large
+ 257 - 237
src/main/java/com/goafanti/common/model/OrganizationIdentity.java


+ 336 - 16
src/main/java/com/goafanti/common/model/OrganizationIdentityExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class OrganizationIdentityExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public OrganizationIdentityExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -4303,11 +4303,331 @@ public class OrganizationIdentityExample {
 			addCriterion("investment not between", value1, value2, "investment");
 			return (Criteria) this;
 		}
+
+		public Criteria andYearSalesAmountIsNull() {
+			addCriterion("year_sales_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountIsNotNull() {
+			addCriterion("year_sales_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountEqualTo(BigDecimal value) {
+			addCriterion("year_sales_amount =", value, "yearSalesAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountNotEqualTo(BigDecimal value) {
+			addCriterion("year_sales_amount <>", value, "yearSalesAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountGreaterThan(BigDecimal value) {
+			addCriterion("year_sales_amount >", value, "yearSalesAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("year_sales_amount >=", value, "yearSalesAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountLessThan(BigDecimal value) {
+			addCriterion("year_sales_amount <", value, "yearSalesAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("year_sales_amount <=", value, "yearSalesAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountIn(List<BigDecimal> values) {
+			addCriterion("year_sales_amount in", values, "yearSalesAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountNotIn(List<BigDecimal> values) {
+			addCriterion("year_sales_amount not in", values, "yearSalesAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("year_sales_amount between", value1, value2, "yearSalesAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearSalesAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("year_sales_amount not between", value1, value2, "yearSalesAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountIsNull() {
+			addCriterion("last_year_research_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountIsNotNull() {
+			addCriterion("last_year_research_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountEqualTo(BigDecimal value) {
+			addCriterion("last_year_research_amount =", value, "lastYearResearchAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountNotEqualTo(BigDecimal value) {
+			addCriterion("last_year_research_amount <>", value, "lastYearResearchAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountGreaterThan(BigDecimal value) {
+			addCriterion("last_year_research_amount >", value, "lastYearResearchAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("last_year_research_amount >=", value, "lastYearResearchAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountLessThan(BigDecimal value) {
+			addCriterion("last_year_research_amount <", value, "lastYearResearchAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("last_year_research_amount <=", value, "lastYearResearchAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountIn(List<BigDecimal> values) {
+			addCriterion("last_year_research_amount in", values, "lastYearResearchAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountNotIn(List<BigDecimal> values) {
+			addCriterion("last_year_research_amount not in", values, "lastYearResearchAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("last_year_research_amount between", value1, value2, "lastYearResearchAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andLastYearResearchAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("last_year_research_amount not between", value1, value2, "lastYearResearchAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsIsNull() {
+			addCriterion("assets is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsIsNotNull() {
+			addCriterion("assets is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsEqualTo(BigDecimal value) {
+			addCriterion("assets =", value, "assets");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsNotEqualTo(BigDecimal value) {
+			addCriterion("assets <>", value, "assets");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsGreaterThan(BigDecimal value) {
+			addCriterion("assets >", value, "assets");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("assets >=", value, "assets");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsLessThan(BigDecimal value) {
+			addCriterion("assets <", value, "assets");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("assets <=", value, "assets");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsIn(List<BigDecimal> values) {
+			addCriterion("assets in", values, "assets");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsNotIn(List<BigDecimal> values) {
+			addCriterion("assets not in", values, "assets");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("assets between", value1, value2, "assets");
+			return (Criteria) this;
+		}
+
+		public Criteria andAssetsNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("assets not between", value1, value2, "assets");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationIsNull() {
+			addCriterion("qualification is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationIsNotNull() {
+			addCriterion("qualification is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationEqualTo(String value) {
+			addCriterion("qualification =", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationNotEqualTo(String value) {
+			addCriterion("qualification <>", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationGreaterThan(String value) {
+			addCriterion("qualification >", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationGreaterThanOrEqualTo(String value) {
+			addCriterion("qualification >=", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationLessThan(String value) {
+			addCriterion("qualification <", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationLessThanOrEqualTo(String value) {
+			addCriterion("qualification <=", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationLike(String value) {
+			addCriterion("qualification like", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationNotLike(String value) {
+			addCriterion("qualification not like", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationIn(List<String> values) {
+			addCriterion("qualification in", values, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationNotIn(List<String> values) {
+			addCriterion("qualification not in", values, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationBetween(String value1, String value2) {
+			addCriterion("qualification between", value1, value2, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationNotBetween(String value1, String value2) {
+			addCriterion("qualification not between", value1, value2, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationIsNull() {
+			addCriterion("cooperation_situation is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationIsNotNull() {
+			addCriterion("cooperation_situation is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationEqualTo(String value) {
+			addCriterion("cooperation_situation =", value, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationNotEqualTo(String value) {
+			addCriterion("cooperation_situation <>", value, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationGreaterThan(String value) {
+			addCriterion("cooperation_situation >", value, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationGreaterThanOrEqualTo(String value) {
+			addCriterion("cooperation_situation >=", value, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationLessThan(String value) {
+			addCriterion("cooperation_situation <", value, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationLessThanOrEqualTo(String value) {
+			addCriterion("cooperation_situation <=", value, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationLike(String value) {
+			addCriterion("cooperation_situation like", value, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationNotLike(String value) {
+			addCriterion("cooperation_situation not like", value, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationIn(List<String> values) {
+			addCriterion("cooperation_situation in", values, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationNotIn(List<String> values) {
+			addCriterion("cooperation_situation not in", values, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationBetween(String value1, String value2) {
+			addCriterion("cooperation_situation between", value1, value2, "cooperationSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andCooperationSituationNotBetween(String value1, String value2) {
+			addCriterion("cooperation_situation not between", value1, value2, "cooperationSituation");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table organization_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 1 - 1
src/main/java/com/goafanti/common/utils/BeanUtilsExt.java

@@ -20,6 +20,6 @@ public class BeanUtilsExt extends BeanUtils {
     public static void copyProperties(Object target, Object source) throws InvocationTargetException,
             IllegalAccessException {
         org.apache.commons.beanutils.BeanUtils.copyProperties(target, source);
-
+        
     }
 }

+ 6 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.goafanti.customer.service.impl;
 
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -291,6 +292,11 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		User user = new User();
 		try {
 			BeanUtilsExt.copyProperties(oi, bo);
+			if(null==oi.getYearSalesAmount())oi.setYearSalesAmount(new BigDecimal(0));
+			if(null==oi.getLastYearResearchAmount())oi.setLastYearResearchAmount(new BigDecimal(0));
+			if(null==oi.getAssets())oi.setAssets(new BigDecimal(0));
+			if(null==oi.getRegisteredCapital())oi.setRegisteredCapital(new BigDecimal(0));
+			if(null==oi.getEnterpriseScale())oi.setEnterpriseScale(0);
 			user.setId(bo.getUid());
 			user.setSocietyTag(bo.getSocietyTag());
 			user.setCompanyLogoUrl(bo.getCompanyLogoUrl());

+ 1 - 1
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -19,7 +19,7 @@ import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.service.OrderService;
 
 @RestController
-@RequestMapping(value = "/open/api/admin/order")
+@RequestMapping(value = "/api/admin/order")
 public class AdminOrderApiController extends CertifyApiController {
 	@Resource
 	private OrderService orderServiceImpl;