Bladeren bron

客户模块开发

anderx 5 jaren geleden
bovenliggende
commit
67aeca10c1

+ 1 - 1
GeneratorConfig.xml

@@ -43,7 +43,7 @@
     <property name="enableSubPackages" value="false"/>
      <property name="nullCatalogMeansCurrent" value="true"/>
     </javaClientGenerator>
-    <table schema="aft" tableName="t_task_mid"   enableCountByExample="false"
+    <table schema="aft" tableName="organization_identity"   enableCountByExample="false"
                enableUpdateByExample="false"
                enableDeleteByExample="false"
                enableSelectByExample="false"

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

@@ -14,69 +14,43 @@ 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  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  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  Wed Jun 06 10:26:09 CST 2018
+	 * @mbg.generated  Mon Jan 04 17:27:08 CST 2021
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
+	 * @mbg.generated  Mon Jan 04 17:27:08 CST 2021
 	 */
 	int insert(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
+	 * @mbg.generated  Mon Jan 04 17:27:08 CST 2021
 	 */
 	int insertSelective(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @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  Wed Jun 06 10:26:09 CST 2018
+	 * @mbg.generated  Mon Jan 04 17:27:08 CST 2021
 	 */
 	OrganizationIdentity selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
+	 * @mbg.generated  Mon Jan 04 17:27:08 CST 2021
 	 */
-	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  Wed Jun 06 10:26:09 CST 2018
-	 */
-	int updateByExample(@Param("record") OrganizationIdentity record,
-			@Param("example") OrganizationIdentityExample example);
+	int updateByPrimaryKeySelective(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
+	 * @mbg.generated  Mon Jan 04 17:27:08 CST 2021
 	 */
-	int updateByPrimaryKeySelective(OrganizationIdentity record);
+	int updateByPrimaryKeyWithBLOBs(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
+	 * @mbg.generated  Mon Jan 04 17:27:08 CST 2021
 	 */
 	int updateByPrimaryKey(OrganizationIdentity record);
 

+ 133 - 420
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 Wed Jun 06 10:26:09 CST 2018.
+      This element was generated on Mon Jan 04 17:27:08 CST 2021.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -75,121 +75,53 @@
     <result column="assets" jdbcType="DECIMAL" property="assets" />
     <result column="qualification" jdbcType="VARCHAR" property="qualification" />
     <result column="cooperation_situation" jdbcType="VARCHAR" property="cooperationSituation" />
+    <result column="sales_target" jdbcType="VARCHAR" property="salesTarget" />
   </resultMap>
-  <sql id="Example_Where_Clause">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.OrganizationIdentity">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 06 10:26:09 CST 2018.
+      This element was generated on Mon Jan 04 17:27:08 CST 2021.
     -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 06 10:26:09 CST 2018.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
+    <result column="honor_picture" jdbcType="LONGVARCHAR" property="honorPicture" />
+  </resultMap>
   <sql id="Base_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 06 10:26:09 CST 2018.
+      This element was generated on Mon Jan 04 17:27:08 CST 2021.
     -->
-    id, uid, contacts, contact_mobile, fixed_tel, qq, postal_address, postcode, unit_name, 
+    id, `uid`, contacts, contact_mobile, fixed_tel, qq, postal_address, postcode, unit_name, 
     registered_capital, licence_number, licence_province, licence_city, licence_area, 
     licence_scanning_url, org_code, org_code_url, bank_account, banks, bank_branch, bank_card_number, 
     validation_amount, identity_type, location_province, location_city, location_area, 
-    legal_person, legal_person_id_card, last_year_tax_report_url, audit_status, process, 
+    legal_person, legal_person_id_card, last_year_tax_report_url, audit_status, `process`, 
     wrong_count, payment_date, listed, listed_date, listed_type, stock_code, certificate_number, 
     issuing_date, cog_contacts, tech_principal, contacts_fixed_tel, contacts_fax, legal_person_tel, 
     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, year_sales_amount, last_year_research_amount, 
-    assets, qualification, cooperation_situation
+    assets, qualification, cooperation_situation, sales_target
   </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationIdentityExample" resultMap="BaseResultMap">
+  <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 06 10:26:09 CST 2018.
+      This element was generated on Mon Jan 04 17:27:08 CST 2021.
     -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from organization_identity
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    honor_picture
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 06 10:26:09 CST 2018.
+      This element was generated on Mon Jan 04 17:27:08 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from organization_identity
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -197,29 +129,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 06 10:26:09 CST 2018.
+      This element was generated on Mon Jan 04 17:27:08 CST 2021.
     -->
     delete from organization_identity
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OrganizationIdentityExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 06 10:26:09 CST 2018.
-    -->
-    delete from organization_identity
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
   <insert id="insert" 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 Wed Jun 06 10:26:09 CST 2018.
+      This element was generated on Mon Jan 04 17:27:08 CST 2021.
     -->
-    insert into organization_identity (id, uid, contacts, 
+    insert into organization_identity (id, `uid`, contacts, 
       contact_mobile, fixed_tel, qq, 
       postal_address, postcode, unit_name, 
       registered_capital, licence_number, licence_province, 
@@ -229,7 +150,7 @@
       validation_amount, identity_type, location_province, 
       location_city, location_area, legal_person, 
       legal_person_id_card, last_year_tax_report_url, 
-      audit_status, process, wrong_count, 
+      audit_status, `process`, wrong_count, 
       payment_date, listed, listed_date, 
       listed_type, stock_code, certificate_number, 
       issuing_date, cog_contacts, tech_principal, 
@@ -242,7 +163,8 @@
       patent_prory_statement_url, international, 
       review_instructions, investment, year_sales_amount, 
       last_year_research_amount, assets, qualification, 
-      cooperation_situation)
+      cooperation_situation, sales_target, honor_picture
+      )
     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}, 
@@ -266,13 +188,14 @@
       #{patentProryStatementUrl,jdbcType=VARCHAR}, #{international,jdbcType=INTEGER}, 
       #{reviewInstructions,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER}, #{yearSalesAmount,jdbcType=DECIMAL}, 
       #{lastYearResearchAmount,jdbcType=DECIMAL}, #{assets,jdbcType=DECIMAL}, #{qualification,jdbcType=VARCHAR}, 
-      #{cooperationSituation,jdbcType=VARCHAR})
+      #{cooperationSituation,jdbcType=VARCHAR}, #{salesTarget,jdbcType=VARCHAR}, #{honorPicture,jdbcType=LONGVARCHAR}
+      )
   </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 Wed Jun 06 10:26:09 CST 2018.
+      This element was generated on Mon Jan 04 17:27:08 CST 2021.
     -->
     insert into organization_identity
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -280,7 +203,7 @@
         id,
       </if>
       <if test="uid != null">
-        uid,
+        `uid`,
       </if>
       <if test="contacts != null">
         contacts,
@@ -367,7 +290,7 @@
         audit_status,
       </if>
       <if test="process != null">
-        process,
+        `process`,
       </if>
       <if test="wrongCount != null">
         wrong_count,
@@ -480,6 +403,12 @@
       <if test="cooperationSituation != null">
         cooperation_situation,
       </if>
+      <if test="salesTarget != null">
+        sales_target,
+      </if>
+      <if test="honorPicture != null">
+        honor_picture,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -686,325 +615,24 @@
       <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 Wed Jun 06 10:26:09 CST 2018.
-    -->
-    select count(*) from organization_identity
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 06 10:26:09 CST 2018.
-    -->
-    update organization_identity
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.uid != null">
-        uid = #{record.uid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.contacts != null">
-        contacts = #{record.contacts,jdbcType=VARCHAR},
-      </if>
-      <if test="record.contactMobile != null">
-        contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fixedTel != null">
-        fixed_tel = #{record.fixedTel,jdbcType=VARCHAR},
-      </if>
-      <if test="record.qq != null">
-        qq = #{record.qq,jdbcType=VARCHAR},
-      </if>
-      <if test="record.postalAddress != null">
-        postal_address = #{record.postalAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="record.postcode != null">
-        postcode = #{record.postcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.unitName != null">
-        unit_name = #{record.unitName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.registeredCapital != null">
-        registered_capital = #{record.registeredCapital,jdbcType=DECIMAL},
-      </if>
-      <if test="record.licenceNumber != null">
-        licence_number = #{record.licenceNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.licenceProvince != null">
-        licence_province = #{record.licenceProvince,jdbcType=INTEGER},
-      </if>
-      <if test="record.licenceCity != null">
-        licence_city = #{record.licenceCity,jdbcType=INTEGER},
-      </if>
-      <if test="record.licenceArea != null">
-        licence_area = #{record.licenceArea,jdbcType=INTEGER},
-      </if>
-      <if test="record.licenceScanningUrl != null">
-        licence_scanning_url = #{record.licenceScanningUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.orgCode != null">
-        org_code = #{record.orgCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.orgCodeUrl != null">
-        org_code_url = #{record.orgCodeUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.bankAccount != null">
-        bank_account = #{record.bankAccount,jdbcType=VARCHAR},
-      </if>
-      <if test="record.banks != null">
-        banks = #{record.banks,jdbcType=VARCHAR},
-      </if>
-      <if test="record.bankBranch != null">
-        bank_branch = #{record.bankBranch,jdbcType=VARCHAR},
-      </if>
-      <if test="record.bankCardNumber != null">
-        bank_card_number = #{record.bankCardNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.validationAmount != null">
-        validation_amount = #{record.validationAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.identityType != null">
-        identity_type = #{record.identityType,jdbcType=INTEGER},
-      </if>
-      <if test="record.locationProvince != null">
-        location_province = #{record.locationProvince,jdbcType=INTEGER},
-      </if>
-      <if test="record.locationCity != null">
-        location_city = #{record.locationCity,jdbcType=INTEGER},
-      </if>
-      <if test="record.locationArea != null">
-        location_area = #{record.locationArea,jdbcType=INTEGER},
-      </if>
-      <if test="record.legalPerson != null">
-        legal_person = #{record.legalPerson,jdbcType=VARCHAR},
-      </if>
-      <if test="record.legalPersonIdCard != null">
-        legal_person_id_card = #{record.legalPersonIdCard,jdbcType=VARCHAR},
-      </if>
-      <if test="record.lastYearTaxReportUrl != null">
-        last_year_tax_report_url = #{record.lastYearTaxReportUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.auditStatus != null">
-        audit_status = #{record.auditStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.process != null">
-        process = #{record.process,jdbcType=INTEGER},
-      </if>
-      <if test="record.wrongCount != null">
-        wrong_count = #{record.wrongCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.paymentDate != null">
-        payment_date = #{record.paymentDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.listed != null">
-        listed = #{record.listed,jdbcType=INTEGER},
-      </if>
-      <if test="record.listedDate != null">
-        listed_date = #{record.listedDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.listedType != null">
-        listed_type = #{record.listedType,jdbcType=INTEGER},
-      </if>
-      <if test="record.stockCode != null">
-        stock_code = #{record.stockCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.certificateNumber != null">
-        certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.issuingDate != null">
-        issuing_date = #{record.issuingDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.cogContacts != null">
-        cog_contacts = #{record.cogContacts,jdbcType=INTEGER},
-      </if>
-      <if test="record.techPrincipal != null">
-        tech_principal = #{record.techPrincipal,jdbcType=VARCHAR},
-      </if>
-      <if test="record.contactsFixedTel != null">
-        contacts_fixed_tel = #{record.contactsFixedTel,jdbcType=VARCHAR},
-      </if>
-      <if test="record.contactsFax != null">
-        contacts_fax = #{record.contactsFax,jdbcType=VARCHAR},
-      </if>
-      <if test="record.legalPersonTel != null">
-        legal_person_tel = #{record.legalPersonTel,jdbcType=VARCHAR},
-      </if>
-      <if test="record.legalPersonFax != null">
-        legal_person_fax = #{record.legalPersonFax,jdbcType=VARCHAR},
-      </if>
-      <if test="record.legalPersonEmail != null">
-        legal_person_email = #{record.legalPersonEmail,jdbcType=VARCHAR},
-      </if>
-      <if test="record.registrationTime != null">
-        registration_time = #{record.registrationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.ratepayCode != null">
-        ratepay_code = #{record.ratepayCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.industry != null">
-        industry = #{record.industry,jdbcType=INTEGER},
-      </if>
-      <if test="record.enterpriseScale != null">
-        enterprise_scale = #{record.enterpriseScale,jdbcType=VARCHAR},
-      </if>
-      <if test="record.registerType != null">
-        register_type = #{record.registerType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.foreignInvestment != null">
-        foreign_investment = #{record.foreignInvestment,jdbcType=VARCHAR},
-      </if>
-      <if test="record.field != null">
-        field = #{record.field,jdbcType=VARCHAR},
-      </if>
-      <if test="record.taxAuthority != null">
-        tax_authority = #{record.taxAuthority,jdbcType=INTEGER},
-      </if>
-      <if test="record.ratepayMethod != null">
-        ratepay_method = #{record.ratepayMethod,jdbcType=INTEGER},
-      </if>
-      <if test="record.highTechZone != null">
-        high_tech_zone = #{record.highTechZone,jdbcType=INTEGER},
-      </if>
-      <if test="record.riskInvestment != null">
-        risk_investment = #{record.riskInvestment,jdbcType=INTEGER},
-      </if>
-      <if test="record.businessScope != null">
-        business_scope = #{record.businessScope,jdbcType=VARCHAR},
-      </if>
-      <if test="record.highTechName != null">
-        high_tech_name = #{record.highTechName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.patentProryStatementUrl != null">
-        patent_prory_statement_url = #{record.patentProryStatementUrl,jdbcType=VARCHAR},
+      <if test="salesTarget != null">
+        #{salesTarget,jdbcType=VARCHAR},
       </if>
-      <if test="record.international != null">
-        international = #{record.international,jdbcType=INTEGER},
+      <if test="honorPicture != null">
+        #{honorPicture,jdbcType=LONGVARCHAR},
       </if>
-      <if test="record.reviewInstructions != null">
-        review_instructions = #{record.reviewInstructions,jdbcType=VARCHAR},
-      </if>
-      <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" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 06 10:26:09 CST 2018.
-    -->
-    update organization_identity
-    set id = #{record.id,jdbcType=VARCHAR},
-      uid = #{record.uid,jdbcType=VARCHAR},
-      contacts = #{record.contacts,jdbcType=VARCHAR},
-      contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
-      fixed_tel = #{record.fixedTel,jdbcType=VARCHAR},
-      qq = #{record.qq,jdbcType=VARCHAR},
-      postal_address = #{record.postalAddress,jdbcType=VARCHAR},
-      postcode = #{record.postcode,jdbcType=VARCHAR},
-      unit_name = #{record.unitName,jdbcType=VARCHAR},
-      registered_capital = #{record.registeredCapital,jdbcType=DECIMAL},
-      licence_number = #{record.licenceNumber,jdbcType=VARCHAR},
-      licence_province = #{record.licenceProvince,jdbcType=INTEGER},
-      licence_city = #{record.licenceCity,jdbcType=INTEGER},
-      licence_area = #{record.licenceArea,jdbcType=INTEGER},
-      licence_scanning_url = #{record.licenceScanningUrl,jdbcType=VARCHAR},
-      org_code = #{record.orgCode,jdbcType=VARCHAR},
-      org_code_url = #{record.orgCodeUrl,jdbcType=VARCHAR},
-      bank_account = #{record.bankAccount,jdbcType=VARCHAR},
-      banks = #{record.banks,jdbcType=VARCHAR},
-      bank_branch = #{record.bankBranch,jdbcType=VARCHAR},
-      bank_card_number = #{record.bankCardNumber,jdbcType=VARCHAR},
-      validation_amount = #{record.validationAmount,jdbcType=DECIMAL},
-      identity_type = #{record.identityType,jdbcType=INTEGER},
-      location_province = #{record.locationProvince,jdbcType=INTEGER},
-      location_city = #{record.locationCity,jdbcType=INTEGER},
-      location_area = #{record.locationArea,jdbcType=INTEGER},
-      legal_person = #{record.legalPerson,jdbcType=VARCHAR},
-      legal_person_id_card = #{record.legalPersonIdCard,jdbcType=VARCHAR},
-      last_year_tax_report_url = #{record.lastYearTaxReportUrl,jdbcType=VARCHAR},
-      audit_status = #{record.auditStatus,jdbcType=INTEGER},
-      process = #{record.process,jdbcType=INTEGER},
-      wrong_count = #{record.wrongCount,jdbcType=INTEGER},
-      payment_date = #{record.paymentDate,jdbcType=TIMESTAMP},
-      listed = #{record.listed,jdbcType=INTEGER},
-      listed_date = #{record.listedDate,jdbcType=TIMESTAMP},
-      listed_type = #{record.listedType,jdbcType=INTEGER},
-      stock_code = #{record.stockCode,jdbcType=VARCHAR},
-      certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
-      issuing_date = #{record.issuingDate,jdbcType=TIMESTAMP},
-      cog_contacts = #{record.cogContacts,jdbcType=INTEGER},
-      tech_principal = #{record.techPrincipal,jdbcType=VARCHAR},
-      contacts_fixed_tel = #{record.contactsFixedTel,jdbcType=VARCHAR},
-      contacts_fax = #{record.contactsFax,jdbcType=VARCHAR},
-      legal_person_tel = #{record.legalPersonTel,jdbcType=VARCHAR},
-      legal_person_fax = #{record.legalPersonFax,jdbcType=VARCHAR},
-      legal_person_email = #{record.legalPersonEmail,jdbcType=VARCHAR},
-      registration_time = #{record.registrationTime,jdbcType=TIMESTAMP},
-      ratepay_code = #{record.ratepayCode,jdbcType=VARCHAR},
-      industry = #{record.industry,jdbcType=INTEGER},
-      enterprise_scale = #{record.enterpriseScale,jdbcType=VARCHAR},
-      register_type = #{record.registerType,jdbcType=VARCHAR},
-      foreign_investment = #{record.foreignInvestment,jdbcType=VARCHAR},
-      field = #{record.field,jdbcType=VARCHAR},
-      tax_authority = #{record.taxAuthority,jdbcType=INTEGER},
-      ratepay_method = #{record.ratepayMethod,jdbcType=INTEGER},
-      high_tech_zone = #{record.highTechZone,jdbcType=INTEGER},
-      risk_investment = #{record.riskInvestment,jdbcType=INTEGER},
-      business_scope = #{record.businessScope,jdbcType=VARCHAR},
-      high_tech_name = #{record.highTechName,jdbcType=VARCHAR},
-      patent_prory_statement_url = #{record.patentProryStatementUrl,jdbcType=VARCHAR},
-      international = #{record.international,jdbcType=INTEGER},
-      review_instructions = #{record.reviewInstructions,jdbcType=VARCHAR},
-      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>
-  </update>
+    </trim>
+  </insert>
   <update id="updateByPrimaryKeySelective" 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 Wed Jun 06 10:26:09 CST 2018.
+      This element was generated on Mon Jan 04 17:27:08 CST 2021.
     -->
     update organization_identity
     <set>
       <if test="uid != null">
-        uid = #{uid,jdbcType=VARCHAR},
+        `uid` = #{uid,jdbcType=VARCHAR},
       </if>
       <if test="contacts != null">
         contacts = #{contacts,jdbcType=VARCHAR},
@@ -1091,7 +719,7 @@
         audit_status = #{auditStatus,jdbcType=INTEGER},
       </if>
       <if test="process != null">
-        process = #{process,jdbcType=INTEGER},
+        `process` = #{process,jdbcType=INTEGER},
       </if>
       <if test="wrongCount != null">
         wrong_count = #{wrongCount,jdbcType=INTEGER},
@@ -1204,17 +832,101 @@
       <if test="cooperationSituation != null">
         cooperation_situation = #{cooperationSituation,jdbcType=VARCHAR},
       </if>
+      <if test="salesTarget != null">
+        sales_target = #{salesTarget,jdbcType=VARCHAR},
+      </if>
+      <if test="honorPicture != null">
+        honor_picture = #{honorPicture,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <update id="updateByPrimaryKeyWithBLOBs" 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 Mon Jan 04 17:27:08 CST 2021.
+    -->
+    update organization_identity
+    set `uid` = #{uid,jdbcType=VARCHAR},
+      contacts = #{contacts,jdbcType=VARCHAR},
+      contact_mobile = #{contactMobile,jdbcType=VARCHAR},
+      fixed_tel = #{fixedTel,jdbcType=VARCHAR},
+      qq = #{qq,jdbcType=VARCHAR},
+      postal_address = #{postalAddress,jdbcType=VARCHAR},
+      postcode = #{postcode,jdbcType=VARCHAR},
+      unit_name = #{unitName,jdbcType=VARCHAR},
+      registered_capital = #{registeredCapital,jdbcType=DECIMAL},
+      licence_number = #{licenceNumber,jdbcType=VARCHAR},
+      licence_province = #{licenceProvince,jdbcType=INTEGER},
+      licence_city = #{licenceCity,jdbcType=INTEGER},
+      licence_area = #{licenceArea,jdbcType=INTEGER},
+      licence_scanning_url = #{licenceScanningUrl,jdbcType=VARCHAR},
+      org_code = #{orgCode,jdbcType=VARCHAR},
+      org_code_url = #{orgCodeUrl,jdbcType=VARCHAR},
+      bank_account = #{bankAccount,jdbcType=VARCHAR},
+      banks = #{banks,jdbcType=VARCHAR},
+      bank_branch = #{bankBranch,jdbcType=VARCHAR},
+      bank_card_number = #{bankCardNumber,jdbcType=VARCHAR},
+      validation_amount = #{validationAmount,jdbcType=DECIMAL},
+      identity_type = #{identityType,jdbcType=INTEGER},
+      location_province = #{locationProvince,jdbcType=INTEGER},
+      location_city = #{locationCity,jdbcType=INTEGER},
+      location_area = #{locationArea,jdbcType=INTEGER},
+      legal_person = #{legalPerson,jdbcType=VARCHAR},
+      legal_person_id_card = #{legalPersonIdCard,jdbcType=VARCHAR},
+      last_year_tax_report_url = #{lastYearTaxReportUrl,jdbcType=VARCHAR},
+      audit_status = #{auditStatus,jdbcType=INTEGER},
+      `process` = #{process,jdbcType=INTEGER},
+      wrong_count = #{wrongCount,jdbcType=INTEGER},
+      payment_date = #{paymentDate,jdbcType=TIMESTAMP},
+      listed = #{listed,jdbcType=INTEGER},
+      listed_date = #{listedDate,jdbcType=TIMESTAMP},
+      listed_type = #{listedType,jdbcType=INTEGER},
+      stock_code = #{stockCode,jdbcType=VARCHAR},
+      certificate_number = #{certificateNumber,jdbcType=VARCHAR},
+      issuing_date = #{issuingDate,jdbcType=TIMESTAMP},
+      cog_contacts = #{cogContacts,jdbcType=INTEGER},
+      tech_principal = #{techPrincipal,jdbcType=VARCHAR},
+      contacts_fixed_tel = #{contactsFixedTel,jdbcType=VARCHAR},
+      contacts_fax = #{contactsFax,jdbcType=VARCHAR},
+      legal_person_tel = #{legalPersonTel,jdbcType=VARCHAR},
+      legal_person_fax = #{legalPersonFax,jdbcType=VARCHAR},
+      legal_person_email = #{legalPersonEmail,jdbcType=VARCHAR},
+      registration_time = #{registrationTime,jdbcType=TIMESTAMP},
+      ratepay_code = #{ratepayCode,jdbcType=VARCHAR},
+      industry = #{industry,jdbcType=INTEGER},
+      enterprise_scale = #{enterpriseScale,jdbcType=VARCHAR},
+      register_type = #{registerType,jdbcType=VARCHAR},
+      foreign_investment = #{foreignInvestment,jdbcType=VARCHAR},
+      field = #{field,jdbcType=VARCHAR},
+      tax_authority = #{taxAuthority,jdbcType=INTEGER},
+      ratepay_method = #{ratepayMethod,jdbcType=INTEGER},
+      high_tech_zone = #{highTechZone,jdbcType=INTEGER},
+      risk_investment = #{riskInvestment,jdbcType=INTEGER},
+      business_scope = #{businessScope,jdbcType=VARCHAR},
+      high_tech_name = #{highTechName,jdbcType=VARCHAR},
+      patent_prory_statement_url = #{patentProryStatementUrl,jdbcType=VARCHAR},
+      international = #{international,jdbcType=INTEGER},
+      review_instructions = #{reviewInstructions,jdbcType=VARCHAR},
+      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},
+      sales_target = #{salesTarget,jdbcType=VARCHAR},
+      honor_picture = #{honorPicture,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
   <update id="updateByPrimaryKey" 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 Wed Jun 06 10:26:09 CST 2018.
+      This element was generated on Mon Jan 04 17:27:08 CST 2021.
     -->
     update organization_identity
-    set uid = #{uid,jdbcType=VARCHAR},
+    set `uid` = #{uid,jdbcType=VARCHAR},
       contacts = #{contacts,jdbcType=VARCHAR},
       contact_mobile = #{contactMobile,jdbcType=VARCHAR},
       fixed_tel = #{fixedTel,jdbcType=VARCHAR},
@@ -1243,7 +955,7 @@
       legal_person_id_card = #{legalPersonIdCard,jdbcType=VARCHAR},
       last_year_tax_report_url = #{lastYearTaxReportUrl,jdbcType=VARCHAR},
       audit_status = #{auditStatus,jdbcType=INTEGER},
-      process = #{process,jdbcType=INTEGER},
+      `process` = #{process,jdbcType=INTEGER},
       wrong_count = #{wrongCount,jdbcType=INTEGER},
       payment_date = #{paymentDate,jdbcType=TIMESTAMP},
       listed = #{listed,jdbcType=INTEGER},
@@ -1280,7 +992,8 @@
       last_year_research_amount = #{lastYearResearchAmount,jdbcType=DECIMAL},
       assets = #{assets,jdbcType=DECIMAL},
       qualification = #{qualification,jdbcType=VARCHAR},
-      cooperation_situation = #{cooperationSituation,jdbcType=VARCHAR}
+      cooperation_situation = #{cooperationSituation,jdbcType=VARCHAR},
+      sales_target = #{salesTarget,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 	<select id="selectOrgIdentityByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">

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

@@ -280,7 +280,8 @@
    ifnull(b.tgc ,0)endCount,ifnull(b.bhc ,0)rejectCount
   </if>
   <if test="type ==2">
-  ifnull(b.acc ,0)acceptCount,ifnull(b.lic ,0)certificatesCount,ifnull(b.sqc,0) applyCount
+  ifnull(b.acc ,0)acceptCount,ifnull(b.lic ,0)certificatesCount,ifnull(b.sqc,0) applyCount,
+  ifnull(b.bhc,0) rejectCount
   </if>
   from t_task_mid a left join (select task_id tid,
   <if test="type ==0">

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

@@ -704,6 +704,7 @@
 			b.org_code as orgCode,
 			b.org_code_url as orgCodeUrl,
 			b.business_scope as businessScope,
+			b.sales_target salesTarget,
 			b.id,
 			b.contacts,
 			b.contact_mobile as contactMobile,

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


+ 5 - 0
src/main/java/com/goafanti/customer/bo/CustomerOrganizationDetailBo.java

@@ -3,6 +3,11 @@ package com.goafanti.customer.bo;
 import com.goafanti.common.model.OrganizationIdentity;
 
 public class CustomerOrganizationDetailBo extends OrganizationIdentity{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
 	private String identifyName;
 	private String societyTag;
 	private String companyLogoUrl;

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

@@ -33,8 +33,10 @@ import com.goafanti.common.dao.BusinessGlossoryMapper;
 import com.goafanti.common.dao.BusinessProjectMapper;
 import com.goafanti.common.dao.OrganizationAnnualReportMapper;
 import com.goafanti.common.dao.OrganizationApplicationInfoMapper;
+import com.goafanti.common.dao.OrganizationBusinessScopeMapper;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
+import com.goafanti.common.dao.OrganizationSalesTargetMapper;
 import com.goafanti.common.dao.OrganizationYearProjectMapper;
 import com.goafanti.common.dao.UserBusinessMapper;
 import com.goafanti.common.dao.UserFollowBusinessMapper;
@@ -52,8 +54,10 @@ import com.goafanti.common.enums.UserType;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrganizationApplicationInfo;
+import com.goafanti.common.model.OrganizationBusinessScope;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.common.model.OrganizationSalesTarget;
 import com.goafanti.common.model.User;
 import com.goafanti.common.model.UserBusiness;
 import com.goafanti.common.model.UserFollow;
@@ -121,6 +125,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Resource
 	private OrganizationYearProjectMapper	organizationYearProjectMapper;
 	@Resource
+	private OrganizationBusinessScopeMapper	organizationBusinessScopeMapper;
+	@Resource
+	private OrganizationSalesTargetMapper	organizationSalesTargetMapper;
+	@Resource
 	private UserTransferLogMapper	userTransferLogMapper;
 	@Value(value = "${upload.path}")
 	private String 					uploadPath 			= null;
@@ -417,6 +425,46 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		} catch (IllegalAccessException |InvocationTargetException e) {
 			e.printStackTrace();
 		} 
+		organizationBusinessScopeMapper.deleteByUid(bo.getUid());
+		if (bo.getBusinessScope()!=null) {
+			if (bo.getBusinessScope().contains(",")) {
+				String [] ss=bo.getBusinessScope().split(",");
+				List<OrganizationBusinessScope> list=new ArrayList<>();
+				for (int i = 0; i < ss.length; i++) {
+					String string = ss[i];
+					OrganizationBusinessScope obs=new OrganizationBusinessScope();
+					obs.setUid(bo.getUid());
+					obs.setKeyword(string);
+					list.add(obs);
+				}
+				organizationBusinessScopeMapper.insertBatch(list);
+			}else {
+				OrganizationBusinessScope obs=new OrganizationBusinessScope();
+				obs.setUid(bo.getUid());
+				obs.setKeyword(bo.getBusinessScope());
+				organizationBusinessScopeMapper.insertSelective(obs);
+			}
+		}
+		organizationSalesTargetMapper.deleteByUid(bo.getUid());
+		if (bo.getSalesTarget()!=null) {
+			if (bo.getSalesTarget().contains(",")) {
+				String [] ss=bo.getSalesTarget().split(",");
+				List<OrganizationSalesTarget> list=new ArrayList<>();
+				for (int i = 0; i < ss.length; i++) {
+					String string = ss[i];
+					OrganizationSalesTarget obs=new OrganizationSalesTarget();
+					obs.setUid(bo.getUid());
+					obs.setKeyword(string);
+					list.add(obs);
+				}
+				organizationSalesTargetMapper.insertBatch(list);
+			}else {
+				OrganizationSalesTarget obs=new OrganizationSalesTarget();
+				obs.setUid(bo.getUid());
+				obs.setKeyword(bo.getBusinessScope());
+				organizationSalesTargetMapper.insertSelective(obs);
+			}
+		}
 		organizationIdentityMapper.updateByPrimaryKey(oi);
 		userMapper.updateByPrimaryKeySelective(user);
 		return 1;