Procházet zdrojové kódy

客户资料新改动修改

anderx před 7 roky
rodič
revize
fcd1ddc3be

+ 1 - 1
GeneratorConfig.xml

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

+ 15 - 1
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -48,7 +48,7 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.marketing.service.MarketingManagementService;
 import com.goafanti.marketing.service.MarketingManagementService;
 import com.goafanti.user.service.UserService;
 import com.goafanti.user.service.UserService;
 @RestController
 @RestController
-@RequestMapping(value = "/api/admin/achievement")
+@RequestMapping(value = "/open/api/admin/achievement")
 public class AdminAchievementApiController extends CertifyApiController {
 public class AdminAchievementApiController extends CertifyApiController {
     @Resource
     @Resource
     private AchievementService		achievementService;
     private AchievementService		achievementService;
@@ -754,4 +754,18 @@ public class AdminAchievementApiController extends CertifyApiController {
     	Result res=new Result();
     	Result res=new Result();
     	return res.data(AchievementPublishPageService.getBranchInformation());
     	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 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);
 			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);
 		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);
+	}
+
 }
 }

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

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

+ 128 - 34
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -5,7 +5,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="mobile" jdbcType="VARCHAR" property="mobile" />
     <result column="mobile" jdbcType="VARCHAR" property="mobile" />
@@ -31,14 +31,21 @@
     <result column="audit_opinion" jdbcType="VARCHAR" property="auditOpinion" />
     <result column="audit_opinion" jdbcType="VARCHAR" property="auditOpinion" />
     <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
     <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
     <result column="share_type" jdbcType="INTEGER" property="shareType" />
     <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="transfer_time" jdbcType="TIMESTAMP" property="transferTime" />
+    <result column="username" jdbcType="VARCHAR" property="username" />
+    <result column="authentication" jdbcType="INTEGER" property="authentication" />
+    <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>
   </resultMap>
   <sql id="Example_Where_Clause">
   <sql id="Example_Where_Clause">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     <where>
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -72,7 +79,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     <where>
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -106,18 +113,19 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 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, username, authentication, information_maintainer, 
+    core_technology, accomplish_situation, intellectual_property, credit_rating
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserExample" resultMap="BaseResultMap">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     select
     select
     <if test="distinct">
     <if test="distinct">
@@ -136,7 +144,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     select 
     select 
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
@@ -147,7 +155,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     delete from user
     delete from user
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -156,7 +164,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     delete from user
     delete from user
     <if test="_parameter != null">
     <if test="_parameter != null">
@@ -167,7 +175,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     insert into user (id, mobile, password, 
     insert into user (id, mobile, password, 
       nickname, email, create_time, 
       nickname, email, create_time, 
@@ -177,7 +185,10 @@
       introduction, value_added_tag, organization_id, 
       introduction, value_added_tag, organization_id, 
       identify_name, background_url, audit_opinion, 
       identify_name, background_url, audit_opinion, 
       audit_status, share_type, aid, 
       audit_status, share_type, aid, 
-      transfer_time,information_maintainer)
+      transfer_time, username, authentication, 
+      information_maintainer, core_technology, 
+      accomplish_situation, intellectual_property, 
+      credit_rating)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
       #{nickname,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{nickname,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{number,jdbcType=BIGINT}, #{lvl,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{mid,jdbcType=VARCHAR}, 
       #{number,jdbcType=BIGINT}, #{lvl,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{mid,jdbcType=VARCHAR}, 
@@ -186,13 +197,16 @@
       #{introduction,jdbcType=VARCHAR}, #{valueAddedTag,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, 
       #{introduction,jdbcType=VARCHAR}, #{valueAddedTag,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, 
       #{identifyName,jdbcType=VARCHAR}, #{backgroundUrl,jdbcType=VARCHAR}, #{auditOpinion,jdbcType=VARCHAR}, 
       #{identifyName,jdbcType=VARCHAR}, #{backgroundUrl,jdbcType=VARCHAR}, #{auditOpinion,jdbcType=VARCHAR}, 
       #{auditStatus,jdbcType=INTEGER}, #{shareType,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
       #{auditStatus,jdbcType=INTEGER}, #{shareType,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
-      #{transferTime,jdbcType=TIMESTAMP},#{informationMaintainer,jdbcType=VARCHAR})
+      #{transferTime,jdbcType=TIMESTAMP}, #{username,jdbcType=VARCHAR}, #{authentication,jdbcType=INTEGER}, 
+      #{informationMaintainer,jdbcType=VARCHAR}, #{coreTechnology,jdbcType=VARCHAR}, 
+      #{accomplishSituation,jdbcType=VARCHAR}, #{intellectualProperty,jdbcType=VARCHAR}, 
+      #{creditRating,jdbcType=INTEGER})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.User">
   <insert id="insertSelective" parameterType="com.goafanti.common.model.User">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     insert into user
     insert into user
     <trim prefix="(" suffix=")" suffixOverrides=",">
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -274,6 +288,27 @@
       <if test="transferTime != null">
       <if test="transferTime != null">
         transfer_time,
         transfer_time,
       </if>
       </if>
+      <if test="username != null">
+        username,
+      </if>
+      <if test="authentication != null">
+        authentication,
+      </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>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
       <if test="id != null">
@@ -354,13 +389,34 @@
       <if test="transferTime != null">
       <if test="transferTime != null">
         #{transferTime,jdbcType=TIMESTAMP},
         #{transferTime,jdbcType=TIMESTAMP},
       </if>
       </if>
+      <if test="username != null">
+        #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="authentication != null">
+        #{authentication,jdbcType=INTEGER},
+      </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>
     </trim>
   </insert>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.UserExample" resultType="java.lang.Long">
   <select id="countByExample" parameterType="com.goafanti.common.model.UserExample" resultType="java.lang.Long">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     select count(*) from user
     select count(*) from user
     <if test="_parameter != null">
     <if test="_parameter != null">
@@ -371,7 +427,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     update user
     update user
     <set>
     <set>
@@ -426,8 +482,6 @@
       <if test="record.introduction != null">
       <if test="record.introduction != null">
         introduction = #{record.introduction,jdbcType=VARCHAR},
         introduction = #{record.introduction,jdbcType=VARCHAR},
       </if>
       </if>
-      
-    
       <if test="record.valueAddedTag != null">
       <if test="record.valueAddedTag != null">
         value_added_tag = #{record.valueAddedTag,jdbcType=VARCHAR},
         value_added_tag = #{record.valueAddedTag,jdbcType=VARCHAR},
       </if>
       </if>
@@ -452,11 +506,30 @@
       <if test="record.aid != null">
       <if test="record.aid != null">
         aid = #{record.aid,jdbcType=VARCHAR},
         aid = #{record.aid,jdbcType=VARCHAR},
       </if>
       </if>
-     
-     
       <if test="record.transferTime != null">
       <if test="record.transferTime != null">
         transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
         transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
       </if>
       </if>
+      <if test="record.username != null">
+        username = #{record.username,jdbcType=VARCHAR},
+      </if>
+      <if test="record.authentication != null">
+        authentication = #{record.authentication,jdbcType=INTEGER},
+      </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>
     </set>
     <if test="_parameter != null">
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
       <include refid="Update_By_Example_Where_Clause" />
@@ -466,7 +539,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     update user
     update user
     set id = #{record.id,jdbcType=VARCHAR},
     set id = #{record.id,jdbcType=VARCHAR},
@@ -486,7 +559,6 @@
       head_portrait_url = #{record.headPortraitUrl,jdbcType=VARCHAR},
       head_portrait_url = #{record.headPortraitUrl,jdbcType=VARCHAR},
       society_tag = #{record.societyTag,jdbcType=VARCHAR},
       society_tag = #{record.societyTag,jdbcType=VARCHAR},
       introduction = #{record.introduction,jdbcType=VARCHAR},
       introduction = #{record.introduction,jdbcType=VARCHAR},
-      
       value_added_tag = #{record.valueAddedTag,jdbcType=VARCHAR},
       value_added_tag = #{record.valueAddedTag,jdbcType=VARCHAR},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       identify_name = #{record.identifyName,jdbcType=VARCHAR},
       identify_name = #{record.identifyName,jdbcType=VARCHAR},
@@ -495,7 +567,14 @@
       audit_status = #{record.auditStatus,jdbcType=INTEGER},
       audit_status = #{record.auditStatus,jdbcType=INTEGER},
       share_type = #{record.shareType,jdbcType=INTEGER},
       share_type = #{record.shareType,jdbcType=INTEGER},
       aid = #{record.aid,jdbcType=VARCHAR},
       aid = #{record.aid,jdbcType=VARCHAR},
-      transfer_time = #{record.transferTime,jdbcType=TIMESTAMP}
+      transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
+      username = #{record.username,jdbcType=VARCHAR},
+      authentication = #{record.authentication,jdbcType=INTEGER},
+      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">
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
       <include refid="Update_By_Example_Where_Clause" />
     </if>
     </if>
@@ -504,7 +583,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     update user
     update user
     <set>
     <set>
@@ -556,7 +635,6 @@
       <if test="introduction != null">
       <if test="introduction != null">
         introduction = #{introduction,jdbcType=VARCHAR},
         introduction = #{introduction,jdbcType=VARCHAR},
       </if>
       </if>
-      
       <if test="valueAddedTag != null">
       <if test="valueAddedTag != null">
         value_added_tag = #{valueAddedTag,jdbcType=VARCHAR},
         value_added_tag = #{valueAddedTag,jdbcType=VARCHAR},
       </if>
       </if>
@@ -584,17 +662,26 @@
       <if test="transferTime != null">
       <if test="transferTime != null">
         transfer_time = #{transferTime,jdbcType=TIMESTAMP},
         transfer_time = #{transferTime,jdbcType=TIMESTAMP},
       </if>
       </if>
+      <if test="username != null">
+        username = #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="authentication != null">
+        authentication = #{authentication,jdbcType=INTEGER},
+      </if>
       <if test="informationMaintainer != null">
       <if test="informationMaintainer != null">
-         information_maintainer= #{informationMaintainer,jdbcType=VARCHAR},
+        information_maintainer = #{informationMaintainer,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="coreTechnology != null">
       <if test="coreTechnology != null">
-         core_technology= #{coreTechnology,jdbcType=VARCHAR},
+        core_technology = #{coreTechnology,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="accomplishSituation != null">
       <if test="accomplishSituation != null">
-         accomplish_situation= #{accomplishSituation,jdbcType=VARCHAR},
+        accomplish_situation = #{accomplishSituation,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="intellectualProperty != null">
       <if test="intellectualProperty != null">
-         intellectual_property= #{intellectualProperty,jdbcType=VARCHAR},
+        intellectual_property = #{intellectualProperty,jdbcType=VARCHAR},
+      </if>
+      <if test="creditRating != null">
+        credit_rating = #{creditRating,jdbcType=INTEGER},
       </if>
       </if>
     </set>
     </set>
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -603,7 +690,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       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 Thu Jun 07 15:24:57 CST 2018.
     -->
     -->
     update user
     update user
     set mobile = #{mobile,jdbcType=VARCHAR},
     set mobile = #{mobile,jdbcType=VARCHAR},
@@ -630,7 +717,14 @@
       audit_status = #{auditStatus,jdbcType=INTEGER},
       audit_status = #{auditStatus,jdbcType=INTEGER},
       share_type = #{shareType,jdbcType=INTEGER},
       share_type = #{shareType,jdbcType=INTEGER},
       aid = #{aid,jdbcType=VARCHAR},
       aid = #{aid,jdbcType=VARCHAR},
-      transfer_time = #{transferTime,jdbcType=TIMESTAMP}
+      transfer_time = #{transferTime,jdbcType=TIMESTAMP},
+      username = #{username,jdbcType=VARCHAR},
+      authentication = #{authentication,jdbcType=INTEGER},
+      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}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   </update>
  
  

+ 86 - 3
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -702,7 +702,8 @@
 			b.last_year_research_amount as  lastYearResearchAmount,
 			b.last_year_research_amount as  lastYearResearchAmount,
 			b.assets,
 			b.assets,
 			b.qualification,
 			b.qualification,
-			b.cooperation_situation as  cooperationSituation
+			b.cooperation_situation as  cooperationSituation,
+			a.credit_rating as creditRating
 		from 
 		from 
 			user a inner join organization_identity b on a.id = b.uid
 			user a inner join organization_identity b on a.id = b.uid
 			left join admin d on d.id = a.aid
 			left join admin d on d.id = a.aid
@@ -1680,7 +1681,7 @@
 	
 	
 	<select id="selectCustomerInformationList" resultType="com.goafanti.customer.bo.CustomerListIn">
 	<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,
 		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,
-			a.create_time as createTime,d.name as industry
+			a.create_time as createTime,d.name as industry ,a.credit_rating as creditRating
 			from user a left join organization_identity b 
 			from user a left join organization_identity b 
 			on a.id=b.uid left join district_glossory c 
 			on a.id=b.uid left join district_glossory c 
 			on b.location_province=c.id left join district_glossory c1 
 			on b.location_province=c.id left join district_glossory c1 
@@ -1708,6 +1709,22 @@
 			<if test="endDate != null and endDate != ''">
 			<if test="endDate != null and endDate != ''">
 			and a.create_time &lt; #{endDate}
 			and a.create_time &lt; #{endDate}
 			</if>
 			</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
 		 order by a.create_time desc
 		 <if test="page_sql != null">
 		 <if test="page_sql != null">
     		${page_sql}
     		${page_sql}
@@ -1739,12 +1756,28 @@
 			<if test="endDate != null and endDate != ''">
 			<if test="endDate != null and endDate != ''">
 			and a.create_time &lt; #{endDate}
 			and a.create_time &lt; #{endDate}
 			</if>
 			</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>
 	
 	
 	
 	
 		<select id="selectDepCustomerInformationList" resultType="com.goafanti.customer.bo.CustomerListIn">
 		<select id="selectDepCustomerInformationList" 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,
 		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,
-			a.create_time as createTime,d.name as industry
+			a.create_time as createTime,d.name as industry,a.credit_rating as creditRating
 			from user a left join organization_identity b 
 			from user a left join organization_identity b 
 			on a.id=b.uid left join district_glossory c 
 			on a.id=b.uid left join district_glossory c 
 			on b.location_province=c.id left join district_glossory c1 
 			on b.location_province=c.id left join district_glossory c1 
@@ -1778,6 +1811,22 @@
 			<if test="endDate != null and endDate != ''">
 			<if test="endDate != null and endDate != ''">
 			and a.create_time &lt; #{endDate}
 			and a.create_time &lt; #{endDate}
 			</if>
 			</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
 		 order by a.create_time desc
 		 <if test="page_sql != null">
 		 <if test="page_sql != null">
     		${page_sql}
     		${page_sql}
@@ -1814,5 +1863,39 @@
 			<if test="endDate != null and endDate != ''">
 			<if test="endDate != null and endDate != ''">
 			and a.create_time &lt; #{endDate}
 			and a.create_time &lt; #{endDate}
 			</if>
 			</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.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  
+			and a.id=#{uid,jdbcType=VARCHAR}
 	</select>
 	</select>
 </mapper>
 </mapper>

+ 244 - 125
src/main/java/com/goafanti/common/model/User.java

@@ -2,195 +2,180 @@ package com.goafanti.common.model;
 
 
 import java.util.Date;
 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
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String id;
 	private String id;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.mobile
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String mobile;
 	private String mobile;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.password
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String password;
 	private String password;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.nickname
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String nickname;
 	private String nickname;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.email
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String email;
 	private String email;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.create_time
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private Date createTime;
 	private Date createTime;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.number
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private Long number;
 	private Long number;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.lvl
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private Integer lvl;
 	private Integer lvl;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.type
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private Integer type;
 	private Integer type;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.mid
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String mid;
 	private String mid;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.status
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private Integer status;
 	private Integer status;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.source
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private Integer source;
 	private Integer source;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.update_time
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private Date updateTime;
 	private Date updateTime;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.company_logo_url
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String companyLogoUrl;
 	private String companyLogoUrl;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.head_portrait_url
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String headPortraitUrl;
 	private String headPortraitUrl;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.society_tag
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String societyTag;
 	private String societyTag;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.introduction
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String introduction;
 	private String introduction;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.value_added_tag
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String valueAddedTag;
 	private String valueAddedTag;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.organization_id
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String organizationId;
 	private String organizationId;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.identify_name
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String identifyName;
 	private String identifyName;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.background_url
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String backgroundUrl;
 	private String backgroundUrl;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.audit_opinion
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String auditOpinion;
 	private String auditOpinion;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.audit_status
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private Integer auditStatus;
 	private Integer auditStatus;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.share_type
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private Integer shareType;
 	private Integer shareType;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.aid
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private String aid;
 	private String aid;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.transfer_time
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	private Date transferTime;
 	private Date transferTime;
-	
-	
-	/**  '资料维护人'*/
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.username
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
+	private String username;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.authentication
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
+	private Integer authentication;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.information_maintainer
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
 	private String informationMaintainer;
 	private String informationMaintainer;
-	/** '核心技术'*/
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.core_technology
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
 	private String coreTechnology;
 	private String coreTechnology;
-	/** '客户已完成项目情况'*/
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.accomplish_situation
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
 	private String accomplishSituation;
 	private String accomplishSituation;
-	/** '已有知识产权情况'*/
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.intellectual_property
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
 	private String intellectualProperty;
 	private String intellectualProperty;
-	
-	
-
-	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;
-	}
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.credit_rating
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
+	private Integer creditRating;
 
 
-	public void setIntellectualProperty(String intellectualProperty) {
-		this.intellectualProperty = intellectualProperty;
-	}
 
 
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.id
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.id
 	 * @return  the value of user.id
 	 * @return  the value of user.id
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getId() {
 	public String getId() {
 		return id;
 		return id;
@@ -199,7 +184,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param id  the value for user.id
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setId(String id) {
 	public void setId(String id) {
 		this.id = id;
 		this.id = id;
@@ -208,7 +193,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.mobile
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.mobile
 	 * @return  the value of user.mobile
 	 * @return  the value of user.mobile
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getMobile() {
 	public String getMobile() {
 		return mobile;
 		return mobile;
@@ -217,7 +202,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param mobile  the value for user.mobile
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setMobile(String mobile) {
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
 		this.mobile = mobile;
@@ -226,7 +211,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.password
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.password
 	 * @return  the value of user.password
 	 * @return  the value of user.password
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getPassword() {
 	public String getPassword() {
 		return password;
 		return password;
@@ -235,7 +220,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param password  the value for user.password
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setPassword(String password) {
 	public void setPassword(String password) {
 		this.password = password;
 		this.password = password;
@@ -244,7 +229,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.nickname
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.nickname
 	 * @return  the value of user.nickname
 	 * @return  the value of user.nickname
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getNickname() {
 	public String getNickname() {
 		return nickname;
 		return nickname;
@@ -253,7 +238,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param nickname  the value for user.nickname
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setNickname(String nickname) {
 	public void setNickname(String nickname) {
 		this.nickname = nickname;
 		this.nickname = nickname;
@@ -262,7 +247,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.email
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.email
 	 * @return  the value of user.email
 	 * @return  the value of user.email
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getEmail() {
 	public String getEmail() {
 		return email;
 		return email;
@@ -271,7 +256,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param email  the value for user.email
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setEmail(String email) {
 	public void setEmail(String email) {
 		this.email = email;
 		this.email = email;
@@ -280,7 +265,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.create_time
 	 * 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
 	 * @return  the value of user.create_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Date getCreateTime() {
 	public Date getCreateTime() {
 		return createTime;
 		return createTime;
@@ -289,7 +274,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.create_time
 	 * 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
 	 * @param createTime  the value for user.create_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setCreateTime(Date createTime) {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 		this.createTime = createTime;
@@ -298,7 +283,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.number
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.number
 	 * @return  the value of user.number
 	 * @return  the value of user.number
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Long getNumber() {
 	public Long getNumber() {
 		return number;
 		return number;
@@ -307,7 +292,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param number  the value for user.number
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setNumber(Long number) {
 	public void setNumber(Long number) {
 		this.number = number;
 		this.number = number;
@@ -316,7 +301,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.lvl
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.lvl
 	 * @return  the value of user.lvl
 	 * @return  the value of user.lvl
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Integer getLvl() {
 	public Integer getLvl() {
 		return lvl;
 		return lvl;
@@ -325,7 +310,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param lvl  the value for user.lvl
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setLvl(Integer lvl) {
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
 		this.lvl = lvl;
@@ -334,7 +319,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.type
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.type
 	 * @return  the value of user.type
 	 * @return  the value of user.type
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Integer getType() {
 	public Integer getType() {
 		return type;
 		return type;
@@ -343,7 +328,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param type  the value for user.type
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setType(Integer type) {
 	public void setType(Integer type) {
 		this.type = type;
 		this.type = type;
@@ -352,7 +337,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.mid
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.mid
 	 * @return  the value of user.mid
 	 * @return  the value of user.mid
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getMid() {
 	public String getMid() {
 		return mid;
 		return mid;
@@ -361,7 +346,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param mid  the value for user.mid
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setMid(String mid) {
 	public void setMid(String mid) {
 		this.mid = mid;
 		this.mid = mid;
@@ -370,7 +355,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.status
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.status
 	 * @return  the value of user.status
 	 * @return  the value of user.status
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Integer getStatus() {
 	public Integer getStatus() {
 		return status;
 		return status;
@@ -379,7 +364,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param status  the value for user.status
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setStatus(Integer status) {
 	public void setStatus(Integer status) {
 		this.status = status;
 		this.status = status;
@@ -388,7 +373,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.source
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.source
 	 * @return  the value of user.source
 	 * @return  the value of user.source
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Integer getSource() {
 	public Integer getSource() {
 		return source;
 		return source;
@@ -397,7 +382,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param source  the value for user.source
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setSource(Integer source) {
 	public void setSource(Integer source) {
 		this.source = source;
 		this.source = source;
@@ -406,7 +391,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.update_time
 	 * 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
 	 * @return  the value of user.update_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Date getUpdateTime() {
 	public Date getUpdateTime() {
 		return updateTime;
 		return updateTime;
@@ -415,7 +400,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.update_time
 	 * 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
 	 * @param updateTime  the value for user.update_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setUpdateTime(Date updateTime) {
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 		this.updateTime = updateTime;
@@ -424,7 +409,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.company_logo_url
 	 * 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
 	 * @return  the value of user.company_logo_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getCompanyLogoUrl() {
 	public String getCompanyLogoUrl() {
 		return companyLogoUrl;
 		return companyLogoUrl;
@@ -433,7 +418,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.company_logo_url
 	 * 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
 	 * @param companyLogoUrl  the value for user.company_logo_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setCompanyLogoUrl(String companyLogoUrl) {
 	public void setCompanyLogoUrl(String companyLogoUrl) {
 		this.companyLogoUrl = companyLogoUrl;
 		this.companyLogoUrl = companyLogoUrl;
@@ -442,7 +427,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.head_portrait_url
 	 * 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
 	 * @return  the value of user.head_portrait_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getHeadPortraitUrl() {
 	public String getHeadPortraitUrl() {
 		return headPortraitUrl;
 		return headPortraitUrl;
@@ -451,7 +436,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.head_portrait_url
 	 * 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
 	 * @param headPortraitUrl  the value for user.head_portrait_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setHeadPortraitUrl(String headPortraitUrl) {
 	public void setHeadPortraitUrl(String headPortraitUrl) {
 		this.headPortraitUrl = headPortraitUrl;
 		this.headPortraitUrl = headPortraitUrl;
@@ -460,7 +445,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.society_tag
 	 * 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
 	 * @return  the value of user.society_tag
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getSocietyTag() {
 	public String getSocietyTag() {
 		return societyTag;
 		return societyTag;
@@ -469,7 +454,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.society_tag
 	 * 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
 	 * @param societyTag  the value for user.society_tag
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setSocietyTag(String societyTag) {
 	public void setSocietyTag(String societyTag) {
 		this.societyTag = societyTag;
 		this.societyTag = societyTag;
@@ -478,7 +463,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.introduction
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.introduction
 	 * @return  the value of user.introduction
 	 * @return  the value of user.introduction
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getIntroduction() {
 	public String getIntroduction() {
 		return introduction;
 		return introduction;
@@ -487,7 +472,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param introduction  the value for user.introduction
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setIntroduction(String introduction) {
 	public void setIntroduction(String introduction) {
 		this.introduction = introduction;
 		this.introduction = introduction;
@@ -496,7 +481,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.value_added_tag
 	 * 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
 	 * @return  the value of user.value_added_tag
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getValueAddedTag() {
 	public String getValueAddedTag() {
 		return valueAddedTag;
 		return valueAddedTag;
@@ -505,7 +490,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.value_added_tag
 	 * 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
 	 * @param valueAddedTag  the value for user.value_added_tag
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setValueAddedTag(String valueAddedTag) {
 	public void setValueAddedTag(String valueAddedTag) {
 		this.valueAddedTag = valueAddedTag;
 		this.valueAddedTag = valueAddedTag;
@@ -514,7 +499,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.organization_id
 	 * 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
 	 * @return  the value of user.organization_id
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getOrganizationId() {
 	public String getOrganizationId() {
 		return organizationId;
 		return organizationId;
@@ -523,7 +508,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.organization_id
 	 * 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
 	 * @param organizationId  the value for user.organization_id
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setOrganizationId(String organizationId) {
 	public void setOrganizationId(String organizationId) {
 		this.organizationId = organizationId;
 		this.organizationId = organizationId;
@@ -532,7 +517,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.identify_name
 	 * 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
 	 * @return  the value of user.identify_name
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getIdentifyName() {
 	public String getIdentifyName() {
 		return identifyName;
 		return identifyName;
@@ -541,7 +526,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.identify_name
 	 * 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
 	 * @param identifyName  the value for user.identify_name
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setIdentifyName(String identifyName) {
 	public void setIdentifyName(String identifyName) {
 		this.identifyName = identifyName;
 		this.identifyName = identifyName;
@@ -550,7 +535,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.background_url
 	 * 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
 	 * @return  the value of user.background_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getBackgroundUrl() {
 	public String getBackgroundUrl() {
 		return backgroundUrl;
 		return backgroundUrl;
@@ -559,7 +544,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.background_url
 	 * 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
 	 * @param backgroundUrl  the value for user.background_url
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setBackgroundUrl(String backgroundUrl) {
 	public void setBackgroundUrl(String backgroundUrl) {
 		this.backgroundUrl = backgroundUrl;
 		this.backgroundUrl = backgroundUrl;
@@ -568,7 +553,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.audit_opinion
 	 * 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
 	 * @return  the value of user.audit_opinion
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getAuditOpinion() {
 	public String getAuditOpinion() {
 		return auditOpinion;
 		return auditOpinion;
@@ -577,7 +562,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.audit_opinion
 	 * 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
 	 * @param auditOpinion  the value for user.audit_opinion
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setAuditOpinion(String auditOpinion) {
 	public void setAuditOpinion(String auditOpinion) {
 		this.auditOpinion = auditOpinion;
 		this.auditOpinion = auditOpinion;
@@ -586,7 +571,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.audit_status
 	 * 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
 	 * @return  the value of user.audit_status
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Integer getAuditStatus() {
 	public Integer getAuditStatus() {
 		return auditStatus;
 		return auditStatus;
@@ -595,7 +580,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.audit_status
 	 * 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
 	 * @param auditStatus  the value for user.audit_status
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setAuditStatus(Integer auditStatus) {
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
 		this.auditStatus = auditStatus;
@@ -604,7 +589,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.share_type
 	 * 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
 	 * @return  the value of user.share_type
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Integer getShareType() {
 	public Integer getShareType() {
 		return shareType;
 		return shareType;
@@ -613,7 +598,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.share_type
 	 * 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
 	 * @param shareType  the value for user.share_type
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setShareType(Integer shareType) {
 	public void setShareType(Integer shareType) {
 		this.shareType = shareType;
 		this.shareType = shareType;
@@ -622,7 +607,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.aid
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.aid
 	 * @return  the value of user.aid
 	 * @return  the value of user.aid
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getAid() {
 	public String getAid() {
 		return aid;
 		return aid;
@@ -631,7 +616,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.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
 	 * @param aid  the value for user.aid
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setAid(String aid) {
 	public void setAid(String aid) {
 		this.aid = aid;
 		this.aid = aid;
@@ -640,7 +625,7 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.transfer_time
 	 * 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
 	 * @return  the value of user.transfer_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Date getTransferTime() {
 	public Date getTransferTime() {
 		return transferTime;
 		return transferTime;
@@ -649,9 +634,143 @@ public class  User  extends BaseModel implements AftUser{
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.transfer_time
 	 * 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
 	 * @param transferTime  the value for user.transfer_time
-	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setTransferTime(Date transferTime) {
 	public void setTransferTime(Date transferTime) {
 		this.transferTime = transferTime;
 		this.transferTime = transferTime;
 	}
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.username
+	 * @return  the value of user.username
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
+	public String getUsername() {
+		return username;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.username
+	 * @param username  the value for user.username
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.authentication
+	 * @return  the value of user.authentication
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
+	public Integer getAuthentication() {
+		return authentication;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.authentication
+	 * @param authentication  the value for user.authentication
+	 * @mbg.generated  Thu Jun 07 15:24:57 CST 2018
+	 */
+	public void setAuthentication(Integer authentication) {
+		this.authentication = authentication;
+	}
+
+	/**
+	 * 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  Thu Jun 07 15:24:57 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  Thu Jun 07 15:24:57 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  Thu Jun 07 15:24:57 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  Thu Jun 07 15:24:57 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  Thu Jun 07 15:24:57 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  Thu Jun 07 15:24:57 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  Thu Jun 07 15:24:57 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  Thu Jun 07 15:24:57 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  Thu Jun 07 15:24:57 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  Thu Jun 07 15:24:57 CST 2018
+	 */
+	public void setCreditRating(Integer creditRating) {
+		this.creditRating = creditRating;
+	}
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3301500555091503770L;
+		public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
 }
 }

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

@@ -7,23 +7,23 @@ import java.util.List;
 public class UserExample {
 public class UserExample {
     /**
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	protected String orderByClause;
 	protected String orderByClause;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	protected boolean distinct;
 	protected boolean distinct;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	protected List<Criteria> oredCriteria;
 	protected List<Criteria> oredCriteria;
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public UserExample() {
 	public UserExample() {
 		oredCriteria = new ArrayList<Criteria>();
 		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
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setOrderByClause(String orderByClause) {
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = 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
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public String getOrderByClause() {
 	public String getOrderByClause() {
 		return orderByClause;
 		return orderByClause;
@@ -47,7 +47,7 @@ public class UserExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void setDistinct(boolean distinct) {
 	public void setDistinct(boolean distinct) {
 		this.distinct = 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
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public boolean isDistinct() {
 	public boolean isDistinct() {
 		return distinct;
 		return distinct;
@@ -63,7 +63,7 @@ public class UserExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public List<Criteria> getOredCriteria() {
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class UserExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void or(Criteria criteria) {
 	public void or(Criteria criteria) {
 		oredCriteria.add(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
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Criteria or() {
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
 		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
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public Criteria createCriteria() {
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
 		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
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	protected Criteria createCriteriaInternal() {
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
 		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
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public void clear() {
 	public void clear() {
 		oredCriteria.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
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	protected abstract static class GeneratedCriteria {
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
 		protected List<Criterion> criteria;
@@ -1882,11 +1882,481 @@ public class UserExample {
 			addCriterion("transfer_time not between", value1, value2, "transferTime");
 			addCriterion("transfer_time not between", value1, value2, "transferTime");
 			return (Criteria) this;
 			return (Criteria) this;
 		}
 		}
+
+		public Criteria andUsernameIsNull() {
+			addCriterion("username is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameIsNotNull() {
+			addCriterion("username is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameEqualTo(String value) {
+			addCriterion("username =", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameNotEqualTo(String value) {
+			addCriterion("username <>", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameGreaterThan(String value) {
+			addCriterion("username >", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameGreaterThanOrEqualTo(String value) {
+			addCriterion("username >=", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameLessThan(String value) {
+			addCriterion("username <", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameLessThanOrEqualTo(String value) {
+			addCriterion("username <=", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameLike(String value) {
+			addCriterion("username like", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameNotLike(String value) {
+			addCriterion("username not like", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameIn(List<String> values) {
+			addCriterion("username in", values, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameNotIn(List<String> values) {
+			addCriterion("username not in", values, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameBetween(String value1, String value2) {
+			addCriterion("username between", value1, value2, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameNotBetween(String value1, String value2) {
+			addCriterion("username not between", value1, value2, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationIsNull() {
+			addCriterion("authentication is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationIsNotNull() {
+			addCriterion("authentication is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationEqualTo(Integer value) {
+			addCriterion("authentication =", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationNotEqualTo(Integer value) {
+			addCriterion("authentication <>", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationGreaterThan(Integer value) {
+			addCriterion("authentication >", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationGreaterThanOrEqualTo(Integer value) {
+			addCriterion("authentication >=", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationLessThan(Integer value) {
+			addCriterion("authentication <", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationLessThanOrEqualTo(Integer value) {
+			addCriterion("authentication <=", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationIn(List<Integer> values) {
+			addCriterion("authentication in", values, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationNotIn(List<Integer> values) {
+			addCriterion("authentication not in", values, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationBetween(Integer value1, Integer value2) {
+			addCriterion("authentication between", value1, value2, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationNotBetween(Integer value1, Integer value2) {
+			addCriterion("authentication not between", value1, value2, "authentication");
+			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
 	 * 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  Thu Jun 07 15:24:57 CST 2018
 	 */
 	 */
 	public static class Criterion {
 	public static class Criterion {
 		private String condition;
 		private String condition;

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

@@ -51,6 +51,10 @@ public class CustomerListIn {
 	 */
 	 */
 	private String createTime;
 	private String createTime;
 	
 	
+	private Integer dataGrade;
+	
+	private Integer creditRating;
+	
 	
 	
 	public String getType() {
 	public String getType() {
 		return type;
 		return type;
@@ -179,4 +183,20 @@ public class CustomerListIn {
 	public void setId(String id) {
 	public void setId(String id) {
 		this.id = 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;
+	}
 }
 }

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

@@ -18,6 +18,9 @@ public class CustomerOrganizationDetailBo extends OrganizationIdentity{
 	private String accomplishSituation;
 	private String accomplishSituation;
 	/** '已有知识产权情况'*/
 	/** '已有知识产权情况'*/
 	private String intellectualProperty;
 	private String intellectualProperty;
+	/** 用户信用等级*/
+	private Integer creditRating;
+	
 	
 	
 	public String getInformationMaintainer() {
 	public String getInformationMaintainer() {
 		return informationMaintainer;
 		return informationMaintainer;
@@ -79,4 +82,10 @@ public class CustomerOrganizationDetailBo extends OrganizationIdentity{
 	public void setBusinessAudit(Integer businessAudit) {
 	public void setBusinessAudit(Integer businessAudit) {
 		this.businessAudit = businessAudit;
 		this.businessAudit = businessAudit;
 	}
 	}
+	public Integer getCreditRating() {
+		return creditRating;
+	}
+	public void setCreditRating(Integer creditRating) {
+		this.creditRating = creditRating;
+	}
 }
 }

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

@@ -994,14 +994,14 @@ public class AdminCustomerApiController extends BaseApiController{
 		res.data(customerService.updateInformationMaintainerr(id,aid));
 		res.data(customerService.updateInformationMaintainerr(id,aid));
 		return res;
 		return res;
 	}
 	}
-	/** 个人客户信息列表 **/
+	/** 个人单位客户信息列表 **/
 	@RequestMapping(value = "/listCustomerInformation", method = RequestMethod.POST)
 	@RequestMapping(value = "/listCustomerInformation", method = RequestMethod.POST)
 	public Result listCustomerInformation(CustomerListIn cli,Integer pageNo, Integer pageSize){
 	public Result listCustomerInformation(CustomerListIn cli,Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		Result res = new Result();
 		res.data(customerService.listCustomerInformation(cli,pageNo,pageSize));
 		res.data(customerService.listCustomerInformation(cli,pageNo,pageSize));
 		return res;
 		return res;
 	}
 	}
-	/** 所属客户信息列表 **/
+	/** 所属单位客户信息列表 **/
 	@RequestMapping(value = "/listDepCustomerInformation", method = RequestMethod.POST)
 	@RequestMapping(value = "/listDepCustomerInformation", method = RequestMethod.POST)
 	public Result listDepCustomerInformation(CustomerListIn cli,Integer pageNo, Integer pageSize){
 	public Result listDepCustomerInformation(CustomerListIn cli,Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		Result res = new Result();

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

@@ -194,6 +194,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		if(StringUtils.isNotBlank(cli.getSocietyTag())) params.put("societyTag", cli.getSocietyTag());
 		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.getStartDate())) params.put("startDate", cli.getStartDate()+" 00:00:00");
 		if(StringUtils.isNotBlank(cli.getEndDate())) params.put("endDate", cli.getEndDate()+" 23:59:59");
 		if(StringUtils.isNotBlank(cli.getEndDate())) params.put("endDate", cli.getEndDate()+" 23:59:59");
+		if(null!=cli.getDataGrade()) params.put("dataGrade", cli.getDataGrade());
 		return params;
 		return params;
 	}
 	}
 
 
@@ -306,6 +307,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 			user.setCoreTechnology(bo.getCoreTechnology());
 			user.setCoreTechnology(bo.getCoreTechnology());
 			user.setAccomplishSituation(bo.getAccomplishSituation());
 			user.setAccomplishSituation(bo.getAccomplishSituation());
 			user.setIntellectualProperty(bo.getIntellectualProperty());
 			user.setIntellectualProperty(bo.getIntellectualProperty());
+			user.setCreditRating(bo.getCreditRating());
 		} catch (IllegalAccessException |InvocationTargetException e) {
 		} catch (IllegalAccessException |InvocationTargetException e) {
 			e.printStackTrace();
 			e.printStackTrace();
 		} 
 		} 
@@ -1299,7 +1301,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	public Pagination<CustomerListIn> listCustomerInformation(CustomerListIn cli, Integer pageNo, Integer pageSize) {
 	public Pagination<CustomerListIn> listCustomerInformation(CustomerListIn cli, Integer pageNo, Integer pageSize) {
 			cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
 			cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
 			cli.setAid(TokenManager.getAdminId());
 			cli.setAid(TokenManager.getAdminId());
-			//cli.setAid("1");
+//			cli.setAid("1");
 			cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
 			cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
 			Map<String,Object> params = disposeParams(cli);
 			Map<String,Object> params = disposeParams(cli);
 			return (Pagination<CustomerListIn>) findPage("selectCustomerInformationList","selectCustomerInformationCount",params,pageNo,pageSize);
 			return (Pagination<CustomerListIn>) findPage("selectCustomerInformationList","selectCustomerInformationCount",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,"","客户编号"));
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","客户编号"));
 			return res;
 			return res;
 		}
 		}
+		if(orderServiceImpl.checkCustomerInformation(uid)){
+			res.getError().add(buildError("请到客户资料-客户资料维护模块完善您的客户信息!"));
+			return res;
+		}
 		if(orderType == null){
 		if(orderType == null){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单类型"));
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单类型"));
 			return res;
 			return res;

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

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

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

@@ -1950,4 +1950,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		
 		
 		
 		
 	}
 	}
+
+	@Override
+	public boolean checkCustomerInformation(String uid) {
+		userMapper.checkCustomerInformation(uid);
+		return false;
+	}
 }
 }