Browse Source

Merge branch 'test' of jishutao/aft into prod

gitadmin 7 years ago
parent
commit
fdca4b8ea0
25 changed files with 1925 additions and 450 deletions
  1. 1 1
      GeneratorConfig.xml
  2. 14 0
      src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java
  3. 2 0
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  4. 16 0
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  5. 11 11
      src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java
  6. 18 16
      src/main/java/com/goafanti/common/dao/UserMapper.java
  7. 100 20
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  8. 6 0
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml
  9. 104 31
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  10. 269 10
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  11. 261 189
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  12. 336 16
      src/main/java/com/goafanti/common/model/OrganizationIdentityExample.java
  13. 191 135
      src/main/java/com/goafanti/common/model/User.java
  14. 356 16
      src/main/java/com/goafanti/common/model/UserExample.java
  15. 1 1
      src/main/java/com/goafanti/common/utils/BeanUtilsExt.java
  16. 66 0
      src/main/java/com/goafanti/customer/bo/CustomerListIn.java
  17. 12 0
      src/main/java/com/goafanti/customer/bo/CustomerListOut.java
  18. 52 0
      src/main/java/com/goafanti/customer/bo/CustomerOrganizationDetailBo.java
  19. 2 0
      src/main/java/com/goafanti/customer/bo/CustomerPersonalDetailBo.java
  20. 26 1
      src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java
  21. 23 0
      src/main/java/com/goafanti/customer/service/CustomerService.java
  22. 42 3
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  23. 4 0
      src/main/java/com/goafanti/order/controller/AdminOrderApiController.java
  24. 2 0
      src/main/java/com/goafanti/order/service/OrderService.java
  25. 10 0
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

+ 1 - 1
GeneratorConfig.xml

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

+ 14 - 0
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -754,4 +754,18 @@ public class AdminAchievementApiController extends CertifyApiController {
     	Result res=new Result();
     	return res.data(AchievementPublishPageService.getBranchInformation());
     }
+	/**
+	 * 客户知识产权列表(成果) 
+	 * @return
+	 */
+    @RequestMapping(value="/listUserAchievement",method = RequestMethod.GET)
+    private Result listUserAchievement(String uid,Integer pageNo, Integer pageSize){
+    	Result res=new Result();
+    	if (StringUtils.isBlank(uid)) {
+            res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
+            return res;
+        }
+    	return res.data(achievementService.listUserAchievement(uid,pageNo,pageSize));
+    }
+    
 }

+ 2 - 0
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -107,4 +107,6 @@ public interface AchievementService {
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
+	Pagination<AchievementListBo> listUserAchievement(String uid, Integer pageNo, Integer pageSize);
+
 }

+ 16 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -898,4 +898,20 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.insert(a);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<AchievementListBo> listUserAchievement(String uid, Integer pageNo, Integer pageSize) {
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0 ) {
+			pageSize = 10;
+		}
+		Map<String, Object> params=new HashMap<>();
+		params.put("ownerId", uid);
+		return (Pagination<AchievementListBo>) findPage("findOrgOwnerAchievementListByPage",
+				"findOrgOwnerAchievementCount",params,pageNo, pageSize);
+	}
+
 }

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

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

+ 18 - 16
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -27,67 +27,67 @@ import com.goafanti.report.bo.marketingESBo;
 public interface UserMapper {
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	long countByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	int deleteByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	int insert(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	int insertSelective(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	List<User> selectByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	User selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	int updateByExample(@Param("record") User record, @Param("example") UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	int updateByPrimaryKeySelective(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	int updateByPrimaryKey(User record);
 
@@ -148,7 +148,7 @@ public interface UserMapper {
 	User findUserAccountDetail(@Param("uid")String uid);
 
 	/**
-	 * 查看客户联系人列�??
+	 * 查看客户联系人列��????
 	 * @param uid
 	 * @return
 	 */
@@ -169,7 +169,7 @@ public interface UserMapper {
 	List<BusinessListBo> findBusinessByFollowId(String followId);
 
 	/**
-	 * 查询客户�??有联系人
+	 * 查询客户��????有联系人
 	 * @param uid
 	 * @return
 	 */
@@ -213,12 +213,12 @@ public interface UserMapper {
 	int updateRefusedCustomer(@Param("id")String id,  @Param("nickname")String nickname, @Param("mobile")String mobile, @Param("societyTag")String societyTag);
 
 	/**
-	 * 查看客户锁定的业
+	 * 查看客户锁定的业��??
 	 * @param uid 摰X�ID
 	 * @param aid 管理员ID
 	 * @param businessProjectId 业务项目的ID
-	 * @param type 锁定类型  0-客户 1-业务
-	 * @param status 锁定状态 0-锁定,1-待释放,2-已释放
+	 * @param type 锁定类型  0-客户 ��??1-业务
+	 * @param status 锁定状�?? 0-锁定��??1-待释放,2-已释��??
 	 * @return
 	 */
 	List<LockingReleaseBo> selectLockedProject(@Param("uid")String uid,@Param("aid")String aid,@Param("businessProjectId")String businessProjectId, @Param("type")Integer type,@Param("status")Integer status);
@@ -236,5 +236,7 @@ public interface UserMapper {
 	marketingESBo marketingDepStatistics(@Param("depId")String depId, @Param("dailyStart")String dailyStart, @Param("dailyEnd")String dailyEnd);
 
 	CountMarketingStatisticsBo countmarketingDepStatistics(@Param("depId")String depId, @Param("dailyStart")String dailyStart, @Param("dailyEnd")String dailyEnd);
+
+	int checkCustomerInformation(String uid);
 	
 }

+ 100 - 20
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

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

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -1064,6 +1064,9 @@
 			a.technician_id = e.id left join department_management f on 
 			c.department_id = f.id
 		where a.order_type = 0
+		<if test="orderNo != null">
+			and a.order_no= #{orderNo,jdbcType=VARCHAR}
+		</if>
 		<if test="salesmanId != null">
 			and a.salesman_id = #{salesmanId,jdbcType=VARCHAR}
 		</if>
@@ -1136,6 +1139,9 @@
 			a.technician_id = e.id left join department_management f on 
 			c.department_id = f.id
 		where a.order_type = 0
+		<if test="orderNo != null">
+			and a.order_no= #{orderNo,jdbcType=VARCHAR}
+		</if>
 		<if test="salesmanId != null">
 			and a.salesman_id = #{salesmanId,jdbcType=VARCHAR}
 		</if>

+ 104 - 31
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="mobile" jdbcType="VARCHAR" property="mobile" />
@@ -31,14 +31,19 @@
     <result column="audit_opinion" jdbcType="VARCHAR" property="auditOpinion" />
     <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
     <result column="share_type" jdbcType="INTEGER" property="shareType" />
-	<result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="transfer_time" jdbcType="TIMESTAMP" property="transferTime" />
+    <result column="information_maintainer" jdbcType="VARCHAR" property="informationMaintainer" />
+    <result column="core_technology" jdbcType="VARCHAR" property="coreTechnology" />
+    <result column="accomplish_situation" jdbcType="VARCHAR" property="accomplishSituation" />
+    <result column="intellectual_property" jdbcType="VARCHAR" property="intellectualProperty" />
+    <result column="credit_rating" jdbcType="INTEGER" property="creditRating" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -72,7 +77,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -106,18 +111,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
-    id, mobile, password, nickname, email, create_time, number, lvl, type, aid, mid, 
-    status, source, update_time, company_logo_url, head_portrait_url, society_tag, introduction, 
-    value_added_tag, organization_id, share_type,identify_name, background_url, audit_opinion, audit_status, 
-    share_type, aid, transfer_time
+    id, mobile, password, nickname, email, create_time, number, lvl, type, mid, status, 
+    source, update_time, company_logo_url, head_portrait_url, society_tag, introduction, 
+    value_added_tag, organization_id, identify_name, background_url, audit_opinion, audit_status, 
+    share_type, aid, transfer_time, information_maintainer, core_technology, accomplish_situation, 
+    intellectual_property, credit_rating
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     select
     <if test="distinct">
@@ -136,7 +142,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 16:41:39 CST 2017.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -147,7 +153,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 16:41:39 CST 2017.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     delete from user
     where id = #{id,jdbcType=VARCHAR}
@@ -156,7 +162,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 16:41:39 CST 2017.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     delete from user
     <if test="_parameter != null">
@@ -167,7 +173,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 16:41:39 CST 2017.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     insert into user (id, mobile, password, 
       nickname, email, create_time, 
@@ -177,7 +183,9 @@
       introduction, value_added_tag, organization_id, 
       identify_name, background_url, audit_opinion, 
       audit_status, share_type, aid, 
-      transfer_time)
+      transfer_time, information_maintainer, 
+      core_technology, accomplish_situation, intellectual_property, 
+      credit_rating)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
       #{nickname,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{number,jdbcType=BIGINT}, #{lvl,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{mid,jdbcType=VARCHAR}, 
@@ -186,13 +194,15 @@
       #{introduction,jdbcType=VARCHAR}, #{valueAddedTag,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, 
       #{identifyName,jdbcType=VARCHAR}, #{backgroundUrl,jdbcType=VARCHAR}, #{auditOpinion,jdbcType=VARCHAR}, 
       #{auditStatus,jdbcType=INTEGER}, #{shareType,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
-      #{transferTime,jdbcType=TIMESTAMP})
+      #{transferTime,jdbcType=TIMESTAMP}, #{informationMaintainer,jdbcType=VARCHAR}, 
+      #{coreTechnology,jdbcType=VARCHAR}, #{accomplishSituation,jdbcType=VARCHAR}, #{intellectualProperty,jdbcType=VARCHAR}, 
+      #{creditRating,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.User">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 16:41:39 CST 2017.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     insert into user
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -274,6 +284,21 @@
       <if test="transferTime != null">
         transfer_time,
       </if>
+      <if test="informationMaintainer != null">
+        information_maintainer,
+      </if>
+      <if test="coreTechnology != null">
+        core_technology,
+      </if>
+      <if test="accomplishSituation != null">
+        accomplish_situation,
+      </if>
+      <if test="intellectualProperty != null">
+        intellectual_property,
+      </if>
+      <if test="creditRating != null">
+        credit_rating,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -354,13 +379,28 @@
       <if test="transferTime != null">
         #{transferTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="informationMaintainer != null">
+        #{informationMaintainer,jdbcType=VARCHAR},
+      </if>
+      <if test="coreTechnology != null">
+        #{coreTechnology,jdbcType=VARCHAR},
+      </if>
+      <if test="accomplishSituation != null">
+        #{accomplishSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="intellectualProperty != null">
+        #{intellectualProperty,jdbcType=VARCHAR},
+      </if>
+      <if test="creditRating != null">
+        #{creditRating,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.UserExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     select count(*) from user
     <if test="_parameter != null">
@@ -371,7 +411,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     update user
     <set>
@@ -426,8 +466,6 @@
       <if test="record.introduction != null">
         introduction = #{record.introduction,jdbcType=VARCHAR},
       </if>
-      
-    
       <if test="record.valueAddedTag != null">
         value_added_tag = #{record.valueAddedTag,jdbcType=VARCHAR},
       </if>
@@ -452,11 +490,24 @@
       <if test="record.aid != null">
         aid = #{record.aid,jdbcType=VARCHAR},
       </if>
-     
-     
       <if test="record.transferTime != null">
         transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.informationMaintainer != null">
+        information_maintainer = #{record.informationMaintainer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.coreTechnology != null">
+        core_technology = #{record.coreTechnology,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accomplishSituation != null">
+        accomplish_situation = #{record.accomplishSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="record.intellectualProperty != null">
+        intellectual_property = #{record.intellectualProperty,jdbcType=VARCHAR},
+      </if>
+      <if test="record.creditRating != null">
+        credit_rating = #{record.creditRating,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -466,7 +517,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     update user
     set id = #{record.id,jdbcType=VARCHAR},
@@ -486,7 +537,6 @@
       head_portrait_url = #{record.headPortraitUrl,jdbcType=VARCHAR},
       society_tag = #{record.societyTag,jdbcType=VARCHAR},
       introduction = #{record.introduction,jdbcType=VARCHAR},
-      
       value_added_tag = #{record.valueAddedTag,jdbcType=VARCHAR},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       identify_name = #{record.identifyName,jdbcType=VARCHAR},
@@ -495,7 +545,12 @@
       audit_status = #{record.auditStatus,jdbcType=INTEGER},
       share_type = #{record.shareType,jdbcType=INTEGER},
       aid = #{record.aid,jdbcType=VARCHAR},
-      transfer_time = #{record.transferTime,jdbcType=TIMESTAMP}
+      transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
+      information_maintainer = #{record.informationMaintainer,jdbcType=VARCHAR},
+      core_technology = #{record.coreTechnology,jdbcType=VARCHAR},
+      accomplish_situation = #{record.accomplishSituation,jdbcType=VARCHAR},
+      intellectual_property = #{record.intellectualProperty,jdbcType=VARCHAR},
+      credit_rating = #{record.creditRating,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -504,7 +559,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     update user
     <set>
@@ -556,7 +611,6 @@
       <if test="introduction != null">
         introduction = #{introduction,jdbcType=VARCHAR},
       </if>
-      
       <if test="valueAddedTag != null">
         value_added_tag = #{valueAddedTag,jdbcType=VARCHAR},
       </if>
@@ -581,10 +635,24 @@
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
-      
       <if test="transferTime != null">
         transfer_time = #{transferTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="informationMaintainer != null">
+        information_maintainer = #{informationMaintainer,jdbcType=VARCHAR},
+      </if>
+      <if test="coreTechnology != null">
+        core_technology = #{coreTechnology,jdbcType=VARCHAR},
+      </if>
+      <if test="accomplishSituation != null">
+        accomplish_situation = #{accomplishSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="intellectualProperty != null">
+        intellectual_property = #{intellectualProperty,jdbcType=VARCHAR},
+      </if>
+      <if test="creditRating != null">
+        credit_rating = #{creditRating,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -592,7 +660,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Sat Jun 09 10:51:48 CST 2018.
     -->
     update user
     set mobile = #{mobile,jdbcType=VARCHAR},
@@ -619,7 +687,12 @@
       audit_status = #{auditStatus,jdbcType=INTEGER},
       share_type = #{shareType,jdbcType=INTEGER},
       aid = #{aid,jdbcType=VARCHAR},
-      transfer_time = #{transferTime,jdbcType=TIMESTAMP}
+      transfer_time = #{transferTime,jdbcType=TIMESTAMP},
+      information_maintainer = #{informationMaintainer,jdbcType=VARCHAR},
+      core_technology = #{coreTechnology,jdbcType=VARCHAR},
+      accomplish_situation = #{accomplishSituation,jdbcType=VARCHAR},
+      intellectual_property = #{intellectualProperty,jdbcType=VARCHAR},
+      credit_rating = #{creditRating,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
  

+ 269 - 10
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -329,13 +329,15 @@
 			dg1.name as province,
 			dg2.name as city, 
 			dg3.name as area,
-			d.name as adminName
+			d.name as adminName,
+			e.name as informationMaintainer		
 		from user a 
 		left join organization_identity b on a.id = b.uid
 		left join district_glossory dg1 on b.location_province = dg1.id
 		left join district_glossory dg2 on b.location_city = dg2.id
 		left join district_glossory dg3 on b.location_area = dg3.id
-		left join admin d on a.aid = d.id
+		left join admin d on a.aid = d.id 
+		left join admin e on a.information_maintainer=e.id
 		where a.type = 1 and a.status != 1
 		<if test="aid != null and aid !=''">
 			and a.aid = #{aid,jdbcType=VARCHAR}
@@ -367,10 +369,6 @@
 			count(0)
 		from user a 
 		left join organization_identity b on a.id = b.uid
-		left join district_glossory dg1 on b.location_province = dg1.id
-		left join district_glossory dg2 on b.location_city = dg2.id
-		left join district_glossory dg3 on b.location_area = dg3.id
-		left join admin d on a.aid = d.id
 		where a.type = 1 and a.status != 1
 		<if test="aid != null and aid !=''">
 			and a.aid = #{aid,jdbcType=VARCHAR}
@@ -444,7 +442,7 @@
 		<if test="area != null">
 			and b.location_area = #{area,jdbcType=INTEGER}
 		</if>
-		 order by t0.transfer_time desc
+		 order by t1.last_follow_time desc
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if>
@@ -614,7 +612,7 @@
 		<if test="area != null">
 			and b.location_area = #{area,jdbcType=INTEGER}
 		</if>
-		order by t2.transfer_time desc
+		order by t1.last_follow_time desc
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if>
@@ -666,7 +664,7 @@
 	</select>
 	
 	<select id="findOrganizationCustomerDetail" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerOrganizationDetailBo">
-		select 
+		 select 
 			a.id as uid,
 			a.society_tag as societyTag,
 			a.company_logo_url as companyLogoUrl,
@@ -693,10 +691,22 @@
 			b.contact_mobile as contactMobile,
 			b.licence_number as licenceNumber,
 			a.aid as aid,
-			d.name as adminName
+			d.name as adminName,
+			a.information_maintainer as informationMaintainer,
+			c.name as informationMaintainerName,
+			a.core_technology as coreTechnology,
+			a. accomplish_situation as  accomplishSituation,
+			a.intellectual_property as  intellectualProperty,
+			b.year_sales_amount as  yearSalesAmount,
+			b.last_year_research_amount as  lastYearResearchAmount,
+			b.assets,
+			b.qualification,
+			b.cooperation_situation as  cooperationSituation,
+			a.credit_rating as creditRating
 		from 
 			user a inner join organization_identity b on a.id = b.uid
 			left join admin d on d.id = a.aid
+			left join admin c on c.id = a.information_maintainer
 		where 
 			a.id = #{uid,jdbcType=VARCHAR}
 	</select>
@@ -1668,4 +1678,253 @@
 		and a.create_time &gt; #{dailyStart,jdbcType=VARCHAR}
 		and a.create_time &lt; #{dailyEnd,jdbcType=VARCHAR}
 	</select>
+	
+	<select id="selectCustomerInformationList" resultType="com.goafanti.customer.bo.CustomerListIn">
+		select a.id,a.nickname as name,c.name as province,c1.name as city,c2.name as area,b.contacts,b.contact_mobile as contactMobile,
+			date_format(a.create_time,'%Y-%m-%d %H:%i:%S')  as createTime,d.name as industry,a.credit_rating as creditRating
+			from user a left join organization_identity b 
+			on a.id=b.uid left join district_glossory c 
+			on b.location_province=c.id left join district_glossory c1 
+			on b.location_city=c1.id left join district_glossory c2 
+			on b.location_area=c2.id left join industry_category d on b.industry = d.id
+			where  a.status=0 
+			and a.information_maintainer = #{aid,jdbcType=VARCHAR}
+			<if test="type !=null and type!=''">
+			and a.`type`=#{type,jdbcType=VARCHAR}
+			</if>
+			<if test="name!=null and name!=''">
+			and a.nickname like concat('%',#{name,jdbcType=VARCHAR},'%')
+			</if>
+			<if test="province!=null and province!=''">
+			and b.location_province= #{province,jdbcType=VARCHAR}
+			</if>
+			<if test="city!=null and city!=''">
+			and b.location_city=#{city,jdbcType=VARCHAR}
+			</if>
+			<if test="area !=null and area !=''">
+			and b.location_area= #{area,jdbcType=VARCHAR}
+			</if>
+			<if test="startDate != null and startDate != ''">
+			and a.create_time &gt; #{startDate}
+			</if>
+			<if test="endDate != null and endDate != ''">
+			and a.create_time &lt; #{endDate}
+			</if>
+			<if test="dataGrade ==0">
+			and b.industry is not null 
+			and b.business_scope is not null
+			and b.registered_capital is not null and b.registered_capital !=0 
+			and b.location_province is not null and b.location_province !=0 
+			</if>
+			<if test="dataGrade !=null and dataGrade !=0">
+			and b.cooperation_situation is not null 
+			and b.qualification is not null
+			and b.assets is not null
+			and b.last_year_research_amount is not null
+			and b.year_sales_amount is not null
+			and a.core_technology is not null
+			and a.accomplish_situation is not null
+			and a.credit_rating is not null
+			</if>
+		 order by a.create_time desc,a.nickname desc
+		 <if test="page_sql != null">
+    		${page_sql}
+   		 </if>
+	</select>
+	<select id="selectCustomerInformationCount" resultType="java.lang.Integer">
+		select count(0)
+			from user a left join organization_identity b 
+			on a.id=b.uid 
+			where  a.status=0 and a.information_maintainer = #{aid,jdbcType=VARCHAR}
+			<if test="type !=null and type!=''">
+			and a.`type`=#{type,jdbcType=VARCHAR}
+			</if>
+			<if test="name!=null and name!=''">
+			and a.nickname like concat('%',#{name,jdbcType=VARCHAR},'%')
+			</if>
+			<if test="province!=null and province!=''">
+			and b.location_province= #{province,jdbcType=VARCHAR}
+			</if>
+			<if test="city!=null and city!=''">
+			and b.location_city=#{city,jdbcType=VARCHAR}
+			</if>
+			<if test="area !=null and area !=''">
+			and b.location_area= #{area,jdbcType=VARCHAR}
+			</if>
+			<if test="startDate != null and startDate != ''">
+			and a.create_time &gt; #{startDate}
+			</if>
+			<if test="endDate != null and endDate != ''">
+			and a.create_time &lt; #{endDate}
+			</if>
+			<if test="dataGrade ==0">
+			and b.industry is not null 
+			and b.business_scope is not null
+			and b.registered_capital is not null and b.registered_capital !=0 
+			and b.location_province is not null and b.location_province !=0 
+			</if>
+			<if test="dataGrade !=null and dataGrade !=0">
+			and b.cooperation_situation is not null 
+			and b.qualification is not null
+			and b.assets is not null
+			and b.last_year_research_amount is not null
+			and b.year_sales_amount is not null
+			and a.core_technology is not null
+			and a.accomplish_situation is not null
+			and a.credit_rating is not null
+			</if>
+	</select>
+	
+	
+		<select id="selectDepCustomerInformationList" resultType="com.goafanti.customer.bo.CustomerListIn">
+		select x.id,
+x.name,
+x.province,
+x.city,
+x.area ,
+x.contacts,
+x.contact_mobile as contactMobile,
+date_format( x.create_time, '%Y-%m-%d %H:%i:%S' ) as createTime,
+x.industry as industry,
+x.credit_rating as creditRating
+from(
+select
+	a.id,
+	a.nickname as name,
+	c.name as province,
+	c1.name as city,
+	c2.name as area,
+	b.contacts,
+	b.contact_mobile,
+	a.create_time,
+	d.name as industry,
+	a.credit_rating ,
+	a.information_maintainer
+from
+	user a left join organization_identity b on
+	a.id = b.uid left join district_glossory c 
+	on b.location_province=c.id left join district_glossory c1 
+	on b.location_city=c1.id left join district_glossory c2 
+	on b.location_area=c2.id left join industry_category d 
+	on b.industry = d.id 
+	where 1=1 and a.status=0
+		<if test="type !=null and type!=''">
+			and a.`type`=#{type,jdbcType=VARCHAR}
+			</if>
+			<if test="name!=null and name!=''">
+			and a.nickname like concat('%',#{name,jdbcType=VARCHAR},'%')
+			</if>
+			<if test="province!=null and province!=''">
+			and b.location_province= #{province,jdbcType=VARCHAR}
+			</if>
+			<if test="city!=null and city!=''">
+			and b.location_city=#{city,jdbcType=VARCHAR}
+			</if>
+			<if test="area !=null and area !=''">
+			and b.location_area= #{area,jdbcType=VARCHAR}
+			</if>
+			<if test="startDate != null and startDate != ''">
+			and a.create_time &gt; #{startDate}
+			</if>
+			<if test="endDate != null and endDate != ''">
+			and a.create_time &lt; #{endDate}
+			</if>
+			<if test="dataGrade ==0">
+			and b.industry is not null 
+			and b.business_scope is not null
+			and b.registered_capital is not null and b.registered_capital !=0 
+			and b.location_province is not null and b.location_province !=0 
+			</if>
+			<if test="dataGrade !=null and dataGrade !=0">
+			and b.cooperation_situation is not null 
+			and b.qualification is not null
+			and b.assets is not null
+			and b.last_year_research_amount is not null
+			and b.year_sales_amount is not null
+			and a.core_technology is not null
+			and a.accomplish_situation is not null
+			and a.credit_rating is not null
+			</if>
+		 order by a.create_time,a.nickname desc
+)x
+inner join(
+		select
+			id
+		from
+			admin
+		where
+			id = #{aid,jdbcType=VARCHAR}
+			or superior_id = #{aid,jdbcType=VARCHAR}
+	) y on
+	y.id = x.information_maintainer
+		 <if test="page_sql != null">
+    		${page_sql}
+   		 </if>
+	</select>
+	<select id="selectDepCustomerInformationCount" resultType="java.lang.Integer">
+		select count(0)
+			from user a left join organization_identity b 
+			on a.id=b.uid  inner join (select id
+			from admin
+			where id=   #{aid,jdbcType=VARCHAR}
+			or superior_id=  #{aid,jdbcType=VARCHAR}
+			) y
+			on y.id=a.information_maintainer
+			where 1=1 and a.status=0
+			<if test="type !=null and type!=''">
+			and a.`type`=#{type,jdbcType=VARCHAR}
+			</if>
+			<if test="name!=null and name!=''">
+			and a.nickname like concat('%',#{name,jdbcType=VARCHAR},'%')
+			</if>
+			<if test="province!=null and province!=''">
+			and b.location_province= #{province,jdbcType=VARCHAR}
+			</if>
+			<if test="city!=null and city!=''">
+			and b.location_city=#{city,jdbcType=VARCHAR}
+			</if>
+			<if test="area !=null and area !=''">
+			and b.location_area= #{area,jdbcType=VARCHAR}
+			</if>
+			<if test="startDate != null and startDate != ''">
+			and a.create_time &gt; #{startDate}
+			</if>
+			<if test="endDate != null and endDate != ''">
+			and a.create_time &lt; #{endDate}
+			</if>
+			<if test="dataGrade ==0">
+			and b.industry is not null 
+			and b.business_scope is not null
+			and b.registered_capital is not null and b.registered_capital !=0 
+			and b.location_province is not null and b.location_province !=0 
+			</if>
+			<if test="dataGrade !=null and dataGrade !=0">
+			and b.cooperation_situation is not null 
+			and b.qualification is not null
+			and b.assets is not null
+			and b.last_year_research_amount is not null
+			and b.year_sales_amount is not null
+			and a.core_technology is not null
+			and a.accomplish_situation is not null
+			and a.credit_rating is not null
+			</if>
+	</select>
+	<select id="checkCustomerInformation" resultType="java.lang.Integer">
+	select count(a.id)
+			from user a left join organization_identity b 
+			on a.id=b.uid 
+			where b.industry is not null 
+			and b.business_scope is not null
+			and b.registered_capital is not null and b.registered_capital !=0 
+			and b.location_province is not null and b.location_province !=0 
+			and b.cooperation_situation is not null and b.cooperation_situation !='' 
+			and b.qualification is not null and b.qualification !='' 
+			and b.assets is not null and b.assets !=''
+			and b.last_year_research_amount is not null and b.last_year_research_amount !=''
+			and b.year_sales_amount is not null and b.year_sales_amount !=''
+			and a.core_technology is not null and a.core_technology !=''
+			and a.accomplish_situation is not null and a.accomplish_situation  !=''
+			and a.credit_rating is not null and a.credit_rating !=''    
+			and a.id=#{uid,jdbcType=VARCHAR}
+	</select>
 </mapper>

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


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

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

+ 191 - 135
src/main/java/com/goafanti/common/model/User.java

@@ -2,608 +2,664 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
-public class  User  extends BaseModel implements AftUser{
+public class  User implements AftUser{
 
 	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3301500555091503770L;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.id
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.mobile
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String mobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.password
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String password;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.nickname
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String nickname;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.email
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String email;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.create_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.number
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private Long number;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.lvl
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private Integer lvl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.type
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.mid
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String mid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.status
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.source
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private Integer source;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.update_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.company_logo_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String companyLogoUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.head_portrait_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String headPortraitUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.society_tag
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String societyTag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.introduction
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String introduction;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.value_added_tag
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String valueAddedTag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.organization_id
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String organizationId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.identify_name
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String identifyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.background_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String backgroundUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.audit_opinion
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String auditOpinion;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.audit_status
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private Integer auditStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.share_type
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private Integer shareType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.aid
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.transfer_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	private Date transferTime;
-
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.information_maintainer
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	private String informationMaintainer;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.core_technology
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	private String coreTechnology;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.accomplish_situation
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	private String accomplishSituation;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.intellectual_property
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	private String intellectualProperty;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.credit_rating
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	private Integer creditRating;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.id
 	 * @return  the value of user.id
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getId() {
 		return id;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.id
 	 * @param id  the value for user.id
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.mobile
 	 * @return  the value of user.mobile
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getMobile() {
 		return mobile;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.mobile
 	 * @param mobile  the value for user.mobile
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.password
 	 * @return  the value of user.password
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getPassword() {
 		return password;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.password
 	 * @param password  the value for user.password
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setPassword(String password) {
 		this.password = password;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.nickname
 	 * @return  the value of user.nickname
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getNickname() {
 		return nickname;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.nickname
 	 * @param nickname  the value for user.nickname
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setNickname(String nickname) {
 		this.nickname = nickname;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.email
 	 * @return  the value of user.email
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getEmail() {
 		return email;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.email
 	 * @param email  the value for user.email
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setEmail(String email) {
 		this.email = email;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.create_time
 	 * @return  the value of user.create_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.create_time
 	 * @param createTime  the value for user.create_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.number
 	 * @return  the value of user.number
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Long getNumber() {
 		return number;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.number
 	 * @param number  the value for user.number
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setNumber(Long number) {
 		this.number = number;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.lvl
 	 * @return  the value of user.lvl
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Integer getLvl() {
 		return lvl;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.lvl
 	 * @param lvl  the value for user.lvl
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.type
 	 * @return  the value of user.type
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Integer getType() {
 		return type;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.type
 	 * @param type  the value for user.type
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setType(Integer type) {
 		this.type = type;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.mid
 	 * @return  the value of user.mid
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getMid() {
 		return mid;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.mid
 	 * @param mid  the value for user.mid
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setMid(String mid) {
 		this.mid = mid;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.status
 	 * @return  the value of user.status
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Integer getStatus() {
 		return status;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.status
 	 * @param status  the value for user.status
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.source
 	 * @return  the value of user.source
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Integer getSource() {
 		return source;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.source
 	 * @param source  the value for user.source
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setSource(Integer source) {
 		this.source = source;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.update_time
 	 * @return  the value of user.update_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.update_time
 	 * @param updateTime  the value for user.update_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.company_logo_url
 	 * @return  the value of user.company_logo_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getCompanyLogoUrl() {
 		return companyLogoUrl;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.company_logo_url
 	 * @param companyLogoUrl  the value for user.company_logo_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setCompanyLogoUrl(String companyLogoUrl) {
 		this.companyLogoUrl = companyLogoUrl;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.head_portrait_url
 	 * @return  the value of user.head_portrait_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getHeadPortraitUrl() {
 		return headPortraitUrl;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.head_portrait_url
 	 * @param headPortraitUrl  the value for user.head_portrait_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setHeadPortraitUrl(String headPortraitUrl) {
 		this.headPortraitUrl = headPortraitUrl;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.society_tag
 	 * @return  the value of user.society_tag
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getSocietyTag() {
 		return societyTag;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.society_tag
 	 * @param societyTag  the value for user.society_tag
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setSocietyTag(String societyTag) {
 		this.societyTag = societyTag;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.introduction
 	 * @return  the value of user.introduction
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getIntroduction() {
 		return introduction;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.introduction
 	 * @param introduction  the value for user.introduction
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setIntroduction(String introduction) {
 		this.introduction = introduction;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.value_added_tag
 	 * @return  the value of user.value_added_tag
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getValueAddedTag() {
 		return valueAddedTag;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.value_added_tag
 	 * @param valueAddedTag  the value for user.value_added_tag
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setValueAddedTag(String valueAddedTag) {
 		this.valueAddedTag = valueAddedTag;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.organization_id
 	 * @return  the value of user.organization_id
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getOrganizationId() {
 		return organizationId;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.organization_id
 	 * @param organizationId  the value for user.organization_id
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setOrganizationId(String organizationId) {
 		this.organizationId = organizationId;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.identify_name
 	 * @return  the value of user.identify_name
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getIdentifyName() {
 		return identifyName;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.identify_name
 	 * @param identifyName  the value for user.identify_name
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setIdentifyName(String identifyName) {
 		this.identifyName = identifyName;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.background_url
 	 * @return  the value of user.background_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getBackgroundUrl() {
 		return backgroundUrl;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.background_url
 	 * @param backgroundUrl  the value for user.background_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setBackgroundUrl(String backgroundUrl) {
 		this.backgroundUrl = backgroundUrl;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.audit_opinion
 	 * @return  the value of user.audit_opinion
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getAuditOpinion() {
 		return auditOpinion;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.audit_opinion
 	 * @param auditOpinion  the value for user.audit_opinion
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setAuditOpinion(String auditOpinion) {
 		this.auditOpinion = auditOpinion;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.audit_status
 	 * @return  the value of user.audit_status
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Integer getAuditStatus() {
 		return auditStatus;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.audit_status
 	 * @param auditStatus  the value for user.audit_status
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.share_type
 	 * @return  the value of user.share_type
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Integer getShareType() {
 		return shareType;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.share_type
 	 * @param shareType  the value for user.share_type
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setShareType(Integer shareType) {
 		this.shareType = shareType;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.aid
 	 * @return  the value of user.aid
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getAid() {
 		return aid;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.aid
 	 * @param aid  the value for user.aid
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.transfer_time
 	 * @return  the value of user.transfer_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Date getTransferTime() {
 		return transferTime;
 	}
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.transfer_time
 	 * @param transferTime  the value for user.transfer_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setTransferTime(Date transferTime) {
 		this.transferTime = transferTime;
 	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.information_maintainer
+	 * @return  the value of user.information_maintainer
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	public String getInformationMaintainer() {
+		return informationMaintainer;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.information_maintainer
+	 * @param informationMaintainer  the value for user.information_maintainer
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	public void setInformationMaintainer(String informationMaintainer) {
+		this.informationMaintainer = informationMaintainer;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.core_technology
+	 * @return  the value of user.core_technology
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	public String getCoreTechnology() {
+		return coreTechnology;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.core_technology
+	 * @param coreTechnology  the value for user.core_technology
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	public void setCoreTechnology(String coreTechnology) {
+		this.coreTechnology = coreTechnology;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.accomplish_situation
+	 * @return  the value of user.accomplish_situation
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	public String getAccomplishSituation() {
+		return accomplishSituation;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.accomplish_situation
+	 * @param accomplishSituation  the value for user.accomplish_situation
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	public void setAccomplishSituation(String accomplishSituation) {
+		this.accomplishSituation = accomplishSituation;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.intellectual_property
+	 * @return  the value of user.intellectual_property
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	public String getIntellectualProperty() {
+		return intellectualProperty;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.intellectual_property
+	 * @param intellectualProperty  the value for user.intellectual_property
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	public void setIntellectualProperty(String intellectualProperty) {
+		this.intellectualProperty = intellectualProperty;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.credit_rating
+	 * @return  the value of user.credit_rating
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	public Integer getCreditRating() {
+		return creditRating;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.credit_rating
+	 * @param creditRating  the value for user.credit_rating
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 */
+	public void setCreditRating(Integer creditRating) {
+		this.creditRating = creditRating;
+	}
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3301500555091503770L;
+		public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
 }

+ 356 - 16
src/main/java/com/goafanti/common/model/UserExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class UserExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public UserExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class UserExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1882,11 +1882,351 @@ public class UserExample {
 			addCriterion("transfer_time not between", value1, value2, "transferTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andInformationMaintainerIsNull() {
+			addCriterion("information_maintainer is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerIsNotNull() {
+			addCriterion("information_maintainer is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerEqualTo(String value) {
+			addCriterion("information_maintainer =", value, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerNotEqualTo(String value) {
+			addCriterion("information_maintainer <>", value, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerGreaterThan(String value) {
+			addCriterion("information_maintainer >", value, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerGreaterThanOrEqualTo(String value) {
+			addCriterion("information_maintainer >=", value, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerLessThan(String value) {
+			addCriterion("information_maintainer <", value, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerLessThanOrEqualTo(String value) {
+			addCriterion("information_maintainer <=", value, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerLike(String value) {
+			addCriterion("information_maintainer like", value, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerNotLike(String value) {
+			addCriterion("information_maintainer not like", value, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerIn(List<String> values) {
+			addCriterion("information_maintainer in", values, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerNotIn(List<String> values) {
+			addCriterion("information_maintainer not in", values, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerBetween(String value1, String value2) {
+			addCriterion("information_maintainer between", value1, value2, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andInformationMaintainerNotBetween(String value1, String value2) {
+			addCriterion("information_maintainer not between", value1, value2, "informationMaintainer");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyIsNull() {
+			addCriterion("core_technology is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyIsNotNull() {
+			addCriterion("core_technology is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyEqualTo(String value) {
+			addCriterion("core_technology =", value, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyNotEqualTo(String value) {
+			addCriterion("core_technology <>", value, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyGreaterThan(String value) {
+			addCriterion("core_technology >", value, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyGreaterThanOrEqualTo(String value) {
+			addCriterion("core_technology >=", value, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyLessThan(String value) {
+			addCriterion("core_technology <", value, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyLessThanOrEqualTo(String value) {
+			addCriterion("core_technology <=", value, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyLike(String value) {
+			addCriterion("core_technology like", value, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyNotLike(String value) {
+			addCriterion("core_technology not like", value, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyIn(List<String> values) {
+			addCriterion("core_technology in", values, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyNotIn(List<String> values) {
+			addCriterion("core_technology not in", values, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyBetween(String value1, String value2) {
+			addCriterion("core_technology between", value1, value2, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andCoreTechnologyNotBetween(String value1, String value2) {
+			addCriterion("core_technology not between", value1, value2, "coreTechnology");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationIsNull() {
+			addCriterion("accomplish_situation is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationIsNotNull() {
+			addCriterion("accomplish_situation is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationEqualTo(String value) {
+			addCriterion("accomplish_situation =", value, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationNotEqualTo(String value) {
+			addCriterion("accomplish_situation <>", value, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationGreaterThan(String value) {
+			addCriterion("accomplish_situation >", value, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationGreaterThanOrEqualTo(String value) {
+			addCriterion("accomplish_situation >=", value, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationLessThan(String value) {
+			addCriterion("accomplish_situation <", value, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationLessThanOrEqualTo(String value) {
+			addCriterion("accomplish_situation <=", value, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationLike(String value) {
+			addCriterion("accomplish_situation like", value, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationNotLike(String value) {
+			addCriterion("accomplish_situation not like", value, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationIn(List<String> values) {
+			addCriterion("accomplish_situation in", values, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationNotIn(List<String> values) {
+			addCriterion("accomplish_situation not in", values, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationBetween(String value1, String value2) {
+			addCriterion("accomplish_situation between", value1, value2, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andAccomplishSituationNotBetween(String value1, String value2) {
+			addCriterion("accomplish_situation not between", value1, value2, "accomplishSituation");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyIsNull() {
+			addCriterion("intellectual_property is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyIsNotNull() {
+			addCriterion("intellectual_property is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyEqualTo(String value) {
+			addCriterion("intellectual_property =", value, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyNotEqualTo(String value) {
+			addCriterion("intellectual_property <>", value, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyGreaterThan(String value) {
+			addCriterion("intellectual_property >", value, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyGreaterThanOrEqualTo(String value) {
+			addCriterion("intellectual_property >=", value, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyLessThan(String value) {
+			addCriterion("intellectual_property <", value, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyLessThanOrEqualTo(String value) {
+			addCriterion("intellectual_property <=", value, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyLike(String value) {
+			addCriterion("intellectual_property like", value, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyNotLike(String value) {
+			addCriterion("intellectual_property not like", value, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyIn(List<String> values) {
+			addCriterion("intellectual_property in", values, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyNotIn(List<String> values) {
+			addCriterion("intellectual_property not in", values, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyBetween(String value1, String value2) {
+			addCriterion("intellectual_property between", value1, value2, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andIntellectualPropertyNotBetween(String value1, String value2) {
+			addCriterion("intellectual_property not between", value1, value2, "intellectualProperty");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingIsNull() {
+			addCriterion("credit_rating is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingIsNotNull() {
+			addCriterion("credit_rating is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingEqualTo(Integer value) {
+			addCriterion("credit_rating =", value, "creditRating");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingNotEqualTo(Integer value) {
+			addCriterion("credit_rating <>", value, "creditRating");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingGreaterThan(Integer value) {
+			addCriterion("credit_rating >", value, "creditRating");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingGreaterThanOrEqualTo(Integer value) {
+			addCriterion("credit_rating >=", value, "creditRating");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingLessThan(Integer value) {
+			addCriterion("credit_rating <", value, "creditRating");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingLessThanOrEqualTo(Integer value) {
+			addCriterion("credit_rating <=", value, "creditRating");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingIn(List<Integer> values) {
+			addCriterion("credit_rating in", values, "creditRating");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingNotIn(List<Integer> values) {
+			addCriterion("credit_rating not in", values, "creditRating");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingBetween(Integer value1, Integer value2) {
+			addCriterion("credit_rating between", value1, value2, "creditRating");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreditRatingNotBetween(Integer value1, Integer value2) {
+			addCriterion("credit_rating not between", value1, value2, "creditRating");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

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

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

+ 66 - 0
src/main/java/com/goafanti/customer/bo/CustomerListIn.java

@@ -2,6 +2,10 @@ package com.goafanti.customer.bo;
 
 
 public class CustomerListIn {
+	/**
+	 * 客户ID
+	 */
+	private String id;
 	/** 客户类型  0-个人 1-单位**/
 	private String type;
 	
@@ -38,6 +42,20 @@ public class CustomerListIn {
 	/** 社会性质 **/
 	private String societyTag;
 	
+	/** 联系人 **/
+	private String contacts;
+	/** 联系人电话 **/
+	private String contactMobile;
+	/**
+	 * 创建时间
+	 */
+	private String createTime;
+	
+	private Integer dataGrade;
+	
+	private Integer creditRating;
+	
+	
 	public String getType() {
 		return type;
 	}
@@ -133,4 +151,52 @@ public class CustomerListIn {
 	public void setSocietyTag(String societyTag) {
 		this.societyTag = societyTag;
 	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getContactMobile() {
+		return contactMobile;
+	}
+
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Integer getDataGrade() {
+		return dataGrade;
+	}
+
+	public void setDataGrade(Integer dataGrade) {
+		this.dataGrade = dataGrade;
+	}
+
+	public Integer getCreditRating() {
+		return creditRating;
+	}
+
+	public void setCreditRating(Integer creditRating) {
+		this.creditRating = creditRating;
+	}
 }

+ 12 - 0
src/main/java/com/goafanti/customer/bo/CustomerListOut.java

@@ -42,6 +42,10 @@ public class CustomerListOut extends CustomerListIn{
 	
 	/** 剩余签单时间 **/
 	private String surplusSignTime;
+	
+	/** 资料所属人 **/
+	private String informationMaintainer;
+	
 	public String getAuditOpinion() {
 		return auditOpinion;
 	}
@@ -152,4 +156,12 @@ public class CustomerListOut extends CustomerListIn{
 	public void setSurplusSignTime(String surplusSignTime) {
 		this.surplusSignTime = surplusSignTime;
 	}
+
+	public String getInformationMaintainer() {
+		return informationMaintainer;
+	}
+
+	public void setInformationMaintainer(String informationMaintainer) {
+		this.informationMaintainer = informationMaintainer;
+	}
 }

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

@@ -9,6 +9,46 @@ public class CustomerOrganizationDetailBo extends OrganizationIdentity{
 	private String introduction;
 	private Integer businessAudit;
 	private String licenceNumber;
+	
+	/**  '资料维护人'*/
+	private String informationMaintainer;
+	
+	/**  '资料维护人姓名'*/
+	private String informationMaintainerName;
+	/** '核心技术'*/
+	private String coreTechnology;
+	/** '客户已完成项目情况'*/
+	private String accomplishSituation;
+	/** '已有知识产权情况'*/
+	private String intellectualProperty;
+	/** 用户信用等级*/
+	private Integer creditRating;
+	
+	
+	public String getInformationMaintainer() {
+		return informationMaintainer;
+	}
+	public void setInformationMaintainer(String informationMaintainer) {
+		this.informationMaintainer = informationMaintainer;
+	}
+	public String getCoreTechnology() {
+		return coreTechnology;
+	}
+	public void setCoreTechnology(String coreTechnology) {
+		this.coreTechnology = coreTechnology;
+	}
+	public String getAccomplishSituation() {
+		return accomplishSituation;
+	}
+	public void setAccomplishSituation(String accomplishSituation) {
+		this.accomplishSituation = accomplishSituation;
+	}
+	public String getIntellectualProperty() {
+		return intellectualProperty;
+	}
+	public void setIntellectualProperty(String intellectualProperty) {
+		this.intellectualProperty = intellectualProperty;
+	}
 	public String getLicenceNumber() {
 		return licenceNumber;
 	}
@@ -45,4 +85,16 @@ public class CustomerOrganizationDetailBo extends OrganizationIdentity{
 	public void setBusinessAudit(Integer businessAudit) {
 		this.businessAudit = businessAudit;
 	}
+		public String getInformationMaintainerName() {
+		return informationMaintainerName;
+	}
+	public void setInformationMaintainerName(String informationMaintainerName) {
+		this.informationMaintainerName = informationMaintainerName;
+	}
+	public Integer getCreditRating() {
+		return creditRating;
+	}
+	public void setCreditRating(Integer creditRating) {
+		this.creditRating = creditRating;
+	}
 }

+ 2 - 0
src/main/java/com/goafanti/customer/bo/CustomerPersonalDetailBo.java

@@ -12,6 +12,8 @@ public class CustomerPersonalDetailBo extends UserIdentity{
 	private Integer releaseStatus;
 	private String aid;
 	private String adminName;
+	
+
 	public String getAdminName() {
 		return adminName;
 	}

+ 26 - 1
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -181,7 +181,7 @@ public class AdminCustomerApiController extends BaseApiController{
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(contacts)
 				|| StringUtils.isBlank(contactMobile) || StringUtils.isBlank(societyTag)){
-			res.getError().add(buildError("客户名称、联系人、联系电话、社会性质不能为空"));
+			res.getError().add(buildError("","客户名称、联系人、联系电话、社会性质不能为空"));
 			return res;
 		}
 		customerService.addCustomer(name, contacts, contactMobile,type,source,societyTag);
@@ -983,4 +983,29 @@ public class AdminCustomerApiController extends BaseApiController{
 		res.setData(customerService.updateAgainProjectTask(uid,projectId,aid));
 		return res;
 	}
+	/** 客户资料转交 **/
+	@RequestMapping(value = "/updateInformationMaintainerr", method = RequestMethod.POST)
+	public Result updateInformationMaintainerr(String id,String aid){
+		Result res = new Result();
+		if(StringUtils.isBlank(id) || StringUtils.isBlank(aid)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
+			return res;
+		} 
+		res.data(customerService.updateInformationMaintainerr(id,aid));
+		return res;
+	}
+	/** 个人单位客户信息列表 **/
+	@RequestMapping(value = "/listCustomerInformation", method = RequestMethod.POST)
+	public Result listCustomerInformation(CustomerListIn cli,Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.data(customerService.listCustomerInformation(cli,pageNo,pageSize));
+		return res;
+	}
+	/** 所属单位客户信息列表 **/
+	@RequestMapping(value = "/listDepCustomerInformation", method = RequestMethod.POST)
+	public Result listDepCustomerInformation(CustomerListIn cli,Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.data(customerService.listDepCustomerInformation(cli,pageNo,pageSize));
+		return res;
+	}
 }

+ 23 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -472,5 +472,28 @@ public interface CustomerService {
 	 * @return
 	 */
 	int updateAgainProjectTask(String uid, String projectId, String aid);
+	/**
+	 * 客户资料转交
+	 * @param id
+	 * @param aid
+	 * @return
+	 */
+	int updateInformationMaintainerr(String id, String aid);
+	/**
+	 * 个人客户资料列表
+	 * @param cli
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	Pagination<CustomerListIn> listCustomerInformation(CustomerListIn cli, Integer pageNo, Integer pageSize);
+	/**
+	 * 部门客户资料列表
+	 * @param cli
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	Pagination<CustomerListIn> listDepCustomerInformation(CustomerListIn cli, Integer pageNo, Integer pageSize);
 	
 }

+ 42 - 3
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.goafanti.customer.service.impl;
 
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -162,8 +163,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	public Pagination<CustomerListOut> listAllOrganizationCustomer(CustomerListIn cli, Integer pageNo,Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
 		Map<String,Object> params = disposeParams(cli);
-		Pagination<CustomerListOut> list = (Pagination<CustomerListOut>) findPage("selectOrganizationCustomerList","selectOrganizationCustomerCount",params,pageNo,pageSize);
-		return list;
+		return (Pagination<CustomerListOut>) findPage("selectOrganizationCustomerList","selectOrganizationCustomerCount",params,pageNo,pageSize);
 	}
 	
 	@Override
@@ -193,6 +193,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		if(StringUtils.isNotBlank(cli.getSocietyTag())) params.put("societyTag", cli.getSocietyTag());
 		if(StringUtils.isNotBlank(cli.getStartDate())) params.put("startDate", cli.getStartDate()+" 00:00:00");
 		if(StringUtils.isNotBlank(cli.getEndDate())) params.put("endDate", cli.getEndDate()+" 23:59:59");
+		if(null!=cli.getDataGrade()) params.put("dataGrade", cli.getDataGrade());
 		return params;
 	}
 
@@ -228,6 +229,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setUpdateTime(now);
 		user.setMobile(contactMobile);
 		user.setPassword(AFTConstants.INITIALPASSWORD);
+		user.setInformationMaintainer(TokenManager.getAdminId());
 		passwordUtil.encryptPassword(user);
 		if(type == UserType.PERSONAL.getCode()){
 			if(userMapper.checkUser("", "", contactMobile, type,null,null).size()>0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_EXIST, name,""));
@@ -295,10 +297,15 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 			user.setCompanyLogoUrl(bo.getCompanyLogoUrl());
 			user.setIntroduction(bo.getIntroduction());
 			user.setUpdateTime(new Date());
+			user.setInformationMaintainer(bo.getInformationMaintainer());
+			user.setCoreTechnology(bo.getCoreTechnology());
+			user.setAccomplishSituation(bo.getAccomplishSituation());
+			user.setIntellectualProperty(bo.getIntellectualProperty());
+			user.setCreditRating(bo.getCreditRating());
 		} catch (IllegalAccessException |InvocationTargetException e) {
 			e.printStackTrace();
 		} 
-		organizationIdentityMapper.updateByPrimaryKeySelective(oi);
+		organizationIdentityMapper.updateByPrimaryKey(oi);
 		userMapper.updateByPrimaryKeySelective(user);
 		return 1;
 	}
@@ -519,6 +526,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		}
 	
 
+	@SuppressWarnings("unused")
 	private void releaseProject(List<LockingReleaseBo> businessLockedList) {
 		if(businessLockedList != null && businessLockedList.size()>0){
 			UserLockRelease ulr = null;
@@ -822,6 +830,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		if(operatorType.equals(AFTConstants.USER_RECEIVE)){
 			user.setAid(TokenManager.getAdminId());
 			user.setShareType(AFTConstants.USER_SHARE_PRIVATE);
+			user.setInformationMaintainer(TokenManager.getAdminId());
 			user.setTransferTime(now);
 			flag = addUserLock(uid,TokenManager.getAdminId(),now); //指定用户锁定客户
 			if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE,""));
@@ -1272,4 +1281,34 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		}
 		return 0;
 	}
+
+	@Override
+	public int updateInformationMaintainerr(String id, String aid) {
+		User u=new User();
+		u.setId(id);
+		u.setInformationMaintainer(aid);
+		return userMapper.updateByPrimaryKeySelective(u);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<CustomerListIn> listCustomerInformation(CustomerListIn cli, Integer pageNo, Integer pageSize) {
+			cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
+			cli.setAid(TokenManager.getAdminId());
+//			cli.setAid("1");
+			cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
+			Map<String,Object> params = disposeParams(cli);
+			return (Pagination<CustomerListIn>) findPage("selectCustomerInformationList","selectCustomerInformationCount",params,pageNo,pageSize);
+			}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<CustomerListIn> listDepCustomerInformation(CustomerListIn cli, Integer pageNo, Integer pageSize) {
+		cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
+		cli.setAid(TokenManager.getAdminId());
+//		cli.setAid("1");
+		cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
+		Map<String,Object> params = disposeParams(cli);
+		return (Pagination<CustomerListIn>) findPage("selectDepCustomerInformationList","selectDepCustomerInformationCount",params,pageNo,pageSize);
+		}
 }

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

@@ -332,6 +332,10 @@ public class AdminOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","客户编号"));
 			return res;
 		}
+		if(orderServiceImpl.checkCustomerInformation(uid)){
+			res.getError().add(buildError("","请到客户资料-客户资料维护模块完善您的客户信息!"));
+			return res;
+		}
 		if(orderType == null){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单类型"));
 			return res;

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

@@ -486,5 +486,7 @@ public interface OrderService {
 
 	void addContractTaskLog();
 
+	boolean checkCustomerInformation(String uid);
+
 	
 }

+ 10 - 0
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -869,6 +869,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	private Map<String,Object> disposeParams(OrderListBo bo,String startDate,String endDate){
 		Map<String,Object> params = new HashMap<>();
 		if(StringUtils.isNotBlank(bo.getBuyerName())) params.put("buyerName", bo.getBuyerName());
+		if(StringUtils.isNotBlank(bo.getOrderNo())) params.put("orderNo", bo.getOrderNo());
 		if(null!=bo.getApproval()) params.put("approval", bo.getApproval());
 		if(StringUtils.isNotBlank(bo.getSalesmanName())) params.put("salesmanName", bo.getSalesmanName());
 		if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate +" 00:00:00");
@@ -1949,4 +1950,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		
 		
 	}
+
+	@Override
+	public boolean checkCustomerInformation(String uid) {
+		int i=userMapper.checkCustomerInformation(uid);
+		if (i<1) {
+			return true;
+		}
+		return false;
+	}
 }