Parcourir la source

用户申请认证,审核认证列表

limin il y a 7 ans
Parent
commit
08f460d00d

Fichier diff supprimé car celui-ci est trop grand
+ 1166 - 1165
src/main/java/com/goafanti/common/controller/WebpageController.java


+ 67 - 5
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -127,7 +127,7 @@
     amount_money, audit_status, process, wrong_count, payment_date, expert, 
     international, fixed_tel, qq, postal_address, postcode, review_instructions, industry, 
     contacts, email, professional_title, work_unit, education, major_category, qualification,
-    graduate_school, consultation_price , expert_audit
+    graduate_school, consultation_price 
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserIdentityExample" resultMap="BaseResultMap">
     <!--
@@ -761,7 +761,7 @@
         consultation_price = #{consultationPrice,jdbcType=DECIMAL},
       </if>
       <if test="expertAudit != null">
-        expert_audit = #{expertAudit,jdbcType=DECIMAL},
+        audit_status = #{expertAudit,jdbcType=DECIMAL},
       </if>
       <if test="releaseStatus != null">
         release_status = #{releaseStatus,jdbcType=DECIMAL},
@@ -852,7 +852,7 @@
 		b.major_category as majorCategory,
 		b.qualification,
 		b.professional_title as professionalTitle,
-		b.expert_audit as expertAudit,
+		b.audit_status as expertAudit,
 		b.expert as expert,
 		b.work_unit as workUnit
 	from
@@ -1059,7 +1059,7 @@
 				group by  seller_id ) o on t.uid=o.seller_id
 	where expert=1
 	and u.status !=1
-	and t.expert_audit =2
+	and t.audit_status =2
 	and u.source=0
 	order by u.update_time desc
 	limit #{0}
@@ -1073,7 +1073,7 @@
 				group by  seller_id ) o on t.uid=o.seller_id
 	where expert=1
 	and u.status !=1
-	and t.expert_audit =2
+	and t.audit_status =2
 	<if test="industry != null">
         and t.industry = #{industry,jdbcType=VARCHAR}
     </if>
@@ -1209,4 +1209,66 @@ order by
 		left join user_interest ui on ui.to_uid=u.id
 		where t.expert=1 and ui.from_uid=#{uid,jdbcType=VARCHAR}
 </select>
+
+<!-- 获得专家顾问审核列表数据  -->
+<select id="getExpertAuditList" resultMap="BaseResultMap">
+	select 
+	i.id, i.uid, i.username,  id_number, positive_id_url,  i.audit_status, expert, i.audit_status as expert_audit, fixed_tel, industry,
+    u.mobile as contact_mobile, c.name as contacts
+	from user_identity i 
+	inner join user u on i.uid = u.id
+	inner join industry_category c on c.id = i.industry
+	where 1 = 1
+	<if test="expertAudit != null ">
+	and  i.audit_status = #{expertAudit,jdbcType=VARCHAR}
+	</if>
+	<if test="industry != null ">
+	and industry = #{industry,jdbcType=INTEGER}
+	</if>
+	<if test="expert != null ">
+	and expert = #{expert,jdbcType=INTEGER}
+	</if>
+	<if test="expert == null ">
+	and expert &gt; 0
+	</if>
+	<if test="username != null">
+	<bind name="un" value="'%' + username + '%'"/>
+	and (i.username like #{un,jdbcType=VARCHAR} or u.identify_name like #{un,jdbcType=VARCHAR} or u.nickname like #{un,jdbcType=VARCHAR} or u.username like #{un,jdbcType=VARCHAR})
+	</if>
+	<if test="page_sql!=null">
+        ${page_sql}
+    </if>
+</select>
+<select id="getExpertAuditListCount" resultType="java.lang.Integer">
+	select 
+	count(0)
+	from user_identity i 
+	inner join user u on i.uid = u.id
+	where 1 = 1
+	<if test="expertAudit != null ">
+	and  i.audit_status = #{expertAudit,jdbcType=VARCHAR}
+	</if>
+	<if test="industry != null ">
+	and industry = #{industry,jdbcType=INTEGER}
+	</if>
+	<if test="expert != null ">
+	and expert = #{expert,jdbcType=INTEGER}
+	</if>
+	<if test="expert == null ">
+	and expert &gt; 0
+	</if>
+	<if test="username != null">
+	<bind name="un" value="'%' + username + '%'"/>
+	and (i.username like #{un,jdbcType=VARCHAR} or u.identify_name like #{un,jdbcType=VARCHAR} or u.nickname like #{un,jdbcType=VARCHAR} or u.username like #{un,jdbcType=VARCHAR})
+	</if>
+</select>
+
+<!-- 获得用户认证信息数据  -->
+<select id="getUserIdentityByUid" parameterType="java.lang.String" resultMap="BaseResultMap">
+	select * 
+	from `user` u
+	inner join user_identity i on u.id = i.uid
+	where u.id = #{uid,jdbcType=VARCHAR}
+</select>
+
 </mapper>

+ 0 - 1
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -29,7 +29,6 @@ public class DemandListBo extends InputDemand{
 	private BigDecimal fundForPersonnel;
 	private BigDecimal fundForCrowd;
 	private String firstPic;
-	
 
 	public String getFirstPic() {
 		return firstPic;

+ 23 - 1
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -407,6 +407,10 @@ public class UserApiController extends BaseApiController {
 					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		if(null == userIdentity.getExpertAudit()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "审核状态未提交"));
+			return res;
+		}
 		if(StringUtils.isBlank(userIdentity.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
 			return res;
@@ -431,6 +435,7 @@ public class UserApiController extends BaseApiController {
 				ui.setUid(TokenManager.getUserId());
 				userIdentityService.insert(ui);
 			} else {
+				System.out.println(u.getAuditStatus());
 				//判断审核状态
 				if (userIdentity.getExpertAudit() == 0 || userIdentity.getExpertAudit() == 3) {
 					ui.setExpertAudit(1);
@@ -441,10 +446,11 @@ public class UserApiController extends BaseApiController {
 				ui.setId(u.getId());
 				userIdentityService.updateByPrimaryKeySelective(ui);
 			}
+			System.out.println(user.getBackgroundUrl());
 			user.setId(TokenManager.getUserId());
 			userService.updateByPrimaryKeySelective(user);
 			userIdentity.setGraduateSchool(ui.getGraduateSchool());
-			//userIdentity.setExpert(u.getExpert());
+			userIdentity.setExpert(ui.getExpert());
 			userIdentity.setExpertAudit(ui.getExpertAudit());
 		}
 		res.setData(userIdentity);
@@ -901,4 +907,20 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
+	
+	//获得专家顾问审核数据
+	@RequestMapping(value="/getExpertAuditList", method = RequestMethod.GET )
+	public Result getExpertAuditList(InputUserIdentity identity, Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.setData(userIdentityService.getExpertAuditList(identity, pageNo, pageSize));
+		return res;
+	}
+	
+	//获得某个人认证的详情信息
+	@RequestMapping(value="/getUserIdentityByUid" , method = RequestMethod.POST)
+	public Result getUserIdentityByUid(String uid){
+		Result res = new Result();
+		res.setData(userIdentityService.getUserIdentityByUid(uid));
+		return res;
+	}
 }

+ 79 - 73
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -1,73 +1,79 @@
-package com.goafanti.user.service;
-
-import java.util.List;
-import com.goafanti.app.bo.consultantListBo;
-import com.goafanti.common.bo.ReletivelyIndustry;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.bo.fieldGlossoryBo;
-import com.goafanti.common.model.UserIdentity;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.portal.bo.UserSubscriberListBo;
-import com.goafanti.user.bo.Advertisings;
-import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
-import com.goafanti.user.bo.MyInterestedBo;
-import com.goafanti.user.bo.UserIdentityBo;
-import com.goafanti.user.bo.UserIdentityDetailAdminBo;
-
-
-public interface UserIdentityService {
-
-	UserIdentity selectUserIdentityByUserId(String userId);
-
-	UserIdentity insert(UserIdentity userIdentity);
-
-	int updateByPrimaryKeySelective(UserIdentity userIdentity);
-
-	UserIdentityBo selectUserIdentityBoByUserId(String uid);
-
-	int updateByPrimaryKey(UserIdentity u);
-
-	int saveUserIdentityProcess(Result res, UserIdentity u, String uid);
-
-	int updateUserDetail(UserIdentity userIdentity, String saveSign, Integer level);
-
-	UserIdentity insertByAdmin(UserIdentity ui, String saveSign);
-
-	AuditorUserIdentityDetailBo selectAuditorUserIdentityByUserId(String uid);
-
-	int updateUserDetailByAuditAdmin(UserIdentity ui, String aid, String mid, Integer level);
-
-	Pagination<UserSubscriberListBo> listSubscriber(String url,String name, Integer level, String field, Integer province, Integer city,
-			Integer area,Integer international, Integer pNo, Integer pSize);
-
-	UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid);
-
-	UserIdentityBo expertsDetail(String uid);
-
-	Pagination<UserIdentityBo> expertsList(String name,String industry, Integer pNo, Integer pSize);
-	
-	List<UserIdentityBo> getExperts(Integer size);
-	
-	List<fieldGlossoryBo> industryList();
-
-	 Pagination<consultantListBo> consultantList(Integer pNo, Integer pSize) ;
-
-	 consultantListBo consultantDetail(String id);
-	 
-	 List<Advertisings> advertising();
-
-	 Pagination<consultantListBo> portalConsultantList(Integer pNo, Integer pSize);
-	
-	consultantListBo portalconsultantDetail(String id);
-
-	List<fieldGlossoryBo> domainList();
-	
-	List<consultantListBo> getConsultantList(int size);
-	
-	List<ReletivelyIndustry>selectIndustryReletively();
-
-	Pagination<UserIdentityBo>listInterestedExpert(Integer pageNo,Integer pageSize);
-
-	Pagination<MyInterestedBo> appMyInterestedExpert(Integer pageNo, Integer pageSize);
-
-}
+package com.goafanti.user.service;
+
+import java.util.List;
+
+import com.goafanti.app.bo.consultantListBo;
+import com.goafanti.common.bo.ReletivelyIndustry;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.bo.fieldGlossoryBo;
+import com.goafanti.common.model.UserIdentity;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.portal.bo.UserSubscriberListBo;
+import com.goafanti.user.bo.Advertisings;
+import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
+import com.goafanti.user.bo.InputUserIdentity;
+import com.goafanti.user.bo.MyInterestedBo;
+import com.goafanti.user.bo.UserIdentityBo;
+import com.goafanti.user.bo.UserIdentityDetailAdminBo;
+
+
+public interface UserIdentityService {
+
+	UserIdentity selectUserIdentityByUserId(String userId);
+
+	UserIdentity insert(UserIdentity userIdentity);
+
+	int updateByPrimaryKeySelective(UserIdentity userIdentity);
+
+	UserIdentityBo selectUserIdentityBoByUserId(String uid);
+
+	int updateByPrimaryKey(UserIdentity u);
+
+	int saveUserIdentityProcess(Result res, UserIdentity u, String uid);
+
+	int updateUserDetail(UserIdentity userIdentity, String saveSign, Integer level);
+
+	UserIdentity insertByAdmin(UserIdentity ui, String saveSign);
+
+	AuditorUserIdentityDetailBo selectAuditorUserIdentityByUserId(String uid);
+
+	int updateUserDetailByAuditAdmin(UserIdentity ui, String aid, String mid, Integer level);
+
+	Pagination<UserSubscriberListBo> listSubscriber(String url,String name, Integer level, String field, Integer province, Integer city,
+			Integer area,Integer international, Integer pNo, Integer pSize);
+
+	UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid);
+
+	UserIdentityBo expertsDetail(String uid);
+
+	Pagination<UserIdentityBo> expertsList(String name,String industry, Integer pNo, Integer pSize);
+	
+	List<UserIdentityBo> getExperts(Integer size);
+	
+	List<fieldGlossoryBo> industryList();
+
+	 Pagination<consultantListBo> consultantList(Integer pNo, Integer pSize) ;
+
+	 consultantListBo consultantDetail(String id);
+	 
+	 List<Advertisings> advertising();
+
+	 Pagination<consultantListBo> portalConsultantList(Integer pNo, Integer pSize);
+	
+	consultantListBo portalconsultantDetail(String id);
+
+	List<fieldGlossoryBo> domainList();
+	
+	List<consultantListBo> getConsultantList(int size);
+	
+	List<ReletivelyIndustry>selectIndustryReletively();
+
+	Pagination<UserIdentityBo>listInterestedExpert(Integer pageNo,Integer pageSize);
+
+	Pagination<MyInterestedBo> appMyInterestedExpert(Integer pageNo, Integer pageSize);
+	
+	Pagination<MyInterestedBo> getExpertAuditList(InputUserIdentity identity,Integer pageNo, Integer pageSize);
+	
+	UserIdentity getUserIdentityByUid(String uid);
+
+}

Fichier diff supprimé car celui-ci est trop grand
+ 526 - 499
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java


Fichier diff supprimé car celui-ci est trop grand
+ 576 - 571
src/main/webapp/WEB-INF/views/common.html