资源查询接口返回参数添加专家信息。

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

@@ -21,6 +21,7 @@ import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.Resource;
import com.ekexiu.portal.pojo.EditProfessor;
@DAO
public abstract class ResourceDao {
@@ -314,6 +315,22 @@ public abstract class ResourceDao {
                sql.append(" OR COOPERATION_NOTES LIKE ?");
            }
        }
        if(!_m_2){
            if(_m_7){
                _m_7 =  false;
                sql.append(" WHERE RESOURCE.SUBJECT LIKE ?");
            }else{
                sql.append(" OR RESOURCE.SUBJECT LIKE ?");
            }
        }
        if(!_m_2){
        	if(_m_7){
        		_m_7 =  false;
        		sql.append(" WHERE RESOURCE.INDUSTRY LIKE ?");
        	}else{
        		sql.append(" OR RESOURCE.INDUSTRY LIKE ?");
        	}
        }
        if(!_m_4){
            if(_m_7){
                _m_7 =  false;
@@ -378,7 +395,7 @@ public abstract class ResourceDao {
        if(_m_10){
            _result.setPageNo(1);
            sql = new StringBuilder();
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,RESOURCE.SUBJECT,RESOURCE.INDUSTRY,SUPPORTED_SERVICES,RESOURCE.DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,RESOURCE.CREATE_TIME,RESOURCE.MODIFY_TIME,PROFESSOR.NAME FROM RESOURCE LEFT JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID");
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,RESOURCE.SUBJECT,RESOURCE.INDUSTRY,SUPPORTED_SERVICES,RESOURCE.DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,RESOURCE.CREATE_TIME,RESOURCE.MODIFY_TIME,PROFESSOR.NAME,PROFESSOR.TITLE,PROFESSOR.DEPARTMENT,PROFESSOR.ADDRESS,ORGANIZATION.NAME FROM RESOURCE LEFT JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID");
            if(_m_6.length()>0){
                sql.append(_m_6);
            }
@@ -396,7 +413,7 @@ public abstract class ResourceDao {
            --pageNo;
            int _m_12 = (pageNo * pageSize);
            sql = new StringBuilder();
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,RESOURCE.SUBJECT,RESOURCE.INDUSTRY,SUPPORTED_SERVICES,RESOURCE.DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,RESOURCE.CREATE_TIME,RESOURCE.MODIFY_TIME,PROFESSOR.NAME FROM RESOURCE LEFT JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID");
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,RESOURCE.SUBJECT,RESOURCE.INDUSTRY,SUPPORTED_SERVICES,RESOURCE.DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,RESOURCE.CREATE_TIME,RESOURCE.MODIFY_TIME,PROFESSOR.NAME,PROFESSOR.TITLE,PROFESSOR.DEPARTMENT,PROFESSOR.ADDRESS,ORGANIZATION.NAME FROM RESOURCE LEFT JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID");
            if(_m_6.length()>0){
                sql.append(_m_6);
            }
@@ -449,7 +466,7 @@ public abstract class ResourceDao {
                        _m_17 = null;
                    }
                    _obj.setDescp(_m_17);
                    Professor professor = new Professor();
                    EditProfessor professor = new EditProfessor();
                    professor.setId(rs.getString(7));
                    _obj.setAscription(rs.getString(8));
                    _obj.setHopePayMethod(rs.getString(9));
@@ -461,6 +478,10 @@ public abstract class ResourceDao {
                    _obj.setCreateTime(rs.getString(11));
                    _obj.setModifyTime(rs.getString(12));
                    professor.setName(rs.getString(13));
                    professor.setTitle(rs.getString(14));
                    professor.setDepartment(rs.getString(15));
                    professor.setAddress(rs.getString(16));
                    professor.setOrgName(rs.getString(17));
                    _obj.setProfessor(professor);
                    _m_13.add(_obj);
                }

src/main/java/com/ekexiu/portal/po/Resource.java

@@ -68,7 +68,7 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
		this.resourceName = resourceName;
	}
	
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=false,queryable=true)
	public String getSubject() {
		return subject;
	}
@@ -76,7 +76,7 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
		this.subject = subject;
	}
	
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=false,queryable=true)
	public String getIndustry() {
		return industry;
	}