ソースを参照

Merge remote-tracking branch 'origin/master' into test

anderx 5 年 前
コミット
c969d06b7e
共有29 個のファイルを変更した1776 個の追加821 個の削除を含む
  1. 1 1
      GeneratorConfig.xml
  2. 9 35
      src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java
  3. 27 3
      src/main/java/com/goafanti/common/dao/TTaskMidMapper.java
  4. 24 3
      src/main/java/com/goafanti/common/dao/TaskProgressMapper.java
  5. 125 0
      src/main/java/com/goafanti/common/mapper/OrganizationBusinessScopeMapper.xml
  6. 133 420
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  7. 5 3
      src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml
  8. 147 25
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  9. 161 13
      src/main/java/com/goafanti/common/mapper/TTaskMidMapper.xml
  10. 56 4
      src/main/java/com/goafanti/common/mapper/TaskProgressMapper.xml
  11. 1 0
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  12. 422 239
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  13. 231 0
      src/main/java/com/goafanti/common/model/TTaskMid.java
  14. 164 0
      src/main/java/com/goafanti/common/model/TaskProgress.java
  15. 5 0
      src/main/java/com/goafanti/customer/bo/CustomerOrganizationDetailBo.java
  16. 49 0
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  17. 25 0
      src/main/java/com/goafanti/order/bo/InputProjectStatistics.java
  18. 16 6
      src/main/java/com/goafanti/order/bo/InputProvincialStatistics.java
  19. 16 16
      src/main/java/com/goafanti/order/bo/OutProjectStatistics.java
  20. 61 0
      src/main/java/com/goafanti/order/bo/OutProvincialStatistics.java
  21. 7 0
      src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java
  22. 1 1
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  23. 1 1
      src/main/java/com/goafanti/order/controller/OrderProjectApiController.java
  24. 0 2
      src/main/java/com/goafanti/order/service/OrderProjectService.java
  25. 20 16
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  26. 65 31
      src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java
  27. 1 0
      src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java
  28. 1 1
      src/main/resources/props/config_test.properties
  29. 2 1
      src/main/webapp/WEB-INF/web.xml

+ 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);
 

+ 27 - 3
src/main/java/com/goafanti/common/dao/TTaskMidMapper.java

@@ -7,19 +7,42 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface TTaskMidMapper {
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_task_mid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	int deleteByPrimaryKey(Integer id);
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_task_mid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	int insert(TTaskMid record);
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_task_mid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	int insertSelective(TTaskMid record);
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_task_mid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	TTaskMid selectByPrimaryKey(Integer id);
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_task_mid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	int updateByPrimaryKeySelective(TTaskMid record);
 
-	int updateByPrimaryKey(TTaskMid record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_task_mid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 
-	int updateCostAmount(@Param("tid")Integer tid, @Param("costAmount")BigDecimal costAmount);
+	int updateCostAmount(@Param("tid")Integer tid, @Param("count")BigDecimal costAmount);
 
 	int updatePaymentAmount(@Param("tid")Integer tid, @Param("paymentAmount")BigDecimal paymentAmount, @Param("type")Integer type);
 
@@ -31,7 +54,8 @@ public interface TTaskMidMapper {
 
 	void addValue(Integer xzs, Integer bhs);
 
-	void updateCountBytid(Integer taskId);
+
+	TTaskMid selectCountBytid(@Param("tid")Integer tid, @Param("type")Integer type);
 	
 
 }

+ 24 - 3
src/main/java/com/goafanti/common/dao/TaskProgressMapper.java

@@ -8,19 +8,40 @@ import java.util.List;
 
 public interface TaskProgressMapper {
 
-
-
-
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	int deleteByPrimaryKey(Integer id);
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	int insert(TaskProgress record);
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	int insertSelective(TaskProgress record);
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	TaskProgress selectByPrimaryKey(Integer id);
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	int updateByPrimaryKeySelective(TaskProgress record);
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	int updateByPrimaryKey(TaskProgress record);
 
 	List<TaskProgressBo> selectTaskProgress(Integer tid);

+ 125 - 0
src/main/java/com/goafanti/common/mapper/OrganizationBusinessScopeMapper.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.OrganizationBusinessScopeMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrganizationBusinessScope">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 04 17:13:19 CST 2021.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="keyword" jdbcType="VARCHAR" property="keyword" />
+  </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 Mon Jan 04 17:13:19 CST 2021.
+    -->
+    id, `uid`, keyword
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 04 17:13:19 CST 2021.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from organization_business_scope
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 04 17:13:19 CST 2021.
+    -->
+    delete from organization_business_scope
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrganizationBusinessScope">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 04 17:13:19 CST 2021.
+    -->
+    insert into organization_business_scope (id, `uid`, keyword
+      )
+    values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationBusinessScope">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 04 17:13:19 CST 2021.
+    -->
+    insert into organization_business_scope
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="uid != null">
+        `uid`,
+      </if>
+      <if test="keyword != null">
+        keyword,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="keyword != null">
+        #{keyword,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationBusinessScope">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 04 17:13:19 CST 2021.
+    -->
+    update organization_business_scope
+    <set>
+      <if test="uid != null">
+        `uid` = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="keyword != null">
+        keyword = #{keyword,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrganizationBusinessScope">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 04 17:13:19 CST 2021.
+    -->
+    update organization_business_scope
+    set `uid` = #{uid,jdbcType=VARCHAR},
+      keyword = #{keyword,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <insert id="insertBatch" parameterType="com.goafanti.common.model.OrganizationBusinessScope">
+    insert into organization_business_scope
+    (`uid`, keyword)
+     values    
+    <foreach item="item" index="index" collection="list" separator=",">
+      (#{item.uid,jdbcType=VARCHAR},
+        #{item.keyword,jdbcType=VARCHAR})
+     </foreach>   
+  </insert>
+  
+  <delete id="deleteByUid">
+  delete from organization_business_scope where uid= #{uid}
+  </delete>
+</mapper>

+ 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">

+ 5 - 3
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -442,11 +442,13 @@
 	<select id="selectOrganizationCount" resultType="java.lang.Integer">
 		select
 			count(0)
-		from department om
+		from department om 
 		left join department dm on om.super_id = dm.id
 		left join admin x on om.manager_id = x.id
 		where
-			om.deleted_sign='0'
+			om.deleted_sign = '0'
+			and
+			om.name != '平台超管中心'
 		<if test="name !=null">
 			AND om.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 		</if>
@@ -458,7 +460,7 @@
 		</if>
 		<if test="depNo !=null">
 			AND om.dep_no=#{depNo,jdbcType=VARCHAR}
-		</if>	
+		</if>
 	</select>
 	<select id="selectSuperId"  resultType="com.goafanti.organization.bo.OrganizationListOut">
 		select

+ 147 - 25
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1573,8 +1573,8 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
   	</if>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
-  select  
-	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.task_comment as taskComment,a.project_status as projectStatus,
+   select  
+	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.sort ,c.cname,d.name as receiverName,a.task_comment as taskComment,a.project_status as projectStatus,
 	a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName, f.nickname as userName,a.set_up_amount as setUpAmount,
 	g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent, a.arrival_money as arrivalMoney,
 	a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,a.task_receiver taskReceiver,
@@ -1828,35 +1828,80 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	b.contract_no contractNo ,b.order_no orderNo ,e.buyer_name userName,bc.cname ,a.commodity_name pname,ta.name techName,td.name techDepName,
 	a.status projectStatus,a.id,
 	<if test="status==1">
-	a.set_up_status setUpStatus ,a.set_up_time setUpTime ,a.spot_check_status spotCheckStatus ,b.contact_mobile contactMobile , b.legal_person_tel legalPersonTel ,
-	a.certificate_number certificateNumber,a.declaration_batch declarationBatch,
+	a.set_up_status setUpStatus , date_format( a.set_up_time , '%Y-%m-%d' ) setUpTime ,a.spot_check_status spotCheckStatus ,b.contact_mobile contactMobile ,
+	 b.legal_person_tel legalPersonTel , a.certificate_number certificateNumber,a.declaration_batch declarationBatch,
 	</if>
 	<if test="status==2">
-	a.licence_time licenceTime,
+	date_format(a.licence_time, '%Y-%m-%d' ) licenceTime,
 	</if>
 	<if test="status==3">
 	a.commodity_quantity commodityQuantity ,ttm.certificates_count certificatesCount,ttm.urgent_day urgentDay ,ttm.if_material ifMaterial,
-	tp.licence_time  licenceTime,
+	date_format(tp.licence_time, '%Y-%m-%d' )  licenceTime,
 	a.certificate_number certificateNumber,ttm.cost_amount costAmount ,
 	(a.commodity_price-ttm.cost_amount)profit,
 	</if>
 	<if test="status==4">
-	a.commodity_quantity commodityQuantity ,ttm.certificates_count certificatesCount,a.high_tech_status highTechStatus,
-	tp.patent_name patentName ,tp.patent_no patentNo ,tp.accept_time acceptTime ,tp.licence_time licenceTime ,tp.authorize_time  authorizeTime,
+	ttm.certificates_count certificatesCount,a.high_tech_status highTechStatus,
+	tp.patent_name patentName ,tp.patent_no patentNo ,date_format(tp.accept_time, '%Y-%m-%d ' ) acceptTime ,
+	date_format(tp.licence_time, '%Y-%m-%d' ) licenceTime ,date_format(tp.authorize_time, '%Y-%m-%d ' )  authorizeTime,
 	ttm.reject_count	rejectCount ,ttm.cost_amount costAmount ,(a.commodity_price-ttm.cost_amount)profit,
 	</if>
 	
-	 a.commodity_price commodityPrice ,a.special_comment specialComment
+	a.commodity_quantity commodityQuantity , a.commodity_price commodityPrice ,a.special_comment specialComment
 	from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id left join district_glossory d on c.province=d.id
 	<if test="status==3 or status==4">
 	left join task_progress tp  on a.id=tp.task_id 
 	</if> 
 	left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id 
 	left join t_task_mid ttm on a.id=ttm.tid left join admin ta on a.task_receiver =ta.id left join department td on ta.department_id =td.id
+	<if test="screen ==6">
+	right join (select tid ,accept_count sls from t_task_mid where accept_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="screen ==7">
+	right join (select tid ,end_count wjs from t_task_mid where end_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="screen ==8">
+	right join (select tid ,authorize_count sqs from t_task_mid where authorize_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="screen ==9">
+	right join (select tid ,reject_count bhs from t_task_mid where reject_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="screen ==10">
+	right join (select tid ,certificates_count xzs from t_task_mid where certificates_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="screen ==11">
+	right join (select tid ,apply_count sqs,reject_count bhs,certificates_count xzs from t_task_mid 
+	where apply_count &gt; 0)tj on a.id=tj.tid
+	</if>
 	where a.split_status in (0,2) and a.task_status in (1,2,3)
+	<!--  筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 -->
+	<if test="screen ==0">
+	and a.status in(0,1,2,3,5)
+	</if>
+	<if test="screen ==2">
+	and a.status in(4,6)
+	</if>	
+	<if test="screen ==3">
+	and a.set_up_status =1
+	</if>
+	<if test="screen ==4">
+	and a.spot_check_status in (1,2)
+	</if>	
+	<if test="screen ==5">
+	and a.spot_check_status =1
+	</if>	
+	<if test="screen ==12">
+	and a.publicity_time is not null
+	</if>
     <if test="startDate != null and endDate != null">
   	and a.task_distribution_time between #{startDate} and #{endDate}
   	</if>
+  	<if test="province !=null">
+	and c.province =  #{province}
+  	</if>
+  	<if test="projectId !=null">
+	and a.commodity_id = #{projectId}
+  	</if>
   	<if test="depId !=null">
 	and b.order_dep = #{depId}
   	</if>
@@ -1884,8 +1929,11 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	<if test="projectSituation !=null">
 	and a.status = #{projectSituation}
 	</if>
-	<if test="amountStart !=null and amountEnd != null">
-	and a.commodity_price between #{amountStart} and #{amountEnd}
+	<if test=" projectAmount !=null and projectAmount != 9">
+	and a.commodity_price &gt;=  #{amountStart} and  a.commodity_price &lt;  #{amountEnd}
+	</if>
+	<if test=" projectAmount == 9">
+	and a.commodity_price &gt;=  #{amountStart} 
 	</if>
   	<if test="page_sql!=null">
 			${page_sql}
@@ -1897,7 +1945,45 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id left join district_glossory d on c.province=d.id
 	left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id 
 	left join t_task_mid ttm on a.id=ttm.tid left join admin ta on a.task_receiver =ta.id left join department td on ta.department_id =td.id
+	<if test="screen ==6">
+	right join (select tid ,accept_count sls from t_task_mid where accept_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="screen ==7">
+	right join (select tid ,end_count wjs from t_task_mid where end_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="screen ==8">
+	right join (select tid ,authorize_count sqs from t_task_mid where authorize_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="screen ==9">
+	right join (select tid ,reject_count bhs from t_task_mid where reject_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="screen ==10">
+	right join (select tid ,certificates_count xzs from t_task_mid where certificates_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="screen ==11">
+	right join (select tid ,apply_count sqs,reject_count bhs,certificates_count xzs from t_task_mid 
+	where apply_count &gt; 0)tj on a.id=tj.tid
+	</if>
 	where a.split_status in (0,2) and a.task_status in (1,2,3)
+	<!--  筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数 -->
+	<if test="screen ==0">
+	and a.status in(0,1,2,3,5)
+	</if>
+	<if test="screen ==2">
+	and a.status in(4,6)
+	</if>	
+	<if test="screen ==3">
+	and a.set_up_status =1
+	</if>
+	<if test="screen ==4">
+	and a.spot_check_status in (1,2)
+	</if>	
+	<if test="screen ==5">
+	and a.spot_check_status =1
+	</if>
+	<if test="screen ==12">
+	and a.publicity_time is not null
+	</if>		
   <if test="startDate != null and endDate != null">
   	and a.task_distribution_time between #{startDate} and #{endDate}
   	</if>
@@ -1908,7 +1994,7 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	and td.id= #{thchDepId}
   	</if>
   	<if test="projectStatus !=null">
-	and bc.id= #{projectStatus}
+	and bp.cid= #{projectStatus}
   	</if>
   	<if test="projectType !=null">
 	and bp.type= #{projectType}
@@ -1925,44 +2011,80 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	<if test="declarationBatch !=null">
 	and a.declaration_batch = #{declarationBatch}
 	</if>
-	<if test="amountStart !=null and amountEnd != null">
-	and a.commodity_price between #{amountStart} and #{amountEnd}
+	<if test="projectSituation !=null">
+	and a.status = #{projectSituation}
+	</if>
+	<if test=" projectAmount !=null and projectAmount != 9">
+	and a.commodity_price &gt;=  #{amountStart} and  a.commodity_price &lt;  #{amountEnd}
+	</if>
+	<if test=" projectAmount == 9">
+	and a.commodity_price &gt;=  #{amountStart} 
 	</if>
   </select>
   
   
    <select id="selectProvincialStatisticsListByPage" resultType="com.goafanti.order.bo.OutProvincialStatistics">
 	select dg.name provinceName,de.name thchDepName ,bc.cname projectStatus,
+	  dg.id province, de.id thchDepId,bc.id bpId, 
+	 ifnull(x.kcs,0) stockCount, ifnull(x.pds,0) distributeCount,
 	<if test="status==1">
-	ifnull(x.kcs,0) stockCount, ifnull(x.pds,0) distributeCount,ifnull(x.wcs,0) completeCount,
-	ifnull(x.lxs,0) setUpCount,ifnull(x.ccs,0) spotCheckCount,ifnull(x.wtg,0) failedCount,
+	ifnull(x.wcs,0) completeCount, ifnull(x.lxs,0) setUpCount,ifnull(x.ccs,0) spotCheckCount,ifnull(x.wtg,0) failedCount,
 	</if>
-	<if test="status==2">
-	x.sls acceptCount,x.wjs completeCount,x.sqs authorizeCount,x.bhs rejectCount,
+	<if test="status==2 or status==3">
+	ifnull(x.sls,0) acceptCount,ifnull(x.wjs,0) completeCount,ifnull(x.sqs,0) authorizeCount,ifnull(x.bhs,0) rejectCount,
+	</if>
+	<if test="status==4">
+	ifnull(x.xzs,0) certificatesCount,
+	</if>
+	<if test="status==5">
+	ifnull(x.sqs,0)applyCount ,ifnull(x.bhs,0)rejectCount ,ifnull(x.xzs,0) certificatesCount,
+	</if>
+	<if test="status==0">
+	ifnull(x.wcs,0) completeCount, ifnull(x.gss,0) publicityCount,
 	</if>
 	x.amountCount,x.costAmount,x.profit
-	from (select dep.province, ad.department_id,bp.cid ,
+	from (select dep.province, ad.department_id,bp.cid ,sum(kcs.cq) kcs,sum(pds.cq)pds,
 	<if test="status==1">
-	sum(kcs.cq) kcs,sum(pds.cq)pds,sum(wcs.cq)wcs, sum(lxs.cq)lxs,sum(ccs.cq)ccs,sum(pds.cq)wtg,
+	sum(wcs.cq)wcs, sum(lxs.cq)lxs,sum(ccs.cq)ccs,sum(wtg.cq)wtg,
 	</if>
-	<if test="status==2">
+	<if test="status==2 or status==3">
 	sum(tj.sls) sls,sum(tj.wjs)wjs,sum(tj.sqs)sqs, sum(tj.bhs)bhs,
 	</if>
+	<if test="status==4">
+	sum(tj.xzs) xzs,
+	</if>
+	<if test="status==5">
+	sum(tj.sqs) sqs,sum(tj.bhs) bhs,sum(tj.xzs) xzs,
+	</if>
+	<if test="status==0">
+	sum(wcs.cq)wcs, sum(gss.cq)gss,
+	</if>
 	sum(a.commodity_price)amountCount,sum(ttm.cost_amount)costAmount, (sum(a.commodity_price)-sum(ttm.cost_amount))profit
 	from t_order_task a left join t_order_new b on a.order_no =b.order_no left join t_task_mid ttm on a.id=ttm.tid 
 	left join department dep on b.order_dep =dep.id  left join admin ad on a.task_receiver =ad.id
 	left join business_project bp on a.commodity_id =bp.id 
-	<if test="status==1">
-	left join (select id,commodity_quantity cq from t_order_task where status in(0,1,2,3,5,6))kcs on a.id=kcs.id
+	left join (select id,commodity_quantity cq from t_order_task where status in(0,1,2,3,5))kcs on a.id=kcs.id
 	left join (select id,commodity_quantity cq from t_order_task where task_status in (1,2,3))pds on a.id=pds.id
+	<if test="status==1">
 	left join (select id,commodity_quantity cq from t_order_task where status in(4,6))wcs on a.id=wcs.id
 	left join (select id,commodity_quantity cq from t_order_task where  set_up_status =1)lxs on a.id=lxs.id
 	left join (select id,commodity_quantity cq from t_order_task where spot_check_status in (1,2))ccs on a.id=ccs.id
 	left join (select id,commodity_quantity cq from t_order_task where spot_check_status =1)wtg on a.id=wtg.id
 	</if>
-	<if test="status==2">
+	<if test="status==2 or status==3">
 	left join (select tid ,accept_count sls,end_count wjs,authorize_count sqs,reject_count bhs from t_task_mid 
-	where certificates_count &gt; 0)tj on a.id=tj.tid
+	where authorize_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="status==4">
+	left join (select tid ,certificates_count xzs from t_task_mid where certificates_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="status==5">
+	left join (select tid ,apply_count sqs,reject_count bhs,certificates_count xzs from t_task_mid 
+	where apply_count &gt; 0)tj on a.id=tj.tid
+	</if>
+	<if test="status==0">
+	left join (select id,commodity_quantity cq from t_order_task where status in(4,6))wcs on a.id=wcs.id
+	left join (select id,commodity_quantity cq from t_order_task where  publicity_time is not null)gss on a.id=gss.id
 	</if>
 	where  b.order_dep is not null and a.split_status in(0,2) and a.task_status in (1,2,3)
 	<if test="startDate != null and endDate != null">

+ 161 - 13
src/main/java/com/goafanti/common/mapper/TTaskMidMapper.xml

@@ -2,35 +2,77 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.TTaskMidMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.TTaskMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:38:43 CST 2020.
+    -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
     <result column="cost_amount" jdbcType="DECIMAL" property="costAmount" />
     <result column="party_amount" jdbcType="DECIMAL" property="partyAmount" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="certificates_count" jdbcType="INTEGER" property="certificatesCount" />
+    <result column="urgent_day" jdbcType="INTEGER" property="urgentDay" />
+    <result column="if_material" jdbcType="INTEGER" property="ifMaterial" />
+    <result column="reject_count" jdbcType="INTEGER" property="rejectCount" />
+    <result column="accept_count" jdbcType="INTEGER" property="acceptCount" />
+    <result column="end_count" jdbcType="INTEGER" property="endCount" />
+    <result column="authorize_count" jdbcType="INTEGER" property="authorizeCount" />
+    <result column="apply_count" jdbcType="INTEGER" property="applyCount" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, tid, cost_amount, party_amount, create_time, certificates_count
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:38:43 CST 2020.
+    -->
+    id, tid, cost_amount, party_amount, create_time, certificates_count, urgent_day, 
+    if_material, reject_count, accept_count, end_count, authorize_count, apply_count
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:38:43 CST 2020.
+    -->
     select 
     <include refid="Base_Column_List" />
     from t_task_mid
     where id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:38:43 CST 2020.
+    -->
     delete from t_task_mid
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.TTaskMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:38:43 CST 2020.
+    -->
     insert into t_task_mid (id, tid, cost_amount, 
-      party_amount, create_time, certificates_count
-      )
+      party_amount, create_time, certificates_count, 
+      urgent_day, if_material, reject_count, 
+      accept_count, end_count, authorize_count, 
+      apply_count)
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{costAmount,jdbcType=DECIMAL}, 
-      #{partyAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{certificatesCount,jdbcType=INTEGER}
-      )
+      #{partyAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{certificatesCount,jdbcType=INTEGER}, 
+      #{urgentDay,jdbcType=INTEGER}, #{ifMaterial,jdbcType=INTEGER}, #{rejectCount,jdbcType=INTEGER}, 
+      #{acceptCount,jdbcType=INTEGER}, #{endCount,jdbcType=INTEGER}, #{authorizeCount,jdbcType=INTEGER}, 
+      #{applyCount,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TTaskMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:38:43 CST 2020.
+    -->
     insert into t_task_mid
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -51,6 +93,27 @@
       <if test="certificatesCount != null">
         certificates_count,
       </if>
+      <if test="urgentDay != null">
+        urgent_day,
+      </if>
+      <if test="ifMaterial != null">
+        if_material,
+      </if>
+      <if test="rejectCount != null">
+        reject_count,
+      </if>
+      <if test="acceptCount != null">
+        accept_count,
+      </if>
+      <if test="endCount != null">
+        end_count,
+      </if>
+      <if test="authorizeCount != null">
+        authorize_count,
+      </if>
+      <if test="applyCount != null">
+        apply_count,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -71,9 +134,35 @@
       <if test="certificatesCount != null">
         #{certificatesCount,jdbcType=INTEGER},
       </if>
+      <if test="urgentDay != null">
+        #{urgentDay,jdbcType=INTEGER},
+      </if>
+      <if test="ifMaterial != null">
+        #{ifMaterial,jdbcType=INTEGER},
+      </if>
+      <if test="rejectCount != null">
+        #{rejectCount,jdbcType=INTEGER},
+      </if>
+      <if test="acceptCount != null">
+        #{acceptCount,jdbcType=INTEGER},
+      </if>
+      <if test="endCount != null">
+        #{endCount,jdbcType=INTEGER},
+      </if>
+      <if test="authorizeCount != null">
+        #{authorizeCount,jdbcType=INTEGER},
+      </if>
+      <if test="applyCount != null">
+        #{applyCount,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TTaskMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:38:43 CST 2020.
+    -->
     update t_task_mid
     <set>
       <if test="tid != null">
@@ -91,19 +180,53 @@
       <if test="certificatesCount != null">
         certificates_count = #{certificatesCount,jdbcType=INTEGER},
       </if>
+      <if test="urgentDay != null">
+        urgent_day = #{urgentDay,jdbcType=INTEGER},
+      </if>
+      <if test="ifMaterial != null">
+        if_material = #{ifMaterial,jdbcType=INTEGER},
+      </if>
+      <if test="rejectCount != null">
+        reject_count = #{rejectCount,jdbcType=INTEGER},
+      </if>
+      <if test="acceptCount != null">
+        accept_count = #{acceptCount,jdbcType=INTEGER},
+      </if>
+      <if test="endCount != null">
+        end_count = #{endCount,jdbcType=INTEGER},
+      </if>
+      <if test="authorizeCount != null">
+        authorize_count = #{authorizeCount,jdbcType=INTEGER},
+      </if>
+      <if test="applyCount != null">
+        apply_count = #{applyCount,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TTaskMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:38:43 CST 2020.
+    -->
     update t_task_mid
     set tid = #{tid,jdbcType=INTEGER},
       cost_amount = #{costAmount,jdbcType=DECIMAL},
       party_amount = #{partyAmount,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      certificates_count = #{certificatesCount,jdbcType=INTEGER}
+      certificates_count = #{certificatesCount,jdbcType=INTEGER},
+      urgent_day = #{urgentDay,jdbcType=INTEGER},
+      if_material = #{ifMaterial,jdbcType=INTEGER},
+      reject_count = #{rejectCount,jdbcType=INTEGER},
+      accept_count = #{acceptCount,jdbcType=INTEGER},
+      end_count = #{endCount,jdbcType=INTEGER},
+      authorize_count = #{authorizeCount,jdbcType=INTEGER},
+      apply_count = #{applyCount,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
  
+ 
   <update id="updatePaymentAmount">
   	update t_task_mid
     <if test="type == 0">
@@ -114,7 +237,7 @@
     </if>
     where tid = #{tid,jdbcType=INTEGER}
   </update>
-  <select id="selectByTid" resultType="com.goafanti.common.model.TTaskMid">
+  <select id="selectListByTid" resultType="com.goafanti.common.model.TTaskMid">
 	    select c.id,c.tid,c.cost_amount costAmount from t_order_task a left join t_order_task b on a.order_no=b.order_no
 	left join t_task_mid c on b.id=c.tid
 	where a.id= #{tid}
@@ -147,11 +270,36 @@
     </set>
     where tid = #{tid,jdbcType=INTEGER}
   </update>
+  <select id="selectCountBytid" resultType="com.goafanti.common.model.TTaskMid">
+  select a.id,
+  <if test="type ==0">
+   ifnull(b.lic,0) certificatesCount
+  </if>
+  <if test="type ==1">
+   ifnull(b.acc ,0)acceptCount, ifnull(b.lic ,0)authorizeCount,ifnull(b.lic ,0)certificatesCount,
+   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.bhc,0) rejectCount
+  </if>
+  from t_task_mid a left join (select task_id tid,
+  <if test="type ==0">
+  sum(if(licence_time is null,0,1))lic from task_progress where task_id= #{tid} GROUP by task_id)b  
+  </if>
+  <if test="type ==1">
+  	<!-- 下证数与授权数一样,下证统计大于则用下证,小于或者等于用授权统计 -->
+ 	sum(if(if(licence_time is null,0,1) &gt; if(authorize_time is null,0,1),
+		if(licence_time is null,0,1),if(authorize_time is null,0,1)))lic ,ifnull(count(accept_time),0)acc,
+	 	sum(if(status=1,1,0))tgc,sum(if(status=2 ,1,0))bhc from task_progress where task_id= #{tid} GROUP by task_id )b
+  </if>
+  <if test="type ==2">
+  	count(*)sqc,  sum(if(licence_time is null,0,1))lic , sum(if(accept_time is null,0,1))acc,
+   	 sum(if(status=2 ,1,0))bhc  from task_progress where task_id= #{tid} GROUP by task_id )b
+  </if>
+   on a.tid =b.tid
+	where a.tid= #{tid}
+  </select>
   
-  <update id="updateCountBytid">
-  	    update t_task_mid a,(select task_id tid,ifnull(count(licence_time),0)lic ,ifnull(count(accept_time),0)acc,ifnull(count(authorize_time),0)auc,
-    count(if(status=1,1,0))tgc,count(if(status ,2,0))bhc from task_progress where task_id= #{tid} GROUP by task_id )b
-    set a.accept_count =b.acc,a.authorize_count =b.auc,a.certificates_count =b.lic,a.end_count =b.tgc,a.reject_count =b.bhc
-    where a.tid =b.tid
-  </update>
+ 
 </mapper>

+ 56 - 4
src/main/java/com/goafanti/common/mapper/TaskProgressMapper.xml

@@ -2,6 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.TaskProgressMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:12:14 CST 2020.
+    -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="already_number" jdbcType="INTEGER" property="alreadyNumber" />
     <result column="licence_time" jdbcType="TIMESTAMP" property="licenceTime" />
@@ -12,32 +17,58 @@
     <result column="patent_no" jdbcType="VARCHAR" property="patentNo" />
     <result column="patent_name" jdbcType="VARCHAR" property="patentName" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="type" jdbcType="INTEGER" property="type" />
   </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 Fri Dec 25 14:12:14 CST 2020.
+    -->
     id, already_number, licence_time, task_id, create_time, accept_time, authorize_time, 
-    patent_no, patent_name, `status`
+    patent_no, patent_name, `status`, `type`
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:12:14 CST 2020.
+    -->
     select 
     <include refid="Base_Column_List" />
     from task_progress
     where id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:12:14 CST 2020.
+    -->
     delete from task_progress
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:12:14 CST 2020.
+    -->
     insert into task_progress (id, already_number, licence_time, 
       task_id, create_time, accept_time, 
       authorize_time, patent_no, patent_name, 
-      `status`)
+      `status`, `type`)
     values (#{id,jdbcType=INTEGER}, #{alreadyNumber,jdbcType=INTEGER}, #{licenceTime,jdbcType=TIMESTAMP}, 
       #{taskId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{acceptTime,jdbcType=TIMESTAMP}, 
       #{authorizeTime,jdbcType=TIMESTAMP}, #{patentNo,jdbcType=VARCHAR}, #{patentName,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER})
+      #{status,jdbcType=INTEGER}, #{type,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:12:14 CST 2020.
+    -->
     insert into task_progress
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -70,6 +101,9 @@
       <if test="status != null">
         `status`,
       </if>
+      <if test="type != null">
+        `type`,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -102,9 +136,17 @@
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:12:14 CST 2020.
+    -->
     update task_progress
     <set>
       <if test="alreadyNumber != null">
@@ -134,10 +176,18 @@
       <if test="status != null">
         `status` = #{status,jdbcType=INTEGER},
       </if>
+      <if test="type != null">
+        `type` = #{type,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Dec 25 14:12:14 CST 2020.
+    -->
     update task_progress
     set already_number = #{alreadyNumber,jdbcType=INTEGER},
       licence_time = #{licenceTime,jdbcType=TIMESTAMP},
@@ -147,9 +197,11 @@
       authorize_time = #{authorizeTime,jdbcType=TIMESTAMP},
       patent_no = #{patentNo,jdbcType=VARCHAR},
       patent_name = #{patentName,jdbcType=VARCHAR},
-      `status` = #{status,jdbcType=INTEGER}
+      `status` = #{status,jdbcType=INTEGER},
+      `type` = #{type,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  
   <select id="selectTaskProgress" resultType="com.goafanti.order.bo.TaskProgressBo">
       select a.id,a.task_id as taskId,a.already_number as alreadyNumber,date_format(a.licence_time,'%Y-%m-%d')as licenceTimes,
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTimes ,b.commodity_quantity as ingCount,

+ 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


+ 231 - 0
src/main/java/com/goafanti/common/model/TTaskMid.java

@@ -6,89 +6,315 @@ import java.io.Serializable;
 
 public class TTaskMid implements Serializable {
 	
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.id
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.tid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	private Integer tid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.cost_amount
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	private BigDecimal costAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.party_amount
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	private BigDecimal partyAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.create_time
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.certificates_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	private Integer certificatesCount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.urgent_day
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	private Integer urgentDay;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.if_material
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	private Integer ifMaterial;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.reject_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	private Integer rejectCount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.accept_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	private Integer acceptCount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.end_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	private Integer endCount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.authorize_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	private Integer authorizeCount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_task_mid.apply_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	private Integer applyCount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_task_mid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.id
+	 * @return  the value of t_task_mid.id
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public Integer getId() {
 		return id;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.id
+	 * @param id  the value for t_task_mid.id
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public void setId(Integer id) {
 		this.id = id;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.tid
+	 * @return  the value of t_task_mid.tid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public Integer getTid() {
 		return tid;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.tid
+	 * @param tid  the value for t_task_mid.tid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.cost_amount
+	 * @return  the value of t_task_mid.cost_amount
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public BigDecimal getCostAmount() {
 		return costAmount;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.cost_amount
+	 * @param costAmount  the value for t_task_mid.cost_amount
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public void setCostAmount(BigDecimal costAmount) {
 		this.costAmount = costAmount;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.party_amount
+	 * @return  the value of t_task_mid.party_amount
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public BigDecimal getPartyAmount() {
 		return partyAmount;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.party_amount
+	 * @param partyAmount  the value for t_task_mid.party_amount
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public void setPartyAmount(BigDecimal partyAmount) {
 		this.partyAmount = partyAmount;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.create_time
+	 * @return  the value of t_task_mid.create_time
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public Date getCreateTime() {
 		return createTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.create_time
+	 * @param createTime  the value for t_task_mid.create_time
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.certificates_count
+	 * @return  the value of t_task_mid.certificates_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public Integer getCertificatesCount() {
 		return certificatesCount;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.certificates_count
+	 * @param certificatesCount  the value for t_task_mid.certificates_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public void setCertificatesCount(Integer certificatesCount) {
 		this.certificatesCount = certificatesCount;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.urgent_day
+	 * @return  the value of t_task_mid.urgent_day
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public Integer getUrgentDay() {
 		return urgentDay;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.urgent_day
+	 * @param urgentDay  the value for t_task_mid.urgent_day
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public void setUrgentDay(Integer urgentDay) {
 		this.urgentDay = urgentDay;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.if_material
+	 * @return  the value of t_task_mid.if_material
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public Integer getIfMaterial() {
 		return ifMaterial;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.if_material
+	 * @param ifMaterial  the value for t_task_mid.if_material
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public void setIfMaterial(Integer ifMaterial) {
 		this.ifMaterial = ifMaterial;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.reject_count
+	 * @return  the value of t_task_mid.reject_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public Integer getRejectCount() {
 		return rejectCount;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.reject_count
+	 * @param rejectCount  the value for t_task_mid.reject_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	public void setRejectCount(Integer rejectCount) {
 		this.rejectCount = rejectCount;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.accept_count
+	 * @return  the value of t_task_mid.accept_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	public Integer getAcceptCount() {
+		return acceptCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.accept_count
+	 * @param acceptCount  the value for t_task_mid.accept_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	public void setAcceptCount(Integer acceptCount) {
+		this.acceptCount = acceptCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.end_count
+	 * @return  the value of t_task_mid.end_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	public Integer getEndCount() {
+		return endCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.end_count
+	 * @param endCount  the value for t_task_mid.end_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	public void setEndCount(Integer endCount) {
+		this.endCount = endCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.authorize_count
+	 * @return  the value of t_task_mid.authorize_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	public Integer getAuthorizeCount() {
+		return authorizeCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.authorize_count
+	 * @param authorizeCount  the value for t_task_mid.authorize_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	public void setAuthorizeCount(Integer authorizeCount) {
+		this.authorizeCount = authorizeCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_task_mid.apply_count
+	 * @return  the value of t_task_mid.apply_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	public Integer getApplyCount() {
+		return applyCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_task_mid.apply_count
+	 * @param applyCount  the value for t_task_mid.apply_count
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
+	public void setApplyCount(Integer applyCount) {
+		this.applyCount = applyCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_task_mid
+	 * @mbg.generated  Fri Dec 25 14:38:43 CST 2020
+	 */
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
@@ -104,11 +330,16 @@ public class TTaskMid implements Serializable {
 		sb.append(", urgentDay=").append(urgentDay);
 		sb.append(", ifMaterial=").append(ifMaterial);
 		sb.append(", rejectCount=").append(rejectCount);
+		sb.append(", acceptCount=").append(acceptCount);
+		sb.append(", endCount=").append(endCount);
+		sb.append(", authorizeCount=").append(authorizeCount);
+		sb.append(", applyCount=").append(applyCount);
 		sb.append(", serialVersionUID=").append(serialVersionUID);
 		sb.append("]");
 		return sb.toString();
 	}
 
+	
 
 	public TTaskMid() {}
     

+ 164 - 0
src/main/java/com/goafanti/common/model/TaskProgress.java

@@ -5,107 +5,269 @@ import java.io.Serializable;
 
 public class TaskProgress implements Serializable {
 
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.id
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.already_number
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private Integer alreadyNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.licence_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private Date licenceTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.task_id
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private Integer taskId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.create_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.accept_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private Date acceptTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.authorize_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private Date authorizeTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.patent_no
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private String patentNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.patent_name
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private String patentName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.status
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private Integer status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.type
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private Integer type;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table task_progress
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.id
+	 * @return  the value of task_progress.id
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public Integer getId() {
 		return id;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.id
+	 * @param id  the value for task_progress.id
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setId(Integer id) {
 		this.id = id;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.already_number
+	 * @return  the value of task_progress.already_number
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public Integer getAlreadyNumber() {
 		return alreadyNumber;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.already_number
+	 * @param alreadyNumber  the value for task_progress.already_number
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setAlreadyNumber(Integer alreadyNumber) {
 		this.alreadyNumber = alreadyNumber;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.licence_time
+	 * @return  the value of task_progress.licence_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public Date getLicenceTime() {
 		return licenceTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.licence_time
+	 * @param licenceTime  the value for task_progress.licence_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setLicenceTime(Date licenceTime) {
 		this.licenceTime = licenceTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.task_id
+	 * @return  the value of task_progress.task_id
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public Integer getTaskId() {
 		return taskId;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.task_id
+	 * @param taskId  the value for task_progress.task_id
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setTaskId(Integer taskId) {
 		this.taskId = taskId;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.create_time
+	 * @return  the value of task_progress.create_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public Date getCreateTime() {
 		return createTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.create_time
+	 * @param createTime  the value for task_progress.create_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.accept_time
+	 * @return  the value of task_progress.accept_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public Date getAcceptTime() {
 		return acceptTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.accept_time
+	 * @param acceptTime  the value for task_progress.accept_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setAcceptTime(Date acceptTime) {
 		this.acceptTime = acceptTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.authorize_time
+	 * @return  the value of task_progress.authorize_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public Date getAuthorizeTime() {
 		return authorizeTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.authorize_time
+	 * @param authorizeTime  the value for task_progress.authorize_time
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setAuthorizeTime(Date authorizeTime) {
 		this.authorizeTime = authorizeTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.patent_no
+	 * @return  the value of task_progress.patent_no
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public String getPatentNo() {
 		return patentNo;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.patent_no
+	 * @param patentNo  the value for task_progress.patent_no
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setPatentNo(String patentNo) {
 		this.patentNo = patentNo == null ? null : patentNo.trim();
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.patent_name
+	 * @return  the value of task_progress.patent_name
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public String getPatentName() {
 		return patentName;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.patent_name
+	 * @param patentName  the value for task_progress.patent_name
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setPatentName(String patentName) {
 		this.patentName = patentName == null ? null : patentName.trim();
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.status
+	 * @return  the value of task_progress.status
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public Integer getStatus() {
 		return status;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.status
+	 * @param status  the value for task_progress.status
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.type
+	 * @return  the value of task_progress.type
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public Integer getType() {
 		return type;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.type
+	 * @param type  the value for task_progress.type
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	public void setType(Integer type) {
 		this.type = type;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Fri Dec 25 14:12:14 CST 2020
+	 */
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
@@ -127,4 +289,6 @@ public class TaskProgress implements Serializable {
 		sb.append("]");
 		return sb.toString();
 	}
+
+	
 }

+ 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;

+ 49 - 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;
@@ -367,6 +375,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			uList=Arrays.asList(uid.split(","));
 		}
 		addUserLock(uid, TokenManager.getAdminId(), now,uList);
+		addUserTransferLog(uid,TokenManager.getAdminId(),0,null,now,uList);
 		return 1;
 	}
 
@@ -417,6 +426,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.getSalesTarget());
+				organizationSalesTargetMapper.insertSelective(obs);
+			}
+		}
 		organizationIdentityMapper.updateByPrimaryKey(oi);
 		userMapper.updateByPrimaryKeySelective(user);
 		return 1;

+ 25 - 0
src/main/java/com/goafanti/order/bo/InputProjectStatistics.java

@@ -23,6 +23,13 @@ public class InputProjectStatistics {
 	private String projectStatusName;
 	private String projectTypeName;
 	
+	private Integer province;
+	private String projectId;
+	/** 
+	 * 筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+	 */
+	private Integer screen;
+	
 	public Integer getStatus() {
 		return status;
 	}
@@ -137,6 +144,24 @@ public class InputProjectStatistics {
 	public void setProjectTypeName(String projectTypeName) {
 		this.projectTypeName = projectTypeName;
 	}
+	public Integer getProvince() {
+		return province;
+	}
+	public void setProvince(Integer province) {
+		this.province = province;
+	}
+	public String getProjectId() {
+		return projectId;
+	}
+	public void setProjectId(String projectId) {
+		this.projectId = projectId;
+	}
+	public Integer getScreen() {
+		return screen;
+	}
+	public void setScreen(Integer screen) {
+		this.screen = screen;
+	}
 	
 	
 	

+ 16 - 6
src/main/java/com/goafanti/order/bo/InputProvincialStatistics.java

@@ -4,7 +4,7 @@ public class InputProvincialStatistics {
 
 	private String startDate;
 	
-	private String EndDate;
+	private String endDate;
 	
 	private Integer province;
 	
@@ -19,12 +19,14 @@ public class InputProvincialStatistics {
 	private Integer pageSize;
 	
 	private Integer pageNo;
+	
+	private String provinceName;
 
 	private String thchDepName;
 	
 	private String projectStatusName;
 	
-	private Integer projectTypeName;
+	private String projectTypeName;
 	
 	private String projectName;
 	
@@ -49,11 +51,11 @@ public class InputProvincialStatistics {
 		this.projectStatusName = projectStatusName;
 	}
 
-	public Integer getProjectTypeName() {
+	public String getProjectTypeName() {
 		return projectTypeName;
 	}
 
-	public void setProjectTypeName(Integer projectTypeName) {
+	public void setProjectTypeName(String projectTypeName) {
 		this.projectTypeName = projectTypeName;
 	}
 
@@ -130,11 +132,11 @@ public class InputProvincialStatistics {
 	}
 
 	public String getEndDate() {
-		return EndDate;
+		return endDate;
 	}
 
 	public void setEndDate(String endDate) {
-		EndDate = endDate;
+		this.endDate = endDate;
 	}
 
 	public Integer getStatus() {
@@ -144,6 +146,14 @@ public class InputProvincialStatistics {
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
+
+	public String getProvinceName() {
+		return provinceName;
+	}
+
+	public void setProvinceName(String provinceName) {
+		this.provinceName = provinceName;
+	}
 	
 	
 }

+ 16 - 16
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -23,12 +23,12 @@ public class OutProjectStatistics {
 	private Integer  setUpStatus;
 	private Integer  highTechstatus;
 	private String setUpTime;
-	private String  spotCheckStatus;
+	private Integer  spotCheckStatus;
 	private String  contactMobile;
 	private String  legalPersonTel;
 	private String  certificateNumber;
 	private String  declarationBatch;
-	private String  commodityQuantity;
+	private Integer  commodityQuantity;
 	private BigDecimal  commodityPrice;
 	
 	
@@ -42,7 +42,7 @@ public class OutProjectStatistics {
 	/**加急天数*/
 	private Integer	urgentDay;
 	/**有无材料*/
-	private String	ifMaterial;
+	private Integer	ifMaterial;
 	/**成本*/
 	private BigDecimal	costAmount;
 	/**利润*/
@@ -50,7 +50,7 @@ public class OutProjectStatistics {
 	/**驳回数*/
 	private Integer	rejectCount;
 	/**专利编号*/
-	private String	patentNumber;
+	private String	patentNo;
 	/**专利名称*/
 	private String	patentName;
 	/**受理时间*/
@@ -70,10 +70,10 @@ public class OutProjectStatistics {
 	public void setSetUpTime(String setUpTime) {
 		this.setUpTime = setUpTime;
 	}
-	public String getSpotCheckStatus() {
+	public Integer getSpotCheckStatus() {
 		return spotCheckStatus;
 	}
-	public void setSpotCheckStatus(String spotCheckStatus) {
+	public void setSpotCheckStatus(Integer spotCheckStatus) {
 		this.spotCheckStatus = spotCheckStatus;
 	}
 	public String getContactMobile() {
@@ -100,10 +100,10 @@ public class OutProjectStatistics {
 	public void setDeclarationBatch(String declarationBatch) {
 		this.declarationBatch = declarationBatch;
 	}
-	public String getCommodityQuantity() {
+	public Integer getCommodityQuantity() {
 		return commodityQuantity;
 	}
-	public void setCommodityQuantity(String commodityQuantity) {
+	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
 	}
 	public BigDecimal getCommodityPrice() {
@@ -211,10 +211,10 @@ public class OutProjectStatistics {
 	public void setUrgentDay(Integer urgentDay) {
 		this.urgentDay = urgentDay;
 	}
-	public String getIfMaterial() {
+	public Integer getIfMaterial() {
 		return ifMaterial;
 	}
-	public void setIfMaterial(String ifMaterial) {
+	public void setIfMaterial(Integer ifMaterial) {
 		this.ifMaterial = ifMaterial;
 	}
 	public BigDecimal getCostAmount() {
@@ -238,12 +238,6 @@ public class OutProjectStatistics {
 	public void setRejectCount(Integer rejectCount) {
 		this.rejectCount = rejectCount;
 	}
-	public String getPatentNumber() {
-		return patentNumber;
-	}
-	public void setPatentNumber(String patentNumber) {
-		this.patentNumber = patentNumber;
-	}
 	public String getPatentName() {
 		return patentName;
 	}
@@ -274,5 +268,11 @@ public class OutProjectStatistics {
 	public void setSpecialComment(String specialComment) {
 		this.specialComment = specialComment;
 	}
+	public String getPatentNo() {
+		return patentNo;
+	}
+	public void setPatentNo(String patentNo) {
+		this.patentNo = patentNo;
+	}
 
 }

+ 61 - 0
src/main/java/com/goafanti/order/bo/OutProvincialStatistics.java

@@ -10,6 +10,36 @@ public class OutProvincialStatistics {
 	
 	private String projectStatus;
 	
+	private Integer province;
+	private String thchDepId;
+	private String bpId;
+	
+	
+	
+	public Integer getProvince() {
+		return province;
+	}
+
+	public void setProvince(Integer province) {
+		this.province = province;
+	}
+
+	public String getThchDepId() {
+		return thchDepId;
+	}
+
+	public void setThchDepId(String thchDepId) {
+		this.thchDepId = thchDepId;
+	}
+
+	public String getBpId() {
+		return bpId;
+	}
+
+	public void setBpId(String bpId) {
+		this.bpId = bpId;
+	}
+
 	/** 库存数 */
 	private Integer stockCount;
 	/** 派单数 */
@@ -28,6 +58,12 @@ public class OutProvincialStatistics {
 	private Integer authorizeCount;
 	/** 驳回数 */
 	private Integer rejectCount;
+	/** 下证数 */
+	private Integer certificatesCount;
+	/** 申请数 */
+	private Integer	applyCount;
+	/** 公示数 */
+	private Integer	publicityCount;
 	
 	private BigDecimal amountCount;
 	
@@ -36,6 +72,7 @@ public class OutProvincialStatistics {
 	private BigDecimal profit;
 	
 	
+	
 
 	
 	
@@ -161,6 +198,30 @@ public class OutProvincialStatistics {
 	public void setProfit(BigDecimal profit) {
 		this.profit = profit;
 	}
+
+	public Integer getCertificatesCount() {
+		return certificatesCount;
+	}
+
+	public void setCertificatesCount(Integer certificatesCount) {
+		this.certificatesCount = certificatesCount;
+	}
+
+	public Integer getApplyCount() {
+		return applyCount;
+	}
+
+	public void setApplyCount(Integer applyCount) {
+		this.applyCount = applyCount;
+	}
+
+	public Integer getPublicityCount() {
+		return publicityCount;
+	}
+
+	public void setPublicityCount(Integer publicityCount) {
+		this.publicityCount = publicityCount;
+	}
 	
 	
 	

+ 7 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -10,6 +10,7 @@ public class TOrderTaskDetailBo {
 	private String orderNo;
 	private String userName;
 	private String cname;
+	private Integer sort;
 	private String taskReceiver;
 	private String receiverName;
 	private Integer projectStatus;
@@ -484,6 +485,12 @@ public class TOrderTaskDetailBo {
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
 	}
+	public Integer getSort() {
+		return sort;
+	}
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
 	
 	
 }

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

@@ -71,7 +71,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return res.data(orderNewService.addOrderTask(t));
 	}
 	/**
-	 * 修改项目
+	 * 修改项目(营销员)
 	 * @param t
 	 * @return
 	 */

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

@@ -172,7 +172,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	}
 	
 	/**
-	 * 	新增项目申报进度
+	 * 	修改项目申报进度
 	 */
 	@RequestMapping(value="/updateTaskProgress" ,method = RequestMethod.POST)
 	public Result updateTaskProgress(TaskProgressBo t){

+ 0 - 2
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -7,10 +7,8 @@ import javax.servlet.http.HttpServletResponse;
 
 
 import com.goafanti.common.model.TTaskHours;
-import com.goafanti.common.model.TaskProgressLog;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.OutTaskProgressLog;
-import com.goafanti.order.bo.Outproject;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TOrderTaskListBo;
 import com.goafanti.order.bo.TaskLogBo;

+ 20 - 16
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -426,19 +426,20 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tl.setAid(TokenManager.getAdminId());
 		if (t.getStatus()!=null) {
 			if (t.getStatus()!=task2.getStatus()) {
-				String s="将当前项目状态修改为";
-				//0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+				String s="将当前项目状态修改为:";
+				//状态 0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单
 				if (t.getStatus()==0)s+="未开始";
 				else if (t.getStatus()==1)s+="已开始";
 				else if (t.getStatus()==2)s+="已暂停";
-				else if (t.getStatus()==3)s+="已完成";
-				else if (t.getStatus()==4)s+="已驳回";
-				else if (t.getStatus()==5)s+="以退单";
+				else if (t.getStatus()==3)s+="已驳回";
+				else if (t.getStatus()==4)s+="已完成";
+				else if (t.getStatus()==5)s+="项目已完成 已退单";
+				else if (t.getStatus()==6)s+="项目未完成 已退单";
 				tl.setContent(s);
 				taskLogMapper.insertSelective(tl);
 			}
 			if (t.getTaskRefund()!=task2.getTaskRefund()) {
-				String s="将当前项目退单修改为";
+				String s="将当前项目退单修改为:";
 				if (t.getTaskRefund()==0)s+="未完成";
 				if (t.getTaskRefund()==1)s+="已完成";
 				if (t.getTaskRefund()==2)s+="其他";
@@ -446,7 +447,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				taskLogMapper.insertSelective(tl);
 			}
 			if (t.getFormRetrieve()!=task2.getFormRetrieve()) {
-				String s="将当前满意度表格回收修改为";
+				String s="将当前满意度表格回收修改为:";
 				if (t.getFormRetrieve()==0)s+="未回收";
 				if (t.getFormRetrieve()==1)s+="已回收";
 				if (t.getFormRetrieve()==2)s+="其他";
@@ -779,7 +780,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		TaskProgressLog tpl=new TaskProgressLog(t.getTaskId(),t.getPatentName(),0,new Date());
 		taskProgressLogMapper.insertSelective(tpl);
 		int i=taskProgressMapper.insertSelective(tp);
-		tTaskMidMapper.updateCountBytid(t.getTaskId());
+		countByTid(tp.getTaskId(),tp.getType());
 		return i; 
 	}
 	
@@ -804,7 +805,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		TaskProgressLog tpl=new TaskProgressLog(t.getTaskId(),t.getPatentName(),2,new Date());
 		taskProgressLogMapper.insertSelective(tpl);
 		int i=taskProgressMapper.updateByPrimaryKeySelective(tp);
-		tTaskMidMapper.updateCountBytid(t.getTaskId());
+		countByTid(tp.getTaskId(),tp.getType());
 		return i; 
 	}
 
@@ -817,12 +818,20 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		int i=taskProgressMapper.deleteByPrimaryKey(id);
 		TaskProgressLog tpl=new TaskProgressLog(tp.getTaskId(),tp.getPatentName(),1,new Date());
 		taskProgressLogMapper.insertSelective(tpl);
-		tTaskMidMapper.updateCountBytid(tp.getTaskId());
+		countByTid(tp.getTaskId(),tp.getType());
 		return i;
 	}
+	private void countByTid(Integer taskId, Integer type) {
+		TTaskMid ttm=tTaskMidMapper.selectCountBytid(taskId,type);
+		tTaskMidMapper.updateByPrimaryKeySelective(ttm);
+		
+	}
+
+
+
 	@Override
 	public List<TaskProgressBo> selectTaskProgress(Integer tid) {
-		List<TaskProgressBo>  l=taskProgressMapper.selectTaskProgress(tid);
+		List<TaskProgressBo> l=taskProgressMapper.selectTaskProgress(tid);
 		int notcount=0;
 		for (TaskProgressBo t : l) {
 			notcount+=t.getAlreadyNumber();
@@ -1010,8 +1019,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			 out.close(); 
 		}
 		
-	
-		
 	}
 
 
@@ -1020,8 +1027,5 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public List<OutTaskProgressLog> selectTaskProgressLog(Integer tid) {
 		return taskProgressLogMapper.selectTaskProgressLog(tid);
 	}
-
-
-	
 	
 }

+ 65 - 31
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -64,12 +64,18 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 			}else if (ps.getProjectAmount()==6) {s=10;e=30;
 			}else if (ps.getProjectAmount()==7) {s=30;e=50;
 			}else if (ps.getProjectAmount()==8) {s=50;e=80;
-			}else if (ps.getProjectAmount()==9) {s=80;e=9999;
+			}else if (ps.getProjectAmount()==9) {s=80;
 			}
+			params.put("projectAmount", ps.getProjectAmount());
 			params.put("amountStart", s);
 			params.put("amountEnd", e);
 		}
 		params.put("status",ps.getStatus()==null?0:ps.getStatus());
+		
+		
+		if(ps.getProvince()!=null)	params.put("province", ps.getProvince());
+		if(ps.getProjectId()!=null) params.put("projectId", ps.getProjectId());
+		if(ps.getScreen()!=null) params.put("screen", ps.getScreen());
 		if(ps.getPageNo()!=null)pageNo=ps.getPageNo();
 		if(ps.getPageSize()!=null)pageSize=ps.getPageSize();
 		Pagination<OutProjectStatistics> p = (Pagination<OutProjectStatistics>)findPage("selectProjectStatisticsListByPage",
@@ -82,10 +88,11 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		OutputStream out = response.getOutputStream();
 		try {
 			if(ib.getPageSize()==null)ib.setPageSize(9999999);
+			if(ib.getStatus()==null)ib.setStatus(0);
 			@SuppressWarnings("unchecked")
 			List<OutProjectStatistics> list=  (List<OutProjectStatistics>) selectTaskList(ib).getList();
 			String[] comment = {"派单时间","派单省份","订单部门","营销员","合同编号","订单编号","签单客户","项目类型","项目名称","负责部门",
-					"咨询师/咨询经理","项目状态","签单金额","特别说明"};
+					"咨询师/咨询经理","项目状态"};
 			List<String> ls = new ArrayList<String>();
 			Collections.addAll(ls, comment);
     		if (ib.getStatus()==1) {
@@ -105,6 +112,8 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 				String[] ss= {"是否高新","项目数量/下证数","驳回数","专利号","专利名称","受理时间","下证时间","成本","利润"};
 				Collections.addAll(ls, ss);
 			}
+    		ls.add("签单金额");
+    		ls.add("特别说明");
     		comment= ls.toArray(new String[ls.size()]);
     		String fileName ="项目汇总表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"项目汇总表");
@@ -136,12 +145,17 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				case "负责部门": o = ob.getTechDepName(); break;
     				case "咨询师/咨询经理": o = ob.getTechName(); break;
     				case "项目状态": o = ProjectType.getValueByCode(ob.getProjectStatus()); break;
-    				case "签单金额": o = ob.getCommodityPrice().toString(); break;
-    				case "特别说明": o = ob.getTaskComment(); break;
+    				
     				//是否立项 立项时间 是否抽查 联系人电话 法人电话 证书编号 申报批次
-    				case "是否立项": o = ob.getSetUpStatus()==1?"是":"否"; break;
+    				case "是否立项": o = ob.getSetUpStatus()==null?"":ob.getSetUpStatus()==1?"是":"否"; break;
     				case "立项时间": o = ob.getSetUpTime(); break;
-    				case "是否抽查": o = ob.getSpotCheckStatus(); break;
+    				case "是否抽查": 
+    					//是否抽查 0否 1未通过 2通过
+    					if (ob.getSpotCheckStatus()==null) o="";
+    					if (ob.getSpotCheckStatus()==0) o="否";
+    					if (ob.getSpotCheckStatus()==1) o="未通过";
+    					if (ob.getSpotCheckStatus()==2) o="通过";
+    					break;
     				case "联系人电话": o = ob.getContactMobile(); break;
     				case "法人电话": o = ob.getLegalPersonTel(); break;
     				case "证书编号": o = ob.getCertificateNumber(); break;
@@ -149,17 +163,21 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				//"下证时间"
     				case "下证时间": o = ob.getLicenceTime(); break;
     				//"软著数量/已下证","有无材料","加急天数","下证时间","证书编号","成本","利润"
-    				case "软著数量/已下证": o = ob.getCommodityQuantity()+"/"+ob.getCertificatesCount(); break;
-    				case "有无材料": o = ob.getIfMaterial(); break;
-    				case "加急天数": o = ob.getUrgentDay().toString(); break;
-    				case "成本": o = ob.getCostAmount().toString(); break;
-    				case "利润": o = ob.getProfit().toString(); break;
+    				case "软著数量/已下证": o = StringUtils.join(ob.getCommodityQuantity(),"/",ob.getCertificatesCount()); break;
+    				case "有无材料": o = ob.getIfMaterial()==null?"":ob.getIfMaterial()==1?"是":"否"; break;
+    				case "加急天数": o = ob.getUrgentDay()==null?"":ob.getUrgentDay()==1?"是":"否"; break;
+    				case "成本": o = ob.getCostAmount().stripTrailingZeros().toPlainString(); break;
+    				case "利润": o = ob.getProfit().stripTrailingZeros().toPlainString(); break;
     				//"是否高新","项目数量/下证数","驳回数","专利号","专利名称","受理时间","下证时间","成本","利润"
     				case "是否高新": o = ob.getHighTechstatus()==null?"":ob.getHighTechstatus()==1?"是":"否"; break;
+    				case "项目数量/下证数": o = StringUtils.join(ob.getCommodityQuantity(),"/",ob.getCertificatesCount()); break;
     				case "驳回数": o = ob.getRejectCount()==null?"":ob.getRejectCount().toString(); break;
-    				case "专利号": o = ob.getPatentNumber(); break;
+    				case "专利号": o = ob.getPatentNo(); break;
     				case "专利名称": o = ob.getPatentName(); break;
     				case "受理时间": o = ob.getAcceptTime(); break;
+    				
+    				case "签单金额": o = ob.getCommodityPrice().stripTrailingZeros().toPlainString(); break;
+    				case "特别说明": o = ob.getSpecialComment(); break;
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);
@@ -242,7 +260,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		if(is.getProjectType()!=null)params.put("projectType", is.getProjectType());
 		if(is.getProvince()!=null)params.put("province", is.getProvince());
 		if(is.getProjectId()!=null)params.put("projectId", is.getProjectId());
-		params.put("status",is.getStatus()==null?2:is.getStatus());
+		params.put("status",is.getStatus()==null?0:is.getStatus());
 		if(is.getPageNo()!=null)pageNo=is.getPageNo();
 		if(is.getPageSize()!=null)pageSize=is.getPageSize();
 		Pagination<OutProvincialStatistics> p = (Pagination<OutProvincialStatistics>)findPage("selectProvincialStatisticsListByPage",
@@ -255,33 +273,33 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		OutputStream out = response.getOutputStream();
 		try {
 			if(ib.getPageSize()==null)ib.setPageSize(9999999);
+			if(ib.getStatus()==null)ib.setStatus(0);
 			@SuppressWarnings("unchecked")
 			List<OutProvincialStatistics> list=  (List<OutProvincialStatistics>) selectProvincialStatistics(ib).getList();
 			//派单賞份负责部门项目类別陸存数(个)派单数(个)下证数(个)签单额(万元)成本(万元)利润(万元)
-			String[] comment = {"派单省份","负责部门","项目别类","库存数(个)","派单数(个)"};
+			String[] comment = {"派单省份","负责部门","项目别类","库存数","派单数"};
 			List<String> ls = new ArrayList<String>();
 			Collections.addAll(ls, comment);
     		if (ib.getStatus()==1) {
 				//高新
     			//是否立项 立项时间 是否抽查 联系人电话 法人电话 证书编号 申报批次
-    			String[] ss= {"完成数","立项数","抽查数","未通过","法人电话","证书编号","申报批次"};
+    			String[] ss= {"完成数","立项数","抽查数","未通过"};
     			Collections.addAll(ls, ss);
-			}else if (ib.getStatus()==2) {
+			}else if (ib.getStatus()==2||ib.getStatus()==3) {
 				//发明专利、实用新型
 				ls.add("受理数");
-				ls.add("完结数");
+				ls.add("完结数");
 				ls.add("授权数");
 				ls.add("驳回数");
 				
-			}else if (ib.getStatus()==3) {
+			}else if (ib.getStatus()==4) {
 				//软著
 				ls.add("下证数");
-			}else if (ib.getStatus()==4) {
+			}else if (ib.getStatus()==5) {
 				//商标
 				String[] ss= {"申请数","驳回数","下证数"};
 				Collections.addAll(ls, ss);
-			}else if (ib.getStatus()==5) {
-				//商标
+			}else if (ib.getStatus()==0) {
 				String[] ss= {"完成数","公示数"};
 				Collections.addAll(ls, ss);
 			}
@@ -309,13 +327,28 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				case "派单省份": o = ob.getProvinceName(); break;
     				case "负责部门": o = ob.getThchDepName(); break;
     				case "项目别类": o = ob.getProjectStatus(); break;
-    				case "库存数(个)": o = ob.getStockCount().toString(); break;
-    				case "派单数(个)": o = ob.getDistributeCount().toString(); break;
-    				case "下证数(个)": o = ob.getCompleteCount().toString(); break;
-    				case "签单数(个)": o = ob.getSetUpCount().toString(); break;
-    				case "签单额(万元)": o = ob.getAmountCount().toString(); break;
-    				case "成本(万元)": o = ob.getCostAmount().toString(); break;
-    				case "利润(万元)": o = ob.getProfit().toString(); break;
+    				case "库存数": o = ob.getStockCount().toString(); break;
+    				case "派单数": o = ob.getDistributeCount().toString(); break;
+    				//"完成数","立项数","抽查数","未通过"
+    				case "完成数": o = ob.getCompleteCount().toString(); break;
+    				case "立项数": o = ob.getSetUpCount().toString(); break;
+    				case "抽查数": o = ob.getSpotCheckCount().toString(); break;
+    				case "未通过": o = ob.getFailedCount().toString(); break;
+    				//受理数 完结数 授权数 驳回数
+    				case "受理数": o = ob.getAcceptCount().toString(); break;
+    				case "完结数": o = ob.getCompleteCount().toString(); break;
+    				case "授权数": o = ob.getAuthorizeCount().toString(); break;
+    				case "驳回数": o = ob.getRejectCount().toString(); break;
+    				//下证数
+    				case "下证数": o = ob.getCertificatesCount().toString(); break;
+    				//"申请数","驳回数","下证数"
+    				case "申请数": o = ob.getApplyCount().toString(); break;
+    				//"完成数","公示/立项数"
+    				case "公示数": o = ob.getPublicityCount().toString(); break;
+    				
+    				case "签单额(万元)": o = ob.getAmountCount().stripTrailingZeros().toPlainString(); break;
+    				case "成本(万元)": o = ob.getCostAmount().stripTrailingZeros().toPlainString(); break;
+    				case "利润(万元)": o = ob.getProfit().stripTrailingZeros().toPlainString(); break;
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);
@@ -343,10 +376,11 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		int i=1;
 		if(ib.getStartDate()!=null) str=StringUtils.join(str,i++,"-开始时间:",ib.getStartDate(),"   ");
 		if(ib.getEndDate()!=null)str=StringUtils.join(str,i++,"-结束时间:",ib.getEndDate(),"   ");
+		if(ib.getProvince()!=null)str=StringUtils.join(str,i++,"-省份:",ib.getProvinceName(),"   ");
 		if(ib.getThchDepId()!=null)str=StringUtils.join(str,i++,"-责任部门:",ib.getThchDepName(),"   ");
-		if(ib.getProjectStatus()!=null)str=StringUtils.join(str,i++,"-项目别类:",ib.getThchDepName(),"   ");
-		if(ib.getProjectType()!=null)str=StringUtils.join(str,i++,"-项目分类:",ib.getThchDepName(),"   ");
-		if(ib.getProjectId()!=null)str=StringUtils.join(str,i++,"-项目名称:",ib.getThchDepName(),"   ");
+		if(ib.getProjectStatus()!=null)str=StringUtils.join(str,i++,"-项目别类:",ib.getProjectStatusName(),"   ");
+		if(ib.getProjectType()!=null)str=StringUtils.join(str,i++,"-项目分类:",ib.getProjectTypeName(),"   ");
+		if(ib.getProjectId()!=null)str=StringUtils.join(str,i++,"-项目名称:",ib.getProjectName(),"   ");
 		if(i==1)StringUtils.join(str,"无");
 		return str;
 	}

+ 1 - 0
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -561,6 +561,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				&&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
 			return false;
 		}  else if (NewOrderDunType.ZSCQ_GS_SL_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())) {
+			// 0 正常 1专利 2软著 3审计 4双软 5高新 6商标
 			if (tt.getBpType()==1&&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
 				return false;
 			}else if (tt.getBpType()!=1&&(tt.getProjectStatus()>3&&tt.getProjectStatus()<10)){

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -59,7 +59,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.60
+static.host=//static.jishutao.com/1.1.61
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload

+ 2 - 1
src/main/webapp/WEB-INF/web.xml

@@ -1,4 +1,5 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
          http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
 
 	<display-name>AFT</display-name>