专家认证信息返回字段添加认证中的状态。

src/main/java/com/ekexiu/portal/dao/AuthApplyDao.java

@@ -1,6 +1,8 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
@@ -28,6 +30,33 @@ public abstract class AuthApplyDao {
	@SelectOne
	public abstract AuthApply queryOne(Connection con, String authApplyId) throws SQLException;
	
	public AuthApply queryPro(Connection con, String professorId) throws SQLException{
		int _m_1 = 1;
        String sql = "SELECT AUTH_APPLY_ID,PROFESSOR_ID,APPLY_TYPE,SOLVE_STATUS FROM AUTH_APPLY "
        		+ " WHERE PROFESSOR_ID = ? AND SOLVE_STATUS = 1 ORDER BY CREATE_TIME DESC LIMIT 1";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,professorId);
            ResultSet rs = ps.executeQuery();
            try{
                if(rs.next()){
                    AuthApply _result = new AuthApply();
                    _result.setAuthApplyId(rs.getString(1));
                    _result.setProfessorId(rs.getString(2));
                    _result.setApplyType(rs.getString(3));
                    _result.setSolveStatus(rs.getInt(4));
                    return _result;
                }else{
                    return null;
                }
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
	}
	
	@SelectList
	public abstract List<AuthApply> query(Connection con) throws SQLException;
}

src/main/java/com/ekexiu/portal/service/AuthApplyService.java

@@ -10,6 +10,7 @@ import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.AuthApplyDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.po.AuthApply;
@Path("/authApply")
@@ -18,6 +19,8 @@ public class AuthApplyService {
	private AuthApplyDao authApplyDao;
	@Autowrie
	private AuthImageService authImageService;
	@Autowrie
	private ProfessorDao professorDao;
	public AuthApplyDao getAuthApplyDao() {
		return authApplyDao;
@@ -35,6 +38,14 @@ public class AuthApplyService {
		this.authImageService = authImageService;
	}
	public ProfessorDao getProfessorDao() {
		return professorDao;
	}
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, AuthApply authApply) throws SQLException{

src/main/java/com/ekexiu/portal/service/ProfessorService.java

@@ -21,6 +21,7 @@ import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.AuthApplyDao;
import com.ekexiu.portal.dao.HonorDao;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.PaperDao;
@@ -34,6 +35,7 @@ import com.ekexiu.portal.dao.ResearchAreaLogDao;
import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.dao.WatchDao;
import com.ekexiu.portal.po.AuthApply;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.User;
import com.ekexiu.portal.pojo.EditProfessor;
@@ -43,6 +45,8 @@ import com.ekexiu.portal.util.Calculate;
@Path("/professor")
public class ProfessorService {
	@Autowrie
	private AuthApplyDao authApplyDao;
	@Autowrie
	private UserDao userDao;
	@Autowrie
@@ -77,6 +81,14 @@ public class ProfessorService {
	private ProjectDao projectDao;
	
	public AuthApplyDao getAuthApplyDao() {
		return authApplyDao;
	}
	public void setAuthApplyDao(AuthApplyDao authApplyDao) {
		this.authApplyDao = authApplyDao;
	}
	public UserDao getUserDao() {
		return userDao;
	}
@@ -246,7 +258,12 @@ public class ProfessorService {
	@Get
	@Path("/auth")
	public Professor queryAuth(@JdbcConn Connection con, String id) throws SQLException{
		return this.professorDao.queryAuth(con, id);
		Professor professor =  this.professorDao.queryAuth(con, id);
		AuthApply apply = this.authApplyDao.queryPro(con, id);
		if(apply != null) {
			professor.setAuthStatus(2);
		}
		return professor;
	}
	
	@Get