소스 검색

Merge remote-tracking branch 'origin/master' into test

limin 7 년 전
부모
커밋
bb5a2e518e

+ 2 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -407,7 +407,8 @@ public class WebpageController extends BaseController {
 	 */
 	@RequestMapping(value = "/portal/service/serviceDetail", method = RequestMethod.GET)
 	public ModelAndView portalServiceServiceDetail(HttpServletRequest request, ModelAndView modelview, String id) {
-		modelview.setViewName("/portal/service/serviceDetails");
+		modelview.setViewName("/portal/service/serviceDetails");
+		//id = ""
 		JtBusinessProject jtBusinessProject = jtBusinessService.getBusinessProjectDetail(id);
 		if (jtBusinessProject != null) {
 			if (jtBusinessProject.getMaxImgUrl() != null && jtBusinessProject.getMaxImgUrl().length() <= 0)

+ 17 - 11
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -47,6 +47,8 @@
     <result column="consultant" jdbcType="INTEGER" property="consultant" />
     <result column="consultation_price" jdbcType="DECIMAL" property="consultationPrice" />
     <result column="expert_audit" jdbcType="INTEGER" property="expertAudit" />
+    <result column="identify_name" jdbcType="INTEGER" property="identifyName" />
+    <result column="consultant_type" jdbcType="INTEGER" property="consultantType" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -127,7 +129,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 
+    graduate_school, consultation_price , consultant_type
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserIdentityExample" resultMap="BaseResultMap">
     <!--
@@ -760,8 +762,11 @@
       <if test="consultationPrice != null">
         consultation_price = #{consultationPrice,jdbcType=DECIMAL},
       </if>
-      <if test="expertAudit != null">
-        audit_status = #{expertAudit,jdbcType=DECIMAL},
+      <if test="consultantType != null">
+        consultant_type = #{consultantType,jdbcType=DECIMAL},
+      </if>
+      <if test="auditStatus != null">
+        audit_status = #{auditStatus,jdbcType=DECIMAL},
       </if>
       <if test="releaseStatus != null">
         release_status = #{releaseStatus,jdbcType=DECIMAL},
@@ -852,9 +857,10 @@
 		b.major_category as majorCategory,
 		b.qualification,
 		b.professional_title as professionalTitle,
-		b.audit_status as expertAudit,
+		b.audit_status as auditStatus,
 		b.expert as expert,
-		b.work_unit as workUnit
+		b.work_unit as workUnit,
+		b.consultant_type as consultantType
 	from
 		user a left join user_identity b on
 		a.id = b.uid
@@ -1344,14 +1350,14 @@ from
 <!-- 获得专家顾问审核列表数据  -->
 <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
+	i.id, i.uid, i.username,  id_number, positive_id_url,  i.audit_status, expert, i.audit_status, fixed_tel, industry,
+    u.mobile as contact_mobile, c.name as contacts, identify_name 
 	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 test="auditStatus != null ">
+	and  i.audit_status = #{auditStatus,jdbcType=VARCHAR}
 	</if>
 	<if test="industry != null ">
 	and industry = #{industry,jdbcType=INTEGER}
@@ -1376,8 +1382,8 @@ from
 	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 test="auditStatus != null ">
+	and  i.audit_status = #{auditStatus,jdbcType=VARCHAR}
 	</if>
 	<if test="industry != null ">
 	and industry = #{industry,jdbcType=INTEGER}

+ 12 - 0
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -984,4 +984,16 @@ public class UserIdentity {
 	public void setConsultantCertificateUrl(String consultantCertificateUrl) {
 		this.consultantCertificateUrl = consultantCertificateUrl;
 	}
+	
+	private String identifyName;
+
+
+	public String getIdentifyName() {
+		return identifyName;
+	}
+
+	public void setIdentifyName(String identifyName) {
+		this.identifyName = identifyName;
+	}
+	
 }

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

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.druid.sql.parser.Token;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
@@ -409,8 +408,8 @@ public class UserApiController extends BaseApiController {
 					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if(null == userIdentity.getExpertAudit()){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "审核状�?�未提交"));
+		if(null == userIdentity.getAuditStatus()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "审核状未提交"));
 			return res;
 		}
 		if(StringUtils.isBlank(userIdentity.getUid())) {
@@ -437,23 +436,15 @@ public class UserApiController extends BaseApiController {
 				ui.setUid(TokenManager.getUserId());
 				userIdentityService.insert(ui);
 			} else {
-				System.out.println(u.getAuditStatus());
-				//判断审核状�??
+				//判断审核状态 当未审核或者审核不通过时
 				if (userIdentity.getAuditStatus() == 0 || userIdentity.getAuditStatus() == 3) {
 					ui.setAuditStatus(1);
-				} else {
-					res.getError().add(buildError("", "已经提交审核或�?�审核已经�?�过"));
-					return res;
+					ui.setId(u.getId());
+					userIdentityService.updateByPrimaryKeySelective(ui);
 				}
-				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(ui.getExpert());
-			userIdentity.setAuditStatus(ui.getAuditStatus());
 		}
 		res.setData(userIdentity);
 		return res;

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -504,8 +504,8 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		if(pageNo==null || pageNo<1)pageNo=1;
 		if(pageSize==null ||pageSize<1)pageSize=10; 
 		Map<String, Object> params=new HashMap<String,Object>();
-		//将查询参数弄到map?
-		if(null != identity.getExpertAudit()) params.put("expertAudit", identity.getExpertAudit());
+		//将查询参数弄到map?
+		if(null != identity.getExpertAudit()) params.put("auditStatus", identity.getAuditStatus());
 		if(null != identity.getIndustry()) params.put("industry", identity.getIndustry());
 		if(null != identity.getExpert())  params.put("expert", identity.getExpert());
 		if(StringUtils.isBlank(identity.getUsername())) params.put("username", identity.getUsername());