查询所有资源申请记录返回值添加资源图片路径，我的工作台n条未读咨询改为n条未读消息。

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

@@ -105,7 +105,7 @@ public abstract class ConsultDao {
	public abstract Consult query(Connection con, String consultId) throws SQLException;
	
	/**
	 * 我的工作台中显示未查看的咨询条数
	 * 统计未查看的咨询条数
	 * @param con
	 * @param professorId 登陆者ID
	 * @return 返回未查看的资源条数
@@ -126,6 +126,32 @@ public abstract class ConsultDao {
        }
	}
	
	/**
	 * 统计所有未查看的消息记录（包括咨询别人和别人咨询自己的所有未读消息）
	 * @param con
	 * @param professorId 登陆者ID
	 * @return 返回所有未查看的消息条数
	 * @throws SQLException
	 */
	public int queryNotReadReply(Connection con, String professorId) throws SQLException {
		int _m_2 = 1;
		String sql = " SELECT COUNT(1) FROM TIDINGS "
				+ " INNER JOIN CONSULT ON TIDINGS.CONSULT_ID = CONSULT.CONSULT_ID AND (TIDINGS.READ_STATUS = 0) "
				+ " AND (CONSULT.CONSULTANT_ID = ? OR CONSULT.PROFESSOR_ID = ?) AND (TIDINGS.SENDER_ID != ?) ";
		PreparedStatement ps = con.prepareStatement(sql);
		try {
			ps.setString(_m_2++, professorId);
			ps.setString(_m_2++, professorId);
			ps.setString(_m_2++, professorId);
			ResultSet rs = ps.executeQuery();
			rs.next();
			int count = rs.getInt(1);
			return count;
		} finally{
            try{ps.close();}catch(Exception _m_3){}
        }
	}
	
	/**
	 * 我的工作台中显示接受咨询的总次数
	 * @param con

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

@@ -233,24 +233,23 @@ public abstract class OperationDao {
//        }
//    }
	
	/**
	 * 搜索当前用户的所有资源申请（包括申请别人和别人申请自己的）
	 * @param con
	 * @param id 登录用户ID
	 * @param pageSize
	 * @param pageNo
	 * @return 返回所有资源申请记录（包括申请别人和别人申请自己的）
	 * @throws SQLException
	 */
	public PageQueryResult<Operation> queryPro(Connection con, @Nullable String id,int pageSize,int pageNo) throws SQLException{
        int _m_1 = 0;
        PageQueryResult<Operation> _result = new PageQueryResult<Operation>();
        int _m_3 = 1;
        boolean _m_2 = null == id;
        StringBuilder sql = new StringBuilder();
        boolean _m_5 = true;
        if(!_m_2){
            _m_5 =  false;
            sql.append(" WHERE O.RESOURCE_ID IN (SELECT R.RESOURCE_ID FROM RESOURCE R WHERE R.PROFESSOR_ID = ?)");
        }
        if(!_m_2){
            if(_m_5){
                _m_5 =  false;
                sql.append(" WHERE (O.DEMAND_ID = ?) ");
            }else{
                sql.append(" OR (O.DEMAND_ID = ?) ");
            }
            sql.append(" WHERE O.RESOURCE_ID IN (SELECT R.RESOURCE_ID FROM RESOURCE R WHERE R.PROFESSOR_ID = ?) OR (O.DEMAND_ID = ?) ");
        }
        StringBuilder _m_4 = sql;
        sql = new StringBuilder();
@@ -262,8 +261,6 @@ public abstract class OperationDao {
        try{
            if(!_m_2){
                ps.setString(_m_3++,id);
            }
            if(!_m_2){
                ps.setString(_m_3++,id);
            }
            _result.setPageSize(pageSize);
@@ -327,8 +324,6 @@ public abstract class OperationDao {
        try{
            if(!_m_2){
                ps.setString(_m_3++,id);
            }
            if(!_m_2){
                ps.setString(_m_3++,id);
            }
            ResultSet rs = ps.executeQuery();
@@ -376,10 +371,10 @@ public abstract class OperationDao {
                    resource.setResourceName(rs.getString(13));
                    resource.setSupportedServices(rs.getString(14));
                    resource.setDescp(rs.getString(15));
                    List<Image> images = this.imageDao.queryRes(con, resource.getResourceId());
                    resource.setImages(images);
                    Professor professor2 = new Professor();
                    professor2.setId(rs.getString(16));
                    List<Image> images = this.imageDao.queryRes(con, _obj.getResourceId());
                    resource.setImages(images);
                    professor.setName(rs.getString(17));
                    _obj.setProfessor(professor);
                    professor2.setName(rs.getString(18));

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

@@ -32,7 +32,7 @@ public abstract class TidingsDao {
    }
	
	/**
	 * 查询未查看信息条数的接口 
	 * 查询当前咨询有几条未读消息
	 * @param con
	 * @param consultId 咨询ID
	 * @param senderId 登录者ID
@@ -54,22 +54,24 @@ public abstract class TidingsDao {
	 * 我的工作台最新回复
	 * @param con
	 * @param consultantId 咨询者ID
	 * @return 返回最新回复信息
	 * @return 返回最新回复信息(包括咨询别人和别人咨询自己的最新回复)
	 * @throws SQLException
	 */
	public Tidings queryNewReply(Connection con, String consultantId) throws SQLException{
		int _m_1 = 1;
        String sql = "SELECT TIDINGS_ID,TIDINGS_CONTANT,SENDER_ID,TIDINGS.CONSULT_ID,TIDINGS.CREATE_TIME,"
        		+ " TIDINGS.READ_STATUS,CONSULT.CONSULT_TITLE,CONSULT.CREATE_TIME,PROFESSOR.NAME,PROFESSOR.OFFICE,"
        		+ " TIDINGS.READ_STATUS,CONSULT.CONSULT_TITLE,PROFESSOR.NAME,PROFESSOR.OFFICE,"
        		+ " PROFESSOR.DEPARTMENT,PROFESSOR.TITLE,PROFESSOR.ADDRESS,ORGANIZATION.NAME "
        		+ " FROM TIDINGS LEFT JOIN CONSULT ON TIDINGS.CONSULT_ID = CONSULT.CONSULT_ID "
        		+ " LEFT JOIN PROFESSOR ON CONSULT.PROFESSOR_ID = PROFESSOR.ID "
        		+ " LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID "
        		+ " WHERE TIDINGS.CREATE_TIME IN "
        		+ " (SELECT MAX(TIDINGS.CREATE_TIME) FROM TIDINGS INNER JOIN CONSULT ON TIDINGS.CONSULT_ID = CONSULT.CONSULT_ID "
        		+ " AND (TIDINGS.READ_STATUS = 0) AND (CONSULT.CONSULTANT_ID = ?) AND (TIDINGS.SENDER_ID != ?)) ";
        		+ " (SELECT MAX(TIDINGS.CREATE_TIME) FROM TIDINGS "
        		+ " INNER JOIN CONSULT ON TIDINGS.CONSULT_ID = CONSULT.CONSULT_ID AND (TIDINGS.READ_STATUS = 0) "
        		+ " AND (CONSULT.CONSULTANT_ID = ? OR CONSULT.PROFESSOR_ID = ?) AND (TIDINGS.SENDER_ID != ?)) ";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,consultantId);
            ps.setString(_m_1++,consultantId);
            ps.setString(_m_1++,consultantId);
            ResultSet rs = ps.executeQuery();
@@ -85,13 +87,12 @@ public abstract class TidingsDao {
                	tidings.setCreateTime(rs.getString(5));
                	tidings.setReadStatus(rs.getShort(6));
                	consult.setConsultTitle(rs.getString(7));
                	consult.setCreateTime(rs.getString(8));
                	professor.setName(rs.getString(9));
                	professor.setOffice(rs.getString(10));
                	professor.setDepartment(rs.getString(11));
                	professor.setTitle(rs.getString(12));
                	professor.setAddress(rs.getString(13));
                	professor.setOrgName(rs.getString(14));
                	professor.setName(rs.getString(8));
                	professor.setOffice(rs.getString(9));
                	professor.setDepartment(rs.getString(10));
                	professor.setTitle(rs.getString(11));
                	professor.setAddress(rs.getString(12));
                	professor.setOrgName(rs.getString(13));
                	tidings.setProfessor(professor);
                	tidings.setConsult(consult);
                	return tidings;

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

@@ -78,7 +78,9 @@ public class ConsultService {
	@Get
	@Path("/qaReadStatus")
	public int queryReadStatus(@JdbcConn Connection con, String professorId) throws SQLException {
		return this.consultDao.queryReadStatus(con, professorId);
		int notReadConsult = this.consultDao.queryReadStatus(con, professorId);
		int notReadReply = this.consultDao.queryNotReadReply(con, professorId);
		return notReadConsult+notReadReply;
	}
	
	@Get