wanghui 8 年 前
コミット
455235ef51

File diff suppressed because it is too large
+ 519 - 591
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java


+ 28 - 31
src/main/java/com/goafanti/common/dao/MemberGradeMapper.java

@@ -1,37 +1,34 @@
 package com.goafanti.common.dao;
-
 import java.util.List;
 import java.util.Map;
-
 import com.goafanti.common.model.MemberOrder;
 import com.goafanti.memberGrade.bo.MemberGrade;
-
 public interface MemberGradeMapper {
-	List<MemberGrade> selectMemberGrade();
-	
-	int delGrade(int id); 
-	
-	int selectRank(MemberGrade me);
-	int addGradeName(MemberGrade me);
-	
-	int addBusinessAndCost(MemberGrade me);
-	
-	List<MemberOrder> selectMemberOrder(Map<String, Object> map);
-	
-	List<MemberOrder> selectMemberOrderBa(Map<String, Object> map);
-	
-	int countMemberOrder(String userId);
-	
-	int addBasicsMemberOrder(MemberOrder mo);
-	
-	int countMemberOrderWhere(Map<String, Object> map);
-		
-	int updateMemberOrder(Map<String, Object> map);
-	
-	int updateUserLvl(Map<String, Object> map);
-	
-	
-	
-	
-	
-}
+    List<MemberGrade> selectMemberGrade();
+    
+    int delGrade(int id); 
+    
+    int selectRank(MemberGrade me);
+    int addGradeName(MemberGrade me);
+    
+    int addBusinessAndCost(MemberGrade me);
+    
+    List<MemberOrder> selectMemberOrder(Map<String, Object> map);
+    
+    List<MemberOrder> selectMemberOrderBa(Map<String, Object> map);
+    
+    int countMemberOrder(String userId);
+    
+    int addBasicsMemberOrder(MemberOrder mo);
+    
+    int countMemberOrderWhere(Map<String, Object> map);
+        
+    int updateMemberOrder(Map<String, Object> map);
+    
+    int updateUserLvl(Map<String, Object> map);
+    
+    
+    
+    
+    
+}

+ 118 - 143
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -1,147 +1,122 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.MemberGradeMapper">
-
-
-	<resultMap id="memberOrderMap" type="com.goafanti.common.model.MemberOrder">
-		<id column="id" property="id" />
-		<result column="menber_type" property="menberType" />
-		<result column="gradeName" property="gradeName" />
-		<result column="price" property="price" />
-		<result column="valid_month" property="validMonth" />
-		<result column="order_state" property="orderState" />
-		<result column="order_time" property="orderTime" />
-		<result column="user_id" property="userId" />
-		<result column="payment_time" property="paymentTime" />
-		<result column="payment_value" property="paymentValue" />
-		<result column="payment_type" property="paymentType" />
-		<result column="payment_id" property="paymentId" />
-		<result column="valid_time" property="validTime" />
-	</resultMap>
-
-
-	<!-- 查询所有 -->
-	<select id="selectMemberGrade" resultType="com.goafanti.memberGrade.bo.MemberGrade">
-		SELECT * FROM
-		member_grade;
-	</select>
-
-	<!-- 删除会员等级 -->
-	<delete id="delGrade" parameterType="int">
-		DELETE FROM member_grade
-		WHERE id=#{id}
-	</delete>
-
-
-	<!-- 新增会员等级是否存在 -->
-	<select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
-		resultType="int">
-		SELECT COUNT(*) FROM member_grade WHERE
-		memberRank=#{memberRank}
-	</select>
-
-
-	<!-- 新增会员等级 -->
-	<insert id="addGradeName" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
-		useGeneratedKeys="true" keyProperty="id">
-		INSERT INTO
-		member_grade(gradeName,memberRank) VALUES (#{gradeName},#{memberRank})
-	</insert>
-
-
-	<!-- 为等级添加业务和费用 -->
-	<update id="addBusinessAndCost" parameterType="com.goafanti.memberGrade.bo.MemberGrade">
-		UPDATE
-		member_grade SET business=#{business},cost=#{cost} WHERE id=#{id}
-	</update>
-
-
-	<!-- 前台会员订单查询 -->
-	<select id="selectMemberOrder" parameterType="java.util.Map"
-		resultMap="memberOrderMap">
-		SELECT mo.id,menber_type , mg.gradeName, price,
-		valid_month,order_state ,order_time ,user_id ,
-		payment_time,payment_value,payment_type ,payment_id ,valid_time
-		FROM member_order mo
-		LEFT JOIN member_grade mg ON mg.memberRank=mo.menber_Type
-		WHERE user_id=#{id}
-		LIMIT #{pNos},#{pSize}
-	</select>
-
-
-	<!-- 后台会员订单查询 -->
-	<select id="selectMemberOrderBa" parameterType="java.util.Map"
-		resultMap="memberOrderMap">
-		SELECT mo.id,menber_type ,u.mobile ,u.nickname,mg.gradeName, price,
-		valid_month,order_state ,order_time ,user_id ,
-		payment_time
-		,payment_value,payment_type ,payment_id ,valid_time FROM member_order
-		mo
-		LEFT JOIN member_grade mg ON mg.memberRank=mo.menber_Type
-		LEFT JOIN user u ON
-		u.id=mo.user_id
-		WHERE 1=1
-		<if test="id!=null">AND mo.id=#{id}</if>
-		<if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
-		<if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
-		<if test="orderState!=null">AND order_state LIKE CONCAT('%',#{orderState},'%')</if>
-		<if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
-		<if test="endTimes!=null">AND order_time&lt;#{endTimes}</if>
-		LIMIT #{pNos},#{pSize}
-	</select>
-
-
-	<!-- 后台查询总记录 -->
-	<select id="countMemberOrderWhere" parameterType="java.util.Map"
-		resultType="int">
-		SELECT COUNT(*) FROM member_order mo
-		LEFT JOIN member_grade mg ON
-		mg.id=mo.menber_Type
-		LEFT JOIN user u ON u.id=mo.user_id
-		WHERE 1=1
-		<if test="id!=null">AND mo.id LIKE CONCAT('%',#{id},'%')</if>
-		<if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
-		<if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
-		<if test="orderState!=null">AND order_state LIKE CONCAT('%',#{orderState},'%')</if>
-		<if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
-		<if test="endTimes!=null">AND order_time&lt;=#{endTimes}</if>
-	</select>
-
-	<!-- 前台生成订单 -->
-	<insert id="addBasicsMemberOrder" parameterType="com.goafanti.common.model.MemberOrder">
-		INSERT INTO
-		member_order(id,menber_type,price,valid_month,order_state,order_time,user_id)
-		VALUES(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId})
-	</insert>
-
-	<select id="countMemberOrder" parameterType="String"  resultType="int">
-		SELECT COUNT(*) FROM
-		member_order
-		WHERE  user_id=#{userId}
-	</select>
-
-	<!-- 后台订单更改 -->
-	<update id="updateMemberOrder" parameterType="java.util.Map" >
-		UPDATE member_order SET 
-		menber_type=#{menberType},
-		valid_month=#{validMonth},
-		payment_value=#{paymentValue},
-		order_state=#{orderState},
-		payment_time=#{paymentTime},
-		payment_type=#{paymentType}
-		WHERE id=#{id}
-	</update>
-
-	<!-- 更改用户会员等级 -->
-	<update id="updateUserLvl" parameterType="java.util.Map">
-		UPDATE user SET lvl=#{lvl}  WHERE id=#{userId}
-	</update>
-	
-	
-	
-	
-
-
-
-
+    <resultMap id="memberOrderMap" type="com.goafanti.common.model.MemberOrder">
+        <id column="id" property="id" />
+        <result column="menber_type" property="menberType" />
+        <result column="gradeName" property="gradeName" />
+        <result column="price" property="price" />
+        <result column="valid_month" property="validMonth" />
+        <result column="order_state" property="orderState" />
+        <result column="order_time" property="orderTime" />
+        <result column="user_id" property="userId" />
+        <result column="payment_time" property="paymentTime" />
+        <result column="payment_value" property="paymentValue" />
+        <result column="payment_type" property="paymentType" />
+        <result column="payment_id" property="paymentId" />
+        <result column="valid_time" property="validTime" />
+    </resultMap>
+    <!-- 查询所有 -->
+    <select id="selectMemberGrade" resultType="com.goafanti.memberGrade.bo.MemberGrade">
+        SELECT * FROM
+        member_grade;
+    </select>
+    <!-- 删除会员等级 -->
+    <delete id="delGrade" parameterType="int">
+        DELETE FROM member_grade
+        WHERE id=#{id}
+    </delete>
+    <!-- 新增会员等级是否存在 -->
+    <select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
+        resultType="int">
+        SELECT COUNT(*) FROM member_grade WHERE
+        memberRank=#{memberRank}
+    </select>
+    <!-- 新增会员等级 -->
+    <insert id="addGradeName" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
+        useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO
+        member_grade(gradeName,memberRank) VALUES (#{gradeName},#{memberRank})
+    </insert>
+    <!-- 为等级添加业务和费用 -->
+    <update id="addBusinessAndCost" parameterType="com.goafanti.memberGrade.bo.MemberGrade">
+        UPDATE
+        member_grade SET business=#{business},cost=#{cost} WHERE id=#{id}
+    </update>
+    <!-- 前台会员订单查询 -->
+    <select id="selectMemberOrder" parameterType="java.util.Map"
+        resultMap="memberOrderMap">
+        SELECT mo.id,menber_type , mg.gradeName, price,
+        valid_month,order_state ,order_time ,user_id ,
+        payment_time,payment_value,payment_type ,payment_id ,valid_time
+        FROM member_order mo
+        LEFT JOIN member_grade mg ON mg.memberRank=mo.menber_Type
+        WHERE user_id=#{id}
+        LIMIT #{pNos},#{pSize}
+    </select>
+    <!-- 后台会员订单查询 -->
+    <select id="selectMemberOrderBa" parameterType="java.util.Map"
+        resultMap="memberOrderMap">
+        SELECT mo.id,menber_type ,u.mobile ,u.nickname,mg.gradeName, price,
+        valid_month,order_state ,order_time ,user_id ,
+        payment_time
+        ,payment_value,payment_type ,payment_id ,valid_time FROM member_order
+        mo
+        LEFT JOIN member_grade mg ON mg.memberRank=mo.menber_Type
+        LEFT JOIN user u ON
+        u.id=mo.user_id
+        WHERE 1=1
+        <if test="id!=null">AND mo.id=#{id}</if>
+        <if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
+        <if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
+        <if test="orderState!=null">AND order_state LIKE CONCAT('%',#{orderState},'%')</if>
+        <if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
+        <if test="endTimes!=null">AND order_time&lt;#{endTimes}</if>
+        LIMIT #{pNos},#{pSize}
+    </select>
+    <!-- 后台查询总记录 -->
+    <select id="countMemberOrderWhere" parameterType="java.util.Map"
+        resultType="int">
+        SELECT COUNT(*) FROM member_order mo
+        LEFT JOIN member_grade mg ON
+        mg.id=mo.menber_Type
+        LEFT JOIN user u ON u.id=mo.user_id
+        WHERE 1=1
+        <if test="id!=null">AND mo.id LIKE CONCAT('%',#{id},'%')</if>
+        <if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
+        <if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
+        <if test="orderState!=null">AND order_state LIKE CONCAT('%',#{orderState},'%')</if>
+        <if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
+        <if test="endTimes!=null">AND order_time&lt;=#{endTimes}</if>
+    </select>
+    <!-- 前台生成订单 -->
+    <insert id="addBasicsMemberOrder" parameterType="com.goafanti.common.model.MemberOrder">
+        INSERT INTO
+        member_order(id,menber_type,price,valid_month,order_state,order_time,user_id)
+        VALUES(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId})
+    </insert>
+    <select id="countMemberOrder" parameterType="String"  resultType="int">
+        SELECT COUNT(*) FROM
+        member_order
+        WHERE  user_id=#{userId}
+    </select>
+    <!-- 后台订单更改 -->
+    <update id="updateMemberOrder" parameterType="java.util.Map" >
+        UPDATE member_order SET 
+        menber_type=#{menberType},
+        valid_month=#{validMonth},
+        payment_value=#{paymentValue},
+        order_state=#{orderState},
+        payment_time=#{paymentTime},
+        payment_type=#{paymentType}
+        WHERE id=#{id}
+    </update>
+    <!-- 更改用户会员等级 -->
+    <update id="updateUserLvl" parameterType="java.util.Map">
+        UPDATE user SET lvl=#{lvl}  WHERE id=#{userId}
+    </update>
+    
+    
+    
+    
 </mapper>

+ 21 - 21
src/main/java/com/goafanti/common/mapper/MyAppMapper.xml

@@ -3,34 +3,34 @@
 <mapper namespace="com.goafanti.common.dao.MyAppMapper">
   <select id="countCollections" parameterType="String" resultType="org.springframework.ui.ModelMap">
   	select 
-	(select count(1) from achievement_interest ai where ai.uid=#{uid,jdbcType=VARCHAR}) as achievement,
-	(select count(1) from demand_interest di where di.uid=#{uid,jdbcType=VARCHAR}) as demand,
-	(SELECT count(1) FROM user_interest uin left join user u on uin.to_uid=u.id where u.type=0 and uin.from_uid=#{uid,jdbcType=VARCHAR}) as expert,
-	(SELECT count(1) FROM user_interest uin left join organization_info oi on uin.to_uid=oi.uid where oi.identity_type='企业' and uin.from_uid=#{uid,jdbcType=VARCHAR}) as company,
-	(SELECT count(1) FROM user_interest uin left join organization_info oi on uin.to_uid=oi.uid where oi.identity_type='院校' and uin.from_uid=#{uid,jdbcType=VARCHAR}) as school,
-	(SELECT count(1) FROM user_interest uin left join organization_info oi on uin.to_uid=oi.uid where oi.identity_type='研究机构' and uin.from_uid=#{uid,jdbcType=VARCHAR}) as institute
+    (select count(1) from achievement_interest ai where ai.uid=#{uid,jdbcType=VARCHAR}) as achievement,
+    (select count(1) from demand_interest di where di.uid=#{uid,jdbcType=VARCHAR}) as demand,
+    (SELECT count(1) FROM user_interest uin left join user u on uin.to_uid=u.id where u.type=0 and uin.from_uid=#{uid,jdbcType=VARCHAR}) as expert,
+    (SELECT count(1) FROM user_interest uin left join organization_info oi on uin.to_uid=oi.uid where oi.identity_type='企业' and uin.from_uid=#{uid,jdbcType=VARCHAR}) as company,
+    (SELECT count(1) FROM user_interest uin left join organization_info oi on uin.to_uid=oi.uid where oi.identity_type='院校' and uin.from_uid=#{uid,jdbcType=VARCHAR}) as school,
+    (SELECT count(1) FROM user_interest uin left join organization_info oi on uin.to_uid=oi.uid where oi.identity_type='研究机构' and uin.from_uid=#{uid,jdbcType=VARCHAR}) as institute
   </select>
   <select id="countOrders" parameterType="String" resultType="org.springframework.ui.ModelMap">
   	select 
-	(select count(1) from org_cognizance where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as hightech,
-	(select count(1) from tech_project where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as program,
-	(SELECT count(1) FROM patent_info where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as patent,
-	(SELECT count(1) FROM value_evaluation where uid=#{uid,jdbcType=VARCHAR}) as evalution,
-	(SELECT count(1) FROM activity_user where uid=#{uid,jdbcType=VARCHAR}) as activity,
-	(SELECT count(1) FROM achievement_order where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as achievement,
-	(SELECT count(1) FROM demand_order where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as demand,
-	(SELECT count(1) FROM copyright_info where uid=#{uid,jdbcType=VARCHAR} and delete_sign=0) as copyright
+    (select count(1) from org_cognizance where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as hightech,
+    (select count(1) from tech_project where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as program,
+    (SELECT count(1) FROM patent_info where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as patent,
+    (SELECT count(1) FROM value_evaluation where uid=#{uid,jdbcType=VARCHAR}) as evalution,
+    (SELECT count(1) FROM activity_user where uid=#{uid,jdbcType=VARCHAR}) as activity,
+    (SELECT count(1) FROM achievement_order where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as achievement,
+    (SELECT count(1) FROM demand_order where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as demand,
+    (SELECT count(1) FROM copyright_info where uid=#{uid,jdbcType=VARCHAR} and delete_sign=0) as copyright
   </select>
   <select id="countMyTech" parameterType="String" resultType="org.springframework.ui.ModelMap">
   	select 
-	(select count(1) from achievement a left join achievement_demand ad on a.id=ad.achievement_id where ad.demand_id is not null and a.owner_id=#{uid,jdbcType=VARCHAR}) as `match`,
-	(select count(1) from achievement a left join achievement_order ao on a.id=ao.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR} and ao.status  <![CDATA[ > ]]>  5 and (ao.service_money  <![CDATA[ > ]]> 0 or ao.commission <![CDATA[ > ]]> 0 or ao.intention_money <![CDATA[ > ]]> 0)) as `deal`,
-	(select count(1) from achievement a left join achievement_order iao on a.id=iao.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR} and iao.status  <![CDATA[ < ]]> 6) as `intention`
+    (select count(1) from achievement a left join achievement_demand ad on a.id=ad.achievement_id where ad.demand_id is not null and a.owner_id=#{uid,jdbcType=VARCHAR}) as `match`,
+    (select count(1) from achievement a left join achievement_order ao on a.id=ao.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR} and ao.status  <![CDATA[ > ]]>  5 and (ao.service_money  <![CDATA[ > ]]> 0 or ao.commission <![CDATA[ > ]]> 0 or ao.intention_money <![CDATA[ > ]]> 0)) as `deal`,
+    (select count(1) from achievement a left join achievement_order iao on a.id=iao.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR} and iao.status  <![CDATA[ < ]]> 6) as `intention`
   </select>
   <select id="countMyDemand" parameterType="String" resultType="org.springframework.ui.ModelMap">
-	select 
-	(select count(1) from demand d left join achievement_demand ad on d.id=ad.demand_id where ad.demand_id is not null and d.employer_id=#{uid,jdbcType=VARCHAR}) as `match`,
-	(select count(1) from demand d left join demand_order `do` on d.id=`do`.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR} and `do`.status <![CDATA[ > ]]> 5 and (`do`.service_money <![CDATA[ > ]]> 0 or `do`.commission <![CDATA[ > ]]> 0 or `do`.intention_money <![CDATA[ > ]]> 0)) as `deal`,
-	(select count(1) from demand d left join demand_order `ido` on d.id=`ido`.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR} and `ido`.status <![CDATA[ < ]]> 6) as `intention`
+    select 
+    (select count(1) from demand d left join achievement_demand ad on d.id=ad.demand_id where ad.demand_id is not null and d.employer_id=#{uid,jdbcType=VARCHAR}) as `match`,
+    (select count(1) from demand d left join demand_order `do` on d.id=`do`.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR} and `do`.status <![CDATA[ > ]]> 5 and (`do`.service_money <![CDATA[ > ]]> 0 or `do`.commission <![CDATA[ > ]]> 0 or `do`.intention_money <![CDATA[ > ]]> 0)) as `deal`,
+    (select count(1) from demand d left join demand_order `ido` on d.id=`ido`.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR} and `ido`.status <![CDATA[ < ]]> 6) as `intention`
   </select>
 </mapper>

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

@@ -209,12 +209,12 @@
   
   <select id="selectUserDownLoadBoByUserId" resultMap="UserDownLoadBo" parameterType="java.lang.String">
   	select u.id,i.positive_id_url ,i.opposite_id_url,c.professional_certificate_url,c.qualification_certificate_url,
-	  e.diploma_url, e.degree_diploma_url
-	  from user u 
-		LEFT JOIN user_identity i on u.id = i.uid
-		LEFT JOIN user_career c on u.id = c.uid
-		LEFT JOIN user_edu e on u.id = e.uid 
-	where u.id =#{id,jdbcType=VARCHAR}
+      e.diploma_url, e.degree_diploma_url
+      from user u 
+        LEFT JOIN user_identity i on u.id = i.uid
+        LEFT JOIN user_career c on u.id = c.uid
+        LEFT JOIN user_edu e on u.id = e.uid 
+    where u.id =#{id,jdbcType=VARCHAR}
   </select>
   
   <select id="findUserListByPage" parameterType="String" resultType="com.goafanti.user.bo.UserListBo">
@@ -235,30 +235,30 @@
     LEFT JOIN user_identity i 
     ON u.id = i.uid  where u.type = 0
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-	<if test = "email != null">
-	    and u.email = #{email,jdbcType=VARCHAR}
-	</if>
-	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test = "pEnd != null">
-		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test=" number != null">
-		and u.number = #{number,jdbcType=INTEGER}
-	</if>
-	<if test="username != null">
-		and i.username like CONCAT ('%',#{username,jdbcType=VARCHAR},'%')   
-	</if>
-	<if test="auditStatus != null">
-		and i.audit_status= #{auditStatus,jdbcType=INTEGER}
-	</if>
-	order by u.number desc
-	<if test="page_sql!=null">
-		${page_sql}
-	</if>
+        and u.mobile = #{mobile,jdbcType=VARCHAR}
+    </if>
+    <if test = "email != null">
+        and u.email = #{email,jdbcType=VARCHAR}
+    </if>
+    <if test = "pStart != null" >
+        and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+    </if>
+    <if test = "pEnd != null">
+        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+    </if>
+    <if test=" number != null">
+        and u.number = #{number,jdbcType=INTEGER}
+    </if>
+    <if test="username != null">
+        and i.username like CONCAT ('%',#{username,jdbcType=VARCHAR},'%')   
+    </if>
+    <if test="auditStatus != null">
+        and i.audit_status= #{auditStatus,jdbcType=INTEGER}
+    </if>
+    order by u.number desc
+    <if test="page_sql!=null">
+        ${page_sql}
+    </if>
   </select>
   
   <select id="findUserCount" resultType="java.lang.Integer" parameterType="String">
@@ -267,26 +267,26 @@
     ON u.id = i.uid 
     WHERE u.type = 0
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-	<if test = "email != null">
-	    and u.email = #{email,jdbcType=VARCHAR}
-	</if>
-	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test = "pEnd != null">
-		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="number != null">
-		and u.number = #{number,jdbcType=INTEGER}
-	</if>
-	<if test="username != null">
-		and i.username like CONCAT ('%',#{username,jdbcType=VARCHAR},'%') 
-	</if>
-	<if test="auditStatus != null">
-		and i.audit_status= #{auditStatus,jdbcType=INTEGER}
-	</if>
+        and u.mobile = #{mobile,jdbcType=VARCHAR}
+    </if>
+    <if test = "email != null">
+        and u.email = #{email,jdbcType=VARCHAR}
+    </if>
+    <if test = "pStart != null" >
+        and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+    </if>
+    <if test = "pEnd != null">
+        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+    </if>
+    <if test="number != null">
+        and u.number = #{number,jdbcType=INTEGER}
+    </if>
+    <if test="username != null">
+        and i.username like CONCAT ('%',#{username,jdbcType=VARCHAR},'%') 
+    </if>
+    <if test="auditStatus != null">
+        and i.audit_status= #{auditStatus,jdbcType=INTEGER}
+    </if>
   </select>  
   
   <select id="findOrgListByPage" parameterType="String" resultType="com.goafanti.user.bo.OrgListBo">
@@ -296,38 +296,38 @@
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
     LEFT JOIN admin ad on ad.id = u.mid
-	LEFT JOIN organization_identity o 
+    LEFT JOIN organization_identity o 
     ON u.id = o.uid 
     WHERE u.type = 1
    
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-	<if test = "uid != null">
-	    and u.id = #{uid,jdbcType=VARCHAR}
-	</if>
-	<if test = "email != null">
-	    and u.email = #{email,jdbcType=VARCHAR}
-	</if>
-	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test = "pEnd != null">
-		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test=" number != null">
-		and u.number = #{number,jdbcType=INTEGER}
-	</if>
-	<if test="unitName != null">
-		and o.unit_name = #{unitName,jdbcType=VARCHAR}
-	</if>
-	<if test="auditStatus != null">
-		and o.audit_status= #{auditStatus,jdbcType=INTEGER}
-	</if>
-	order by u.number desc
-	<if test="page_sql!=null">
-		${page_sql}
-	</if>
+        and u.mobile = #{mobile,jdbcType=VARCHAR}
+    </if>
+    <if test = "uid != null">
+        and u.id = #{uid,jdbcType=VARCHAR}
+    </if>
+    <if test = "email != null">
+        and u.email = #{email,jdbcType=VARCHAR}
+    </if>
+    <if test = "pStart != null" >
+        and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
+    </if>
+    <if test = "pEnd != null">
+        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+    </if>
+    <if test=" number != null">
+        and u.number = #{number,jdbcType=INTEGER}
+    </if>
+    <if test="unitName != null">
+        and o.unit_name = #{unitName,jdbcType=VARCHAR}
+    </if>
+    <if test="auditStatus != null">
+        and o.audit_status= #{auditStatus,jdbcType=INTEGER}
+    </if>
+    order by u.number desc
+    <if test="page_sql!=null">
+        ${page_sql}
+    </if>
   </select>
   
   <select id="findOrgCount" resultType="java.lang.Integer" parameterType="String">
@@ -336,29 +336,29 @@
     ON u.id = o.uid 
     WHERE u.type = 1
     <if test = "uid != null">
-	    and u.id = #{uid,jdbcType=VARCHAR}
-	</if>
+        and u.id = #{uid,jdbcType=VARCHAR}
+    </if>
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-	<if test = "email != null">
-	    and u.email = #{email,jdbcType=VARCHAR}
-	</if>
-	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test = "pEnd != null">
-		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test=" number != null">
-		and u.number = #{number,jdbcType=INTEGER}
-	</if>
-	<if test="unitName != null">
-		and o.unit_name = #{unitName,jdbcType=VARCHAR}
-	</if>
-	<if test="auditStatus != null">
-		and o.audit_status= #{auditStatus,jdbcType=INTEGER}
-	</if>
+        and u.mobile = #{mobile,jdbcType=VARCHAR}
+    </if>
+    <if test = "email != null">
+        and u.email = #{email,jdbcType=VARCHAR}
+    </if>
+    <if test = "pStart != null" >
+        and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
+    </if>
+    <if test = "pEnd != null">
+        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+    </if>
+    <if test=" number != null">
+        and u.number = #{number,jdbcType=INTEGER}
+    </if>
+    <if test="unitName != null">
+        and o.unit_name = #{unitName,jdbcType=VARCHAR}
+    </if>
+    <if test="auditStatus != null">
+        and o.audit_status= #{auditStatus,jdbcType=INTEGER}
+    </if>
   </select>  
   
    <select id="findUserByAidWithParamsListByPage" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgListBo">
@@ -377,7 +377,7 @@
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
     LEFT JOIN admin ma on ma.id = u.mid 
-	LEFT JOIN user_identity i on u.id = i.uid
+    LEFT JOIN user_identity i on u.id = i.uid
     where u.type = 0
     <if test="aid != null">
     	and u.aid = #{aid,jdbcType=VARCHAR}
@@ -405,8 +405,8 @@
     </if>
     order by u.number desc
     <if test="page_sql!=null">
-		${page_sql}
-	</if>
+        ${page_sql}
+    </if>
   </select>
   
   <select id="findUserByAidWithParamsCount" parameterType="String" resultType="java.lang.Integer">
@@ -414,7 +414,7 @@
     	count(1)
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
-	LEFT JOIN user_identity i on u.id = i.uid
+    LEFT JOIN user_identity i on u.id = i.uid
     where u.type = 0
     <if test="aid != null">
     	and u.aid = #{aid,jdbcType=VARCHAR}
@@ -459,7 +459,7 @@
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
     LEFT JOIN admin ma on ma.id = u.mid 
-	LEFT JOIN organization_identity i on u.id = i.uid
+    LEFT JOIN organization_identity i on u.id = i.uid
     where u.type = 1
     <if test="aid != null">
     	and u.aid = #{aid,jdbcType=VARCHAR}
@@ -487,8 +487,8 @@
     </if>
     order by u.number desc
     <if test="page_sql!=null">
-		${page_sql}
-	</if>
+        ${page_sql}
+    </if>
   </select>
   
   <select id="findOrgByAidWithParamsCount" parameterType="String" resultType="java.lang.Integer">
@@ -496,7 +496,7 @@
     	count(1)
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
-	LEFT JOIN organization_identity i on u.id = i.uid
+    LEFT JOIN organization_identity i on u.id = i.uid
     where u.type = 1
     <if test="aid != null">
     	and u.aid = #{aid,jdbcType=VARCHAR}
@@ -572,44 +572,44 @@
     LEFT JOIN user_identity i on u.id = i.uid  
     where u.type = 0
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-	<if test = "email != null">
-	    and u.email = #{email,jdbcType=VARCHAR}
-	</if>
-	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test = "pEnd != null">
-		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test=" number != null">
-		and u.number = #{number,jdbcType=INTEGER}
-	</if>
-	<if test="username != null">
-		and i.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')   
-	</if>
-	<if test="auditStatus != null">
-		and i.audit_status= #{auditStatus,jdbcType=INTEGER}
-	</if>
-	
-	 <if test="provinceList != null">
-	   and  i.province in
-	    <foreach collection="provinceList" item="plist"  open="(" separator="," close=")">
-			#{plist}
-		</foreach>
-	</if>
-	<if test="cityList != null">
-		and i.city in 
-		<foreach collection="cityList" item="clist"  open="(" separator="," close=")">
-			#{clist}
-		</foreach>
-	</if>
-	
-	order by u.number desc
-	<if test="page_sql!=null">
-		${page_sql}
-	</if>
+        and u.mobile = #{mobile,jdbcType=VARCHAR}
+    </if>
+    <if test = "email != null">
+        and u.email = #{email,jdbcType=VARCHAR}
+    </if>
+    <if test = "pStart != null" >
+        and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+    </if>
+    <if test = "pEnd != null">
+        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+    </if>
+    <if test=" number != null">
+        and u.number = #{number,jdbcType=INTEGER}
+    </if>
+    <if test="username != null">
+        and i.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')   
+    </if>
+    <if test="auditStatus != null">
+        and i.audit_status= #{auditStatus,jdbcType=INTEGER}
+    </if>
+    
+     <if test="provinceList != null">
+       and  i.province in
+        <foreach collection="provinceList" item="plist"  open="(" separator="," close=")">
+            #{plist}
+        </foreach>
+    </if>
+    <if test="cityList != null">
+        and i.city in 
+        <foreach collection="cityList" item="clist"  open="(" separator="," close=")">
+            #{clist}
+        </foreach>
+    </if>
+    
+    order by u.number desc
+    <if test="page_sql!=null">
+        ${page_sql}
+    </if>
   </select>
   
   <select id="findAreaManagerUserCount" resultType="java.lang.Integer" parameterType="String">
@@ -618,39 +618,39 @@
     ON u.id = i.uid 
     WHERE u.type = 0
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-	<if test = "email != null">
-	    and u.email = #{email,jdbcType=VARCHAR}
-	</if>
-	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test = "pEnd != null">
-		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test="number != null">
-		and u.number = #{number,jdbcType=INTEGER}
-	</if>
-	<if test="username != null">
-		and i.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')   
-	</if>
-	<if test="auditStatus != null">
-		and i.audit_status= #{auditStatus,jdbcType=INTEGER}
-	</if>
-	
-	 <if test="provinceList != null">
-	   and  i.province in
-	    <foreach collection="provinceList" item="plist"  open="(" separator="," close=")">
-			#{plist}
-		</foreach>
-	</if>
-	<if test="cityList != null">
-		and i.city in 
-		<foreach collection="cityList" item="clist"  open="(" separator="," close=")">
-			#{clist}
-		</foreach>
-	</if>
+        and u.mobile = #{mobile,jdbcType=VARCHAR}
+    </if>
+    <if test = "email != null">
+        and u.email = #{email,jdbcType=VARCHAR}
+    </if>
+    <if test = "pStart != null" >
+        and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+    </if>
+    <if test = "pEnd != null">
+        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+    </if>
+    <if test="number != null">
+        and u.number = #{number,jdbcType=INTEGER}
+    </if>
+    <if test="username != null">
+        and i.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')   
+    </if>
+    <if test="auditStatus != null">
+        and i.audit_status= #{auditStatus,jdbcType=INTEGER}
+    </if>
+    
+     <if test="provinceList != null">
+       and  i.province in
+        <foreach collection="provinceList" item="plist"  open="(" separator="," close=")">
+            #{plist}
+        </foreach>
+    </if>
+    <if test="cityList != null">
+        and i.city in 
+        <foreach collection="cityList" item="clist"  open="(" separator="," close=")">
+            #{clist}
+        </foreach>
+    </if>
   </select>  
   
    <select id="findAreaManagerOrgListByPage" parameterType="String" resultType="com.goafanti.user.bo.OrgListBo">
@@ -668,48 +668,48 @@
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
     LEFT JOIN admin ad on ad.id = u.mid
-	LEFT JOIN organization_identity o on u.id = o.uid 
+    LEFT JOIN organization_identity o on u.id = o.uid 
     WHERE u.type = 1
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-	<if test = "uid != null">
-	    and u.id = #{uid,jdbcType=VARCHAR}
-	</if>
-	<if test = "email != null">
-	    and u.email = #{email,jdbcType=VARCHAR}
-	</if>
-	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test = "pEnd != null">
-		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test=" number != null">
-		and u.number = #{number,jdbcType=INTEGER}
-	</if>
-	<if test="unitName != null">
-		and o.unit_name like '%'#{unitName,jdbcType=VARCHAR}'%'
-	</if>
-	<if test="auditStatus != null">
-		and o.audit_status= #{auditStatus,jdbcType=INTEGER}
-	</if>
-	 <if test="provinceList != null">
-	   and  o.licence_province in
-	    <foreach collection="provinceList" item="plist"  open="(" separator="," close=")">
-			#{plist}
-		</foreach>
-	</if>
-	<if test="cityList != null">
-		and o.licence_city in 
-		<foreach collection="cityList" item="clist"  open="(" separator="," close=")">
-			#{clist}
-		</foreach>
-	</if>
-	order by u.number desc
-	<if test="page_sql!=null">
-		${page_sql}
-	</if>
+        and u.mobile = #{mobile,jdbcType=VARCHAR}
+    </if>
+    <if test = "uid != null">
+        and u.id = #{uid,jdbcType=VARCHAR}
+    </if>
+    <if test = "email != null">
+        and u.email = #{email,jdbcType=VARCHAR}
+    </if>
+    <if test = "pStart != null" >
+        and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
+    </if>
+    <if test = "pEnd != null">
+        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+    </if>
+    <if test=" number != null">
+        and u.number = #{number,jdbcType=INTEGER}
+    </if>
+    <if test="unitName != null">
+        and o.unit_name like '%'#{unitName,jdbcType=VARCHAR}'%'
+    </if>
+    <if test="auditStatus != null">
+        and o.audit_status= #{auditStatus,jdbcType=INTEGER}
+    </if>
+     <if test="provinceList != null">
+       and  o.licence_province in
+        <foreach collection="provinceList" item="plist"  open="(" separator="," close=")">
+            #{plist}
+        </foreach>
+    </if>
+    <if test="cityList != null">
+        and o.licence_city in 
+        <foreach collection="cityList" item="clist"  open="(" separator="," close=")">
+            #{clist}
+        </foreach>
+    </if>
+    order by u.number desc
+    <if test="page_sql!=null">
+        ${page_sql}
+    </if>
   </select>
   
   <select id="findAreaManagerOrgCount" resultType="java.lang.Integer" parameterType="String">
@@ -718,93 +718,93 @@
     ON u.id = o.uid 
     WHERE u.type = 1
     <if test = "uid != null">
-	    and u.id = #{uid,jdbcType=VARCHAR}
-	</if>
+        and u.id = #{uid,jdbcType=VARCHAR}
+    </if>
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-	<if test = "email != null">
-	    and u.email = #{email,jdbcType=VARCHAR}
-	</if>
-	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test = "pEnd != null">
-		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test=" number != null">
-		and u.number = #{number,jdbcType=INTEGER}
-	</if>
-	<if test="unitName != null">
-		and o.unit_name like '%'#{unitName,jdbcType=VARCHAR}'%'
-	</if>
-	<if test="auditStatus != null">
-		and o.audit_status= #{auditStatus,jdbcType=INTEGER}
-	</if>
-	 <if test="provinceList != null">
-	   and  i.province in
-	    <foreach collection="provinceList" item="plist"  open="(" separator="," close=")">
-			#{plist}
-		</foreach>
-	</if>
-	<if test="cityList != null">
-		and i.city in 
-		<foreach collection="cityList" item="clist"  open="(" separator="," close=")">
-			#{clist}
-		</foreach>
-	</if>
+        and u.mobile = #{mobile,jdbcType=VARCHAR}
+    </if>
+    <if test = "email != null">
+        and u.email = #{email,jdbcType=VARCHAR}
+    </if>
+    <if test = "pStart != null" >
+        and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
+    </if>
+    <if test = "pEnd != null">
+        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+    </if>
+    <if test=" number != null">
+        and u.number = #{number,jdbcType=INTEGER}
+    </if>
+    <if test="unitName != null">
+        and o.unit_name like '%'#{unitName,jdbcType=VARCHAR}'%'
+    </if>
+    <if test="auditStatus != null">
+        and o.audit_status= #{auditStatus,jdbcType=INTEGER}
+    </if>
+     <if test="provinceList != null">
+       and  i.province in
+        <foreach collection="provinceList" item="plist"  open="(" separator="," close=")">
+            #{plist}
+        </foreach>
+    </if>
+    <if test="cityList != null">
+        and i.city in 
+        <foreach collection="cityList" item="clist"  open="(" separator="," close=")">
+            #{clist}
+        </foreach>
+    </if>
   </select>  
   
   <select id="findUserPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
   	SELECT
   		u.number,
-		ui.username,
-		ui.province,
-		ui.city,
-		ui.area,
-		uc.engaged_field AS engagedField,
-		info.personal_profile AS personalProfile,
-		u.lvl AS LEVEL,
-		ua.ability_label AS abilityLabel,
-		info.person_portrait_url AS personPortraitUrl,
-		info.life_photo_url AS lifePhotoUrl,
-		interest.id as interestId
-	FROM
-	`user` u
-	LEFT JOIN user_identity ui ON ui.uid = u.id
-	LEFT JOIN user_career uc ON uc.uid = u.id
-	LEFT JOIN user_ability ua ON ua.uid = u.id
-	LEFT JOIN user_info info ON info.uid = u.id
-	LEFT JOIN user_interest interest on interest.to_uid = u.id and interest.from_uid = #{tokenId,jdbcType=VARCHAR}
-	WHERE
-		u.type = 0
-	and u.id = #{uid,jdbcType=VARCHAR}
+        ui.username,
+        ui.province,
+        ui.city,
+        ui.area,
+        uc.engaged_field AS engagedField,
+        info.personal_profile AS personalProfile,
+        u.lvl AS LEVEL,
+        ua.ability_label AS abilityLabel,
+        info.person_portrait_url AS personPortraitUrl,
+        info.life_photo_url AS lifePhotoUrl,
+        interest.id as interestId
+    FROM
+    `user` u
+    LEFT JOIN user_identity ui ON ui.uid = u.id
+    LEFT JOIN user_career uc ON uc.uid = u.id
+    LEFT JOIN user_ability ua ON ua.uid = u.id
+    LEFT JOIN user_info info ON info.uid = u.id
+    LEFT JOIN user_interest interest on interest.to_uid = u.id and interest.from_uid = #{tokenId,jdbcType=VARCHAR}
+    WHERE
+        u.type = 0
+    and u.id = #{uid,jdbcType=VARCHAR}
   </select>
   
   <select id="findOrgPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgPartnerDetailBo">
   	SELECT
   		u.number,
-		oi.unit_name AS unitName,
-		oi.licence_province AS province,
-		oi.licence_city AS city,
-		oi.licence_area AS area,
-		u.lvl AS LEVEL,
-		ua.ability_label AS abilityLabel,
-		info.logo_url AS logoUrl,
-		info.company_introduction AS companyIntroduction,
-		info.publicity_picture_url AS publicityPictureUrl,
-		ot.search_area_category as field, 
-		interest.id as interestId
-	FROM
-	`user` u
-	LEFT JOIN organization_identity oi ON oi.uid = u.id
-	LEFT JOIN organization_info info ON info.uid = u.id
-	LEFT JOIN organization_tech ot ON ot.uid = u.id
-	LEFT JOIN user_ability ua ON ua.uid = u.id
-	LEFT JOIN user_interest interest on interest.to_uid = u.id and interest.from_uid = #{tokenId,jdbcType=VARCHAR}
-	WHERE
-		u.type = 1
-	and u.id = #{uid,jdbcType=VARCHAR} 
+        oi.unit_name AS unitName,
+        oi.licence_province AS province,
+        oi.licence_city AS city,
+        oi.licence_area AS area,
+        u.lvl AS LEVEL,
+        ua.ability_label AS abilityLabel,
+        info.logo_url AS logoUrl,
+        info.company_introduction AS companyIntroduction,
+        info.publicity_picture_url AS publicityPictureUrl,
+        ot.search_area_category as field, 
+        interest.id as interestId
+    FROM
+    `user` u
+    LEFT JOIN organization_identity oi ON oi.uid = u.id
+    LEFT JOIN organization_info info ON info.uid = u.id
+    LEFT JOIN organization_tech ot ON ot.uid = u.id
+    LEFT JOIN user_ability ua ON ua.uid = u.id
+    LEFT JOIN user_interest interest on interest.to_uid = u.id and interest.from_uid = #{tokenId,jdbcType=VARCHAR}
+    WHERE
+        u.type = 1
+    and u.id = #{uid,jdbcType=VARCHAR} 
   </select>
   
   <select id="findStarListByPage" parameterType="String" resultType="com.goafanti.user.bo.StarListBo">
@@ -838,9 +838,9 @@
   		and uc.work_unit like CONCAT('%',#{workUnit,jdbcType=VARCHAR},'%')
   	</if>
   	ORDER BY adc.achievement_count DESC
-	<if test="page_sql!=null">
-		${page_sql}
-	</if>
+    <if test="page_sql!=null">
+        ${page_sql}
+    </if>
   	
   </select>
   
@@ -900,9 +900,9 @@
   		and uc.work_unit like CONCAT('%',#{workUnit,jdbcType=VARCHAR},'%')
   	</if>
   	ORDER BY adc.achievement_count DESC
-	<if test="page_sql!=null">
-		${page_sql}
-	</if>
+    <if test="page_sql!=null">
+        ${page_sql}
+    </if>
   	
   </select>
   

+ 118 - 129
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -1,16 +1,13 @@
 package com.goafanti.memberGrade.controller;
-
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
@@ -22,7 +19,6 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
 import com.goafanti.memberGrade.service.MemberGradeService;
-
 /**
  * 会员等级管理 后台
  * 
@@ -32,128 +28,121 @@ import com.goafanti.memberGrade.service.MemberGradeService;
 @RestController
 @RequestMapping(value = "/api/admin/member")
 public class MemberGradeController extends BaseApiController {
-	@Autowired
-	private MemberGradeService memberGradeService;
-
-	/**
-	 * 查询全部信息
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/selectMemberGrade", method = RequestMethod.GET)
-	public Result selectMemberGrade() {
-		List<MemberGrade> list = memberGradeService.selectMemberGrade();
-		List<MemberGradeBO> result = new ArrayList<>();
-		for (MemberGrade mg : list) {
-			result.add(new MemberGradeBO(mg.getId(), mg.getGradeName(), JSON.parseObject(mg.getBusiness()),
-					JSON.parseObject(mg.getCost()), mg.getMemberRank()));
-		}
-		return res().data(result);
-	}
-
-	/**
-	 * 删除会员等级
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/delGrade", method = RequestMethod.POST)
-	public Result delGrade(int id) {
-		return res().data(memberGradeService.delGrade(id));
-	}
-
-	/**
-	 * 新增会员等级名称
-	 * 
-	 * @param name
-	 * @return
-	 */
-	@RequestMapping(value = "/addGradeName", method = RequestMethod.POST)
-	public Result addGradeName(MemberGrade me) {
-		if (memberGradeService.selectRank(me) >= 1) {
-			Error e = new Error();
-			e.setMessage("该会员等级已存在");
-			return res().error(e);
-		}
-		memberGradeService.addGradeName(me);
-		return res().data(me.getId());
-	}
-
-	/**
-	 * 增加业务及费用 与更改
-	 * 
-	 * @param me
-	 * @return
-	 */
-	@RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.POST)
-	public Result addBusinessAndCost(MemberGrade me) {
-		return res().data(memberGradeService.addBusinessAndCost(me));
-	}
-
-	/**
-	 * 后台会员订单列表单
-	 * 
-	 * @param pageNo
-	 * @param pageSize
-	 * @return
-	 */
-	@RequestMapping(value = "/selectMemberOrderBa", method = RequestMethod.GET)
-	public Result selectMemberOrderBa(String pageNo, String pageSize, Long id, String mobile, String nickname,
-			Integer orderState, String startTime, String endTime) {
-		Integer pNo=getPageNo(pageNo);
-		Integer pSize=getPageSize(pageSize);
-		Integer pNos = (pNo - 1) * pSize;
-		Map<String, Object> map = new HashMap<>();
-		map.put("pNos", pNos);
-		map.put("pSize", pSize);
-		map.put("id", id);
-		map.put("mobile", mobile);
-		map.put("nickname", nickname);
-		map.put("orderState", orderState);
-		map.put("startTimes", startTime);
-		if(endTime!=null){
-			try {
-				map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
-			} catch (ParseException e) {
-				LoggerUtils.error(this.getClass(), "ffff", e);
-			}
-		}
-		List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
-		int countWhere = memberGradeService.countMemberOrderWhere(map);
-		Map<String, Object> maps = new HashMap<>();
-		maps.put("list", list);
-		maps.put("countWhere", countWhere);
-		maps.put("pNo", pNo);
-		return res().data(maps);
-	}
-
-	/**
-	 * 后台会员更改
-	 * 
-	 * @param id
-	 * @param memberRank
-	 * @param validMonth
-	 * @param paymentValue
-	 * @param orderState
-	 * @param paymentTime
-	 * @param paymentType
-	 * @return
-	 */
-	@RequestMapping(value = "/updateMemberOrder", method = RequestMethod.POST)
-	public Result updateMemberOrder(Long id, int memberRank, Integer validMonth, Double paymentValue,
-			Integer orderState, String paymentTime, String paymentType,String userId) {
-		Map<String, Object> umap = new HashMap<>();
-		umap.put("userId",userId);
-		umap.put("lvl",memberRank);
-		Map<String, Object> map = new HashMap<>();
-		map.put("id", id);
-		map.put("menberType", memberRank);
-		map.put("validMonth", validMonth);
-		map.put("paymentValue", paymentValue);
-		map.put("orderState", orderState);
-		map.put("paymentTime", paymentTime);
-		map.put("paymentType", paymentType);
-		return res().data(memberGradeService.updateMemberOrder(map, umap));
-	}
-
-}
+    @Autowired
+    private MemberGradeService memberGradeService;
+    /**
+     * 查询全部信息
+     * 
+     * @return
+     */
+    @RequestMapping(value = "/selectMemberGrade", method = RequestMethod.GET)
+    public Result selectMemberGrade() {
+        List<MemberGrade> list = memberGradeService.selectMemberGrade();
+        List<MemberGradeBO> result = new ArrayList<>();
+        for (MemberGrade mg : list) {
+            result.add(new MemberGradeBO(mg.getId(), mg.getGradeName(), JSON.parseObject(mg.getBusiness()),
+                    JSON.parseObject(mg.getCost()), mg.getMemberRank()));
+        }
+        return res().data(result);
+    }
+    /**
+     * 删除会员等级
+     * 
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/delGrade", method = RequestMethod.POST)
+    public Result delGrade(int id) {
+        return res().data(memberGradeService.delGrade(id));
+    }
+    /**
+     * 新增会员等级名称
+     * 
+     * @param name
+     * @return
+     */
+    @RequestMapping(value = "/addGradeName", method = RequestMethod.POST)
+    public Result addGradeName(MemberGrade me) {
+        if (memberGradeService.selectRank(me) >= 1) {
+            Error e = new Error();
+            e.setMessage("该会员等级已存在");
+            return res().error(e);
+        }
+        memberGradeService.addGradeName(me);
+        return res().data(me.getId());
+    }
+    /**
+     * 增加业务及费用 与更改
+     * 
+     * @param me
+     * @return
+     */
+    @RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.POST)
+    public Result addBusinessAndCost(MemberGrade me) {
+        return res().data(memberGradeService.addBusinessAndCost(me));
+    }
+    /**
+     * 后台会员订单列表单
+     * 
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/selectMemberOrderBa", method = RequestMethod.GET)
+    public Result selectMemberOrderBa(String pageNo, String pageSize, Long id, String mobile, String nickname,
+            Integer orderState, String startTime, String endTime) {
+        Integer pNo=getPageNo(pageNo);
+        Integer pSize=getPageSize(pageSize);
+        Integer pNos = (pNo - 1) * pSize;
+        Map<String, Object> map = new HashMap<>();
+        map.put("pNos", pNos);
+        map.put("pSize", pSize);
+        map.put("id", id);
+        map.put("mobile", mobile);
+        map.put("nickname", nickname);
+        map.put("orderState", orderState);
+        map.put("startTimes", startTime);
+        if(endTime!=null){
+            try {
+                map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
+            } catch (ParseException e) {
+                LoggerUtils.error(this.getClass(), "ffff", e);
+            }
+        }
+        List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
+        int countWhere = memberGradeService.countMemberOrderWhere(map);
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("list", list);
+        maps.put("countWhere", countWhere);
+        maps.put("pNo", pNo);
+        return res().data(maps);
+    }
+    /**
+     * 后台会员更改
+     * 
+     * @param id
+     * @param memberRank
+     * @param validMonth
+     * @param paymentValue
+     * @param orderState
+     * @param paymentTime
+     * @param paymentType
+     * @return
+     */
+    @RequestMapping(value = "/updateMemberOrder", method = RequestMethod.POST)
+    public Result updateMemberOrder(Long id, int memberRank, Integer validMonth, Double paymentValue,
+            Integer orderState, String paymentTime, String paymentType,String userId) {
+        Map<String, Object> umap = new HashMap<>();
+        umap.put("userId",userId);
+        umap.put("lvl",memberRank);
+        Map<String, Object> map = new HashMap<>();
+        map.put("id", id);
+        map.put("menberType", memberRank);
+        map.put("validMonth", validMonth);
+        map.put("paymentValue", paymentValue);
+        map.put("orderState", orderState);
+        map.put("paymentTime", paymentTime);
+        map.put("paymentType", paymentType);
+        return res().data(memberGradeService.updateMemberOrder(map, umap));
+    }
+}

+ 54 - 61
src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java

@@ -1,16 +1,13 @@
 package com.goafanti.memberGrade.controller;
-
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.MemberOrder;
@@ -18,7 +15,6 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.memberGrade.service.MemberGradeService;
-
 /**
  * 会员 前台
  * 
@@ -28,60 +24,57 @@ import com.goafanti.memberGrade.service.MemberGradeService;
 @RestController
 @RequestMapping(value = "/api/user/member")
 public class MemberGradeFrontController extends BaseApiController {
-	@Autowired
-	private MemberGradeService	memberGradeService;
-	@Autowired
-	private JDBCIdGenerator		jDBCIdGenerator;
-
-	/**
-	 * 前台会员订单
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/selectMemberOrder", method = RequestMethod.GET)
-	public Result selectMemberOrder(String pageNo, String pageSize) {
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		Integer pNos = (pNo - 1) * pSize;
-		Map<String, Object> map = new HashMap<>();
-		map.put("pNos", pNos);
-		map.put("pSize", pSize);
-		map.put("id", TokenManager.getUserId());
-		List<MemberOrder> list = memberGradeService.selectMemberOrder(map);
-		int count = memberGradeService.countMemberOrder(TokenManager.getUserId());
-		Map<String, Object> maps = new HashMap<>();
-		maps.put("list", list);
-		maps.put("count", count);
-		maps.put("pNo", pNo);
-		return res().data(maps);
-	}
-
-	/**
-	 * 前台生成订单
-	 * 
-	 * @param menberType
-	 * @param price
-	 * @param validMonth
-	 * @return
-	 */
-	@RequestMapping(value = "/addBasicsMemberOrder", method = RequestMethod.GET)
-	public Result addBasicsMemberOrder(Integer menberType, String price, Integer validMonth) {
-		MemberOrder mo = new MemberOrder();
-		mo.setId(jDBCIdGenerator.generateId());
-		mo.setMenberType(menberType);
-		mo.setPrice(Double.valueOf(price));
-		mo.setValidMonth(validMonth);
-		mo.setOrderState(0);
-		mo.setOrderTime(new Date());
-		Assert.notNull(TokenManager.getUserToken(), "必须用户登录");
-		mo.setUserId(TokenManager.getUserId());
-		return res().data(memberGradeService.addBasicsMemberOrder(mo));
-	}
-
-}
+    @Autowired
+    private MemberGradeService	memberGradeService;
+    @Autowired
+    private JDBCIdGenerator		jDBCIdGenerator;
+    /**
+     * 前台会员订单
+     * 
+     * @return
+     */
+    @RequestMapping(value = "/selectMemberOrder", method = RequestMethod.GET)
+    public Result selectMemberOrder(String pageNo, String pageSize) {
+        Integer pNo = 1;
+        Integer pSize = 10;
+        if (StringUtils.isNumeric(pageSize)) {
+            pSize = Integer.parseInt(pageSize);
+        }
+        if (StringUtils.isNumeric(pageNo)) {
+            pNo = Integer.parseInt(pageNo);
+        }
+        Integer pNos = (pNo - 1) * pSize;
+        Map<String, Object> map = new HashMap<>();
+        map.put("pNos", pNos);
+        map.put("pSize", pSize);
+        map.put("id", TokenManager.getUserId());
+        List<MemberOrder> list = memberGradeService.selectMemberOrder(map);
+        int count = memberGradeService.countMemberOrder(TokenManager.getUserId());
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("list", list);
+        maps.put("count", count);
+        maps.put("pNo", pNo);
+        return res().data(maps);
+    }
+    /**
+     * 前台生成订单
+     * 
+     * @param menberType
+     * @param price
+     * @param validMonth
+     * @return
+     */
+    @RequestMapping(value = "/addBasicsMemberOrder", method = RequestMethod.GET)
+    public Result addBasicsMemberOrder(Integer menberType, String price, Integer validMonth) {
+        MemberOrder mo = new MemberOrder();
+        mo.setId(jDBCIdGenerator.generateId());
+        mo.setMenberType(menberType);
+        mo.setPrice(Double.valueOf(price));
+        mo.setValidMonth(validMonth);
+        mo.setOrderState(0);
+        mo.setOrderTime(new Date());
+        Assert.notNull(TokenManager.getUserToken(), "必须用户登录");
+        mo.setUserId(TokenManager.getUserId());
+        return res().data(memberGradeService.addBasicsMemberOrder(mo));
+    }
+}

+ 148 - 192
src/main/java/com/goafanti/user/bo/UserPageHomeBo.java

@@ -1,194 +1,150 @@
 package com.goafanti.user.bo;
-
 public class UserPageHomeBo {
-	private String	uid;
-	/**
-	 * 用户等级
-	 */
-	private Integer	lvl;
-
-	/**
-	 * 用户昵称
-	 */
-	private String	nickname;
-
-	/**
-	 * 邮箱
-	 */
-	private String	email;
-
-	/**
-	 * 用户编号
-	 */
-	private Integer	number;
-
-	/**
-	 * 帐号类型
-	 */
-	private Integer	type;
-
-	/**
-	 * 用户头像URL
-	 */
-	private String	personPortraitUrl;
-
-	/**
-	 * 公司LogoUrl
-	 */
-	private String	logoUrl;
-
-	/**
-	 * 专利数量
-	 */
-	private Integer	patentNum;
-
-	/**
-	 * 软著数量
-	 */
-	private Integer	copyrightNum;
-
-	/**
-	 * 科技成果数量
-	 */
-	private Integer	techProjectNum;
-
-	/**
-	 * 发布需求数量
-	 */
-	private Integer	demandNum;
-
-	/**
-	 * 发布成果数量
-	 */
-	private Integer	achievementNum;
-
-	/**
-	 * 知识产权数量
-	 */
-	private Integer	intellectualPropertyNum;
-
-	//会员名称
-	private String gradeName;
-	
-	public String getGradeName() {
-		return gradeName;
-	}
-
-	public void setGradeName(String gradeName) {
-		this.gradeName = gradeName;
-	}
-
-	
-	public String getUid() {
-		return uid;
-	}
-
-	public void setUid(String uid) {
-		this.uid = uid;
-	}
-
-	public Integer getLvl() {
-		return lvl;
-	}
-
-	public void setLvl(Integer lvl) {
-		this.lvl = lvl;
-	}
-
-	public String getNickname() {
-		return nickname;
-	}
-
-	public void setNickname(String nickname) {
-		this.nickname = nickname;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public Integer getNumber() {
-		return number;
-	}
-
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
-
-	public Integer getType() {
-		return type;
-	}
-
-	public void setType(Integer type) {
-		this.type = type;
-	}
-
-	public String getPersonPortraitUrl() {
-		return personPortraitUrl;
-	}
-
-	public void setPersonPortraitUrl(String personPortraitUrl) {
-		this.personPortraitUrl = personPortraitUrl;
-	}
-
-	public String getLogoUrl() {
-		return logoUrl;
-	}
-
-	public void setLogoUrl(String logoUrl) {
-		this.logoUrl = logoUrl;
-	}
-
-	public Integer getPatentNum() {
-		return patentNum;
-	}
-
-	public void setPatentNum(Integer patentNum) {
-		this.patentNum = patentNum;
-	}
-
-	public Integer getCopyrightNum() {
-		return copyrightNum;
-	}
-
-	public void setCopyrightNum(Integer copyrightNum) {
-		this.copyrightNum = copyrightNum;
-	}
-
-	public Integer getTechProjectNum() {
-		return techProjectNum;
-	}
-
-	public void setTechProjectNum(Integer techProjectNum) {
-		this.techProjectNum = techProjectNum;
-	}
-
-	public Integer getDemandNum() {
-		return demandNum;
-	}
-
-	public void setDemandNum(Integer demandNum) {
-		this.demandNum = demandNum;
-	}
-
-	public Integer getAchievementNum() {
-		return achievementNum;
-	}
-
-	public void setAchievementNum(Integer achievementNum) {
-		this.achievementNum = achievementNum;
-	}
-
-	public Integer getIntellectualPropertyNum() {
-		return intellectualPropertyNum;
-	}
-
-	public void setIntellectualPropertyNum(Integer intellectualPropertyNum) {
-		this.intellectualPropertyNum = intellectualPropertyNum;
-	}
-
-}
+    private String	uid;
+    /**
+     * 用户等级
+     */
+    private Integer	lvl;
+    /**
+     * 用户昵称
+     */
+    private String	nickname;
+    /**
+     * 邮箱
+     */
+    private String	email;
+    /**
+     * 用户编号
+     */
+    private Integer	number;
+    /**
+     * 帐号类型
+     */
+    private Integer	type;
+    /**
+     * 用户头像URL
+     */
+    private String	personPortraitUrl;
+    /**
+     * 公司LogoUrl
+     */
+    private String	logoUrl;
+    /**
+     * 专利数量
+     */
+    private Integer	patentNum;
+    /**
+     * 软著数量
+     */
+    private Integer	copyrightNum;
+    /**
+     * 科技成果数量
+     */
+    private Integer	techProjectNum;
+    /**
+     * 发布需求数量
+     */
+    private Integer	demandNum;
+    /**
+     * 发布成果数量
+     */
+    private Integer	achievementNum;
+    /**
+     * 知识产权数量
+     */
+    private Integer	intellectualPropertyNum;
+    //会员名称
+    private String gradeName;
+    
+    public String getGradeName() {
+        return gradeName;
+    }
+    public void setGradeName(String gradeName) {
+        this.gradeName = gradeName;
+    }
+    
+    public String getUid() {
+        return uid;
+    }
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+    public Integer getLvl() {
+        return lvl;
+    }
+    public void setLvl(Integer lvl) {
+        this.lvl = lvl;
+    }
+    public String getNickname() {
+        return nickname;
+    }
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+    public String getEmail() {
+        return email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    public Integer getNumber() {
+        return number;
+    }
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+    public Integer getType() {
+        return type;
+    }
+    public void setType(Integer type) {
+        this.type = type;
+    }
+    public String getPersonPortraitUrl() {
+        return personPortraitUrl;
+    }
+    public void setPersonPortraitUrl(String personPortraitUrl) {
+        this.personPortraitUrl = personPortraitUrl;
+    }
+    public String getLogoUrl() {
+        return logoUrl;
+    }
+    public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
+    }
+    public Integer getPatentNum() {
+        return patentNum;
+    }
+    public void setPatentNum(Integer patentNum) {
+        this.patentNum = patentNum;
+    }
+    public Integer getCopyrightNum() {
+        return copyrightNum;
+    }
+    public void setCopyrightNum(Integer copyrightNum) {
+        this.copyrightNum = copyrightNum;
+    }
+    public Integer getTechProjectNum() {
+        return techProjectNum;
+    }
+    public void setTechProjectNum(Integer techProjectNum) {
+        this.techProjectNum = techProjectNum;
+    }
+    public Integer getDemandNum() {
+        return demandNum;
+    }
+    public void setDemandNum(Integer demandNum) {
+        this.demandNum = demandNum;
+    }
+    public Integer getAchievementNum() {
+        return achievementNum;
+    }
+    public void setAchievementNum(Integer achievementNum) {
+        this.achievementNum = achievementNum;
+    }
+    public Integer getIntellectualPropertyNum() {
+        return intellectualPropertyNum;
+    }
+    public void setIntellectualPropertyNum(Integer intellectualPropertyNum) {
+        this.intellectualPropertyNum = intellectualPropertyNum;
+    }
+}

File diff suppressed because it is too large
+ 0 - 3
src/main/webapp/WEB-INF/views/common.html