Browse Source

去处专家审核字段,改用另一个

anderx 7 years ago
parent
commit
33aac153f1

+ 10 - 1
src/main/java/com/goafanti/app/controller/OpenAppHomeController.java

@@ -1,5 +1,8 @@
 package com.goafanti.app.controller;
 package com.goafanti.app.controller;
 
 
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 
@@ -10,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import com.goafanti.app.service.AppHomePageService;
 import com.goafanti.app.service.AppHomePageService;
 import com.goafanti.business.service.JtBusinessService;
 import com.goafanti.business.service.JtBusinessService;
+import com.goafanti.business.service.JtTagService;
 import com.goafanti.comment.bo.CommentResult;
 import com.goafanti.comment.bo.CommentResult;
 import com.goafanti.comment.service.CommentService;
 import com.goafanti.comment.service.CommentService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.Result;
@@ -27,6 +31,8 @@ public class OpenAppHomeController extends BaseApiController{
 	private JtBusinessService	jtBusinessService;
 	private JtBusinessService	jtBusinessService;
 	@Resource
 	@Resource
 	private CommentService	commentService;
 	private CommentService	commentService;
+	@Resource
+	private JtTagService	jtTagService;
 	
 	
 	
 	
 	/**App首页轮播图、导航、知产*/
 	/**App首页轮播图、导航、知产*/
@@ -136,7 +142,10 @@ public class OpenAppHomeController extends BaseApiController{
 		if (null==pageNo)pageNo=1;
 		if (null==pageNo)pageNo=1;
 		if (null==pageSize)pageSize=3;
 		if (null==pageSize)pageSize=3;
 		//1 赚钱数据    2首页数据
 		//1 赚钱数据    2首页数据
-		result.setData(jtBusinessService.recommendedApplication(1,pageNo,pageSize));
+		Map<String, Object> map=new HashMap<>();
+		map.put("recommended", jtBusinessService.recommendedApplication(1,pageNo,pageSize));
+		map.put("tag", jtTagService.selectListJtTag(null, pageNo, pageSize));
+		result.setData(map);
 		return result;
 		return result;
 	}
 	}
 	/**
 	/**

+ 1 - 1
src/main/java/com/goafanti/business/service/impl/JtTagServiceImpl.java

@@ -44,7 +44,7 @@ public class JtTagServiceImpl   extends BaseMybatisDao<JtTagMapper> implements J
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
 		if(pageNo==null ||pageNo<1)pageNo=1;
 		if(pageNo==null ||pageNo<1)pageNo=1;
 		if(pageSize==null ||pageSize<1)pageSize=10;
 		if(pageSize==null ||pageSize<1)pageSize=10;
-		if(StringUtils.isNotBlank(a.getName()))params.put("name", a.getName());
+		if(null!=null&&StringUtils.isNotBlank(a.getName()))params.put("name", a.getName());
 		return (Pagination<JtTagBo>)findPage("selectJtTagList", "selectJtTagCount", params, pageNo, pageSize);
 		return (Pagination<JtTagBo>)findPage("selectJtTagList", "selectJtTagCount", params, pageNo, pageSize);
 	}
 	}
 
 

+ 7 - 10
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -759,9 +759,6 @@
       <if test="consultationPrice != null">
       <if test="consultationPrice != null">
         consultation_price = #{consultationPrice,jdbcType=DECIMAL},
         consultation_price = #{consultationPrice,jdbcType=DECIMAL},
       </if>
       </if>
-      <if test="expertAudit != null">
-        expert_audit = #{expertAudit,jdbcType=DECIMAL},
-      </if>
       <if test="releaseStatus != null">
       <if test="releaseStatus != null">
         release_status = #{releaseStatus,jdbcType=DECIMAL},
         release_status = #{releaseStatus,jdbcType=DECIMAL},
       </if>
       </if>
@@ -851,7 +848,7 @@
 		b.major_category as majorCategory,
 		b.major_category as majorCategory,
 		b.qualification,
 		b.qualification,
 		b.professional_title as professionalTitle,
 		b.professional_title as professionalTitle,
-		b.expert_audit as expertAudit,
+		b.audit_status as auditAudit,
 		b.work_unit as workUnit
 		b.work_unit as workUnit
 	from
 	from
 		user a left join user_identity b on
 		user a left join user_identity b on
@@ -1057,7 +1054,7 @@
 				group by  seller_id ) o on t.uid=o.seller_id
 				group by  seller_id ) o on t.uid=o.seller_id
 	where expert=1
 	where expert=1
 	and u.status !=1
 	and u.status !=1
-	and t.expert_audit =2
+	and t.audit_status =2
 	and u.source=0
 	and u.source=0
 	order by u.update_time desc
 	order by u.update_time desc
 	limit #{0}
 	limit #{0}
@@ -1071,7 +1068,7 @@
 				group by  seller_id ) o on t.uid=o.seller_id
 				group by  seller_id ) o on t.uid=o.seller_id
 	where expert=1
 	where expert=1
 	and u.status !=1
 	and u.status !=1
-	and t.expert_audit =2
+	and t.audit_status =2
 	<if test="industry != null">
 	<if test="industry != null">
         and t.industry = #{industry,jdbcType=VARCHAR}
         and t.industry = #{industry,jdbcType=VARCHAR}
     </if>
     </if>
@@ -1226,7 +1223,7 @@ from
 	on u.id = a.to_uid left join( select to_uid from user_interest where from_uid =#{uid,jdbcType=VARCHAR} ) b
 	on u.id = a.to_uid left join( select to_uid from user_interest where from_uid =#{uid,jdbcType=VARCHAR} ) b
 	on u.id = b.to_uid 
 	on u.id = b.to_uid 
 	where u.status = 0 and u.source = 1 
 	where u.status = 0 and u.source = 1 
-	and ui.expert = 1 and ui.expert_audit=2
+	and ui.expert = 1 and ui.audit_status=2
 	<if test="industry != null">
 	<if test="industry != null">
 	 and ui.industry= #{industry,jdbcType=VARCHAR}
 	 and ui.industry= #{industry,jdbcType=VARCHAR}
 	</if>
 	</if>
@@ -1246,7 +1243,7 @@ from
   <select id="selectCustomerAuditCount" resultType="java.lang.Integer">
   <select id="selectCustomerAuditCount" resultType="java.lang.Integer">
 	 	select count(0)from
 	 	select count(0)from
 	`user` u left join user_identity ui on ui.uid = u.id 
 	`user` u left join user_identity ui on ui.uid = u.id 
-	  where u.status = 0 and u.source = 1 and ui.expert = 1 and ui.expert_audit=2
+	  where u.status = 0 and u.source = 1 and ui.expert = 1 and ui.audit_status=2
 	  <if test="industry != null">
 	  <if test="industry != null">
 		and ui.industry= #{industry,jdbcType=VARCHAR}
 		and ui.industry= #{industry,jdbcType=VARCHAR}
 	</if>
 	</if>
@@ -1290,7 +1287,7 @@ from
 	on u.id = a.to_uid left join( select to_uid from user_interest where from_uid ='1' ) b
 	on u.id = a.to_uid left join( select to_uid from user_interest where from_uid ='1' ) b
 	on u.id = b.to_uid 
 	on u.id = b.to_uid 
 	where u.status = 0 and u.source = 1 
 	where u.status = 0 and u.source = 1 
-	and ui.expert = 2 and ui.expert_audit=2
+	and ui.expert = 2 and ui.audit_status=2
 	<if test="consultantType != null">
 	<if test="consultantType != null">
 	and ui.consultant_type=#{consultantType,jdbcType=INTEGER}
 	and ui.consultant_type=#{consultantType,jdbcType=INTEGER}
 	</if>
 	</if>
@@ -1321,7 +1318,7 @@ from
 from
 from
 	`user` u left join user_identity ui on ui.uid = u.id 
 	`user` u left join user_identity ui on ui.uid = u.id 
 	where u.status = 0 and u.source = 1 
 	where u.status = 0 and u.source = 1 
-	and ui.expert = 2 and ui.expert_audit=2
+	and ui.expert = 2 and ui.audit_status=2
 	<if test="consultantType != null">
 	<if test="consultantType != null">
 	and ui.consultant_type=#{consultantType,jdbcType=INTEGER}
 	and ui.consultant_type=#{consultantType,jdbcType=INTEGER}
 	</if>
 	</if>

+ 1 - 9
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -215,21 +215,13 @@ public class UserIdentity {
 	 */
 	 */
 	private BigDecimal consultationPrice;
 	private BigDecimal consultationPrice;
 	
 	
-	private Integer expertAudit;
-	
 	private Integer releaseStatus;
 	private Integer releaseStatus;
 	
 	
 	private Integer consultantType;
 	private Integer consultantType;
 	
 	
 	private String consultantCertificateUrl;
 	private String consultantCertificateUrl;
 
 
-	public Integer getExpertAudit() {
-		return expertAudit;
-	}
-
-	public void setExpertAudit(Integer expertAudit) {
-		this.expertAudit = expertAudit;
-	}
+	
 
 
 	public Integer getReleaseStatus() {
 	public Integer getReleaseStatus() {
 		return releaseStatus;
 		return releaseStatus;

+ 2 - 7
src/main/java/com/goafanti/user/bo/CustomerAuditListBo.java

@@ -6,7 +6,7 @@ public class CustomerAuditListBo {
 	private String username;
 	private String username;
 	private String industryName;
 	private String industryName;
 	private String expert;
 	private String expert;
-	private String expertAudit;
+	
 	public String getUid() {
 	public String getUid() {
 		return uid;
 		return uid;
 	}
 	}
@@ -31,12 +31,7 @@ public class CustomerAuditListBo {
 	public void setExpert(String expert) {
 	public void setExpert(String expert) {
 		this.expert = expert;
 		this.expert = expert;
 	}
 	}
-	public String getExpertAudit() {
-		return expertAudit;
-	}
-	public void setExpertAudit(String expertAudit) {
-		this.expertAudit = expertAudit;
-	}
+	
 	public String getId() {
 	public String getId() {
 		return id;
 		return id;
 	}
 	}

+ 14 - 15
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -1,13 +1,21 @@
 package com.goafanti.user.bo;
 package com.goafanti.user.bo;
 
 
 public class UserIdentityBo extends InputUserIdentity {
 public class UserIdentityBo extends InputUserIdentity {
-	String reservationCount;
-	String graduateSchool;
-	String majorCategory;
-	String qualification;
-	String professionalTitle;
-	Integer expertAudit;
+	private String reservationCount;
+	private String graduateSchool;
+	private String majorCategory;
+	private String qualification;
+	private String professionalTitle;
+	private Integer auditStatus;
 	
 	
+	public Integer getAuditStatus() {
+		return auditStatus;
+	}
+
+	public void setAuditStatus(Integer auditStatus) {
+		this.auditStatus = auditStatus;
+	}
+
 	public String getGraduateSchool() {
 	public String getGraduateSchool() {
 		return graduateSchool;
 		return graduateSchool;
 	}
 	}
@@ -40,14 +48,6 @@ public class UserIdentityBo extends InputUserIdentity {
 		this.professionalTitle = professionalTitle;
 		this.professionalTitle = professionalTitle;
 	}
 	}
 
 
-	public Integer getExpertAudit() {
-		return expertAudit;
-	}
-
-	public void setExpertAudit(Integer expertAudit) {
-		this.expertAudit = expertAudit;
-	}
-
 	public String getReservationCount() {
 	public String getReservationCount() {
 		return reservationCount;
 		return reservationCount;
 	}
 	}
@@ -58,7 +58,6 @@ public class UserIdentityBo extends InputUserIdentity {
 	
 	
 	@Override
 	@Override
 	public String getHeadPortraitUrl() {
 	public String getHeadPortraitUrl() {
-		// TODO Auto-generated method stub
 		if(super.getHeadPortraitUrl()!= null && !super.getHeadPortraitUrl().contains("."))return null;
 		if(super.getHeadPortraitUrl()!= null && !super.getHeadPortraitUrl().contains("."))return null;
 		return super.getHeadPortraitUrl();
 		return super.getHeadPortraitUrl();
 	}
 	}

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

@@ -473,13 +473,13 @@ public class UserApiController extends BaseApiController {
 			if (null == u&&userIdentity.getAuthenticationType()==0) {
 			if (null == u&&userIdentity.getAuthenticationType()==0) {
 				ui.setId(UUID.randomUUID().toString());
 				ui.setId(UUID.randomUUID().toString());
 				ui.setExpert(1);//直接变为专家
 				ui.setExpert(1);//直接变为专家
-				ui.setExpertAudit(1);//提交审核
+				ui.setAuditStatus(1);//提交审核
 				ui.setUid(TokenManager.getUserId());
 				ui.setUid(TokenManager.getUserId());
 				userIdentityService.insert(ui);
 				userIdentityService.insert(ui);
 			}else if (null == u&&userIdentity.getAuthenticationType()==1) {
 			}else if (null == u&&userIdentity.getAuthenticationType()==1) {
 				ui.setId(UUID.randomUUID().toString());
 				ui.setId(UUID.randomUUID().toString());
 				ui.setExpert(2);//直接变为专家
 				ui.setExpert(2);//直接变为专家
-				ui.setExpertAudit(1);//提交审核
+				ui.setAuditStatus(1);//提交审核
 				ui.setUid(TokenManager.getUserId());
 				ui.setUid(TokenManager.getUserId());
 				userIdentityService.insert(ui);
 				userIdentityService.insert(ui);
 			} else {
 			} else {