专家个人信息修改页所有跟时间相关的，按时间倒序排序。

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

@@ -7,6 +7,7 @@ import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
@@ -24,6 +25,7 @@ public interface HonorDao {
	int update(Connection con, Honor honor) throws SQLException;
	@SelectList
	@OrderBy(" ORDER BY YEAR DESC ")
	List<Honor> query(Connection con, String professorId) throws SQLException;
	@Nullable

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

@@ -7,6 +7,7 @@ import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
@@ -24,6 +25,7 @@ public interface PaperDao {
	int update(Connection con,Paper paper) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY YEAR DESC ")
	List<Paper> query(Connection con,String professorId) throws SQLException;
	
	@Nullable

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

@@ -7,6 +7,7 @@ import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
@@ -24,6 +25,7 @@ public interface PartTimeJobDao {
	int update(Connection con,PartTimeJob job) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY STOP_MONTH DESC ")
	List<PartTimeJob> query(Connection con,String professorId) throws SQLException;
	
	@Nullable

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

@@ -7,6 +7,7 @@ import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
@@ -23,6 +24,7 @@ public interface PatentDao {
	int update(Connection con, Patent patent) throws SQLException;
	@SelectList
	@OrderBy(" ORDER BY YEAR DESC ")
	List<Patent> query(Connection con, String professorId) throws SQLException;
	@Nullable

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

@@ -7,6 +7,7 @@ import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
@@ -24,6 +25,7 @@ public interface ProfessorEduBgDao {
	int update(Connection con,ProfessorEduBg edu) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY YEAR DESC ")
	List<ProfessorEduBg> query(Connection con,String professorId) throws SQLException;
	
	@Nullable

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

@@ -7,6 +7,7 @@ import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
@@ -23,6 +24,7 @@ public interface ProjectDao {
	int update(Connection con,Project project) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY STOP_MONTH DESC ")
	List<Project> query(Connection con,String professorId) throws SQLException;
	
	@Nullable

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

@@ -77,6 +77,14 @@ public abstract class ResourceDao {
	@From(Resource.class)
	public abstract int updateCooperationNotes(Connection con,String resourceId,@Set String cooperationNotes) throws SQLException;
	
	@DeleteWith
	@From(Resource.class)
	public abstract int deletePro(Connection con, String professorId) throws SQLException;
	
	@DeleteWith
	@From(Resource.class)
	public abstract int delete(Connection con, String resourceId) throws SQLException;
	
	/**
	 * 查询资源基础信息(ID,名称,学术领域,应用行业,可提供服务,发布者ID,资源图片)
	 * @param con
@@ -453,10 +461,6 @@ public abstract class ResourceDao {
        }
    }
	
	@DeleteWith
	@From(Resource.class)
	public abstract int delete(Connection con, String resourceId) throws SQLException;
	
	/**
	 * 资源搜索页面接口，添加资源拥有者基本信息
	 * @param key 搜索条件

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

@@ -122,7 +122,7 @@ public class ConsultService {
	public PageQueryResult<Consult> queryAssessHis(@JdbcConn Connection con, String professorId,@DefaultValue("5") int pageSize,@DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Consult> queryResult = this.consultDao.queryAssessHis(con, professorId, pageSize, pageNo);
		List<Consult> consults = queryResult.getData();
		if(consults != null){
		if(!consults.isEmpty()){
			for (Consult consult : consults) {
				EditProfessor professor = this.professorDao.queryBaseInfo(con, consult.getConsultantId());
				if(professor != null){
@@ -186,7 +186,7 @@ public class ConsultService {
			@DefaultValue("5") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Consult> queryResult = this.consultDao.queryPageProBase(con, professorId, status, timeType, sortType, pageSize, pageNo);
		List<Consult> consults = queryResult.getData();
		if(consults != null){
		if(!consults.isEmpty()){
			for (Consult consult : consults) {
				EditProfessor professor = this.professorDao.queryBaseInfo(con, consult.getConsultantId());
				if(professor!=null){
@@ -214,7 +214,7 @@ public class ConsultService {
			@DefaultValue("5") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Consult> queryResult = this.consultDao.queryPageConBase(con, consultantId, status, timeType, sortType, pageSize, pageNo);
		List<Consult> consults = queryResult.getData();
		if(consults != null){
		if(!consults.isEmpty()){
			for (Consult consult : consults) {
				EditProfessor professor = this.professorDao.queryBaseInfo(con, consult.getProfessorId());
				if(professor!=null){
@@ -242,7 +242,7 @@ public class ConsultService {
			@DefaultValue("1") int timeType, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Consult> queryResult = this.consultDao.queryPageBase(con, professorId, consultOrNeed, consultType, status, timeType, pageSize, pageNo);
		List<Consult> consults = queryResult.getData();
		if(consults != null){
		if(!consults.isEmpty()){
			for (Consult consult : consults) {
				EditProfessor professor = new EditProfessor();
				if(0 == consultOrNeed){

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

@@ -331,7 +331,7 @@ public class ProfessorService {
	public PageQueryResult<EditProfessor> queryHot(@JdbcConn Connection con,@DefaultValue("8") int pageSize,@DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryHot(con, pageSize, pageNo);
		List<EditProfessor> professors = queryResult.getData();
		if(professors != null){
		if(!professors.isEmpty()){
			for (EditProfessor editProfessor : professors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
@@ -354,7 +354,7 @@ public class ProfessorService {
		if(null!=address) {address="%"+address+"%";}
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryAPP(con,key,subject,industry,province,address,authType,pageSize,pageNo);
		List<EditProfessor> editProfessors = queryResult.getData();
		if(editProfessors != null) {
		if(!editProfessors.isEmpty()) {
			for (EditProfessor editProfessor : editProfessors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
@@ -429,6 +429,7 @@ public class ProfessorService {
		this.projectDao.delete(con, id);
		this.watchDao.deletePro(con, id);
		this.watchDao.deleteWatch(con, id);
		this.resourceDao.deletePro(con, id);
	}
	
	@Get
@@ -442,7 +443,7 @@ public class ProfessorService {
		if(null!=address) {address="%"+address+"%";}
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryEditBaseInfo(con, key, subject, industry, address, authType, pageSize, pageNo);
		List<EditProfessor> editProfessors = queryResult.getData();
		if(editProfessors != null){
		if(!editProfessors.isEmpty()){
			for (EditProfessor editProfessor : editProfessors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
@@ -481,7 +482,7 @@ public class ProfessorService {
			info.setPatents(this.patentDao.query(con, id));
			info.setProjects(this.projectDao.query(con, id));
			List<EditResearchAreaLog> logs = this.researchAreaLogDao.query(con, id);
			if(logs != null){
			if(!logs.isEmpty()){
				for (EditResearchAreaLog log : logs) {
					log.setHasHeadImage(this.imageService.hasProfessorImage(log.getOpreteProfessorId()));
				}
@@ -489,7 +490,7 @@ public class ProfessorService {
			info.setEditResearchAreaLogs(logs);
			info.setResearchAreas(this.researchAreaDao.query(con, id));
			List<Resource> resources = this.resourceDao.queryPro(con, id);
			if(resources != null){
			if(!resources.isEmpty()){
				for (Resource resource : resources) {
					resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
				}

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

@@ -178,7 +178,7 @@ public class ResourceService {
	public PageQueryResult<Resource> queryPageAll(@JdbcConn Connection con, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Resource> queryResult = this.resourceDao.queryPageAll(con, pageSize, pageNo);
		List<Resource> resources = queryResult.getData();
		if(resources != null){
		if(!resources.isEmpty()){
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
@@ -191,7 +191,7 @@ public class ResourceService {
	@Path("/qapro")
	public List<Resource> queryPro(@JdbcConn Connection con, String professorId) throws SQLException {
		List<Resource> resources = this.resourceDao.queryPro(con, professorId);
		if(resources != null) {
		if(!resources.isEmpty()) {
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
@@ -262,7 +262,7 @@ public class ResourceService {
		if(address!=null)address="%"+address+"%";
		PageQueryResult<Resource> queryResult =  this.resourceDao.queryPageRes(con, key, subject, industry, province, address, authType, pageSize, pageNo);
		List<Resource> resources = queryResult.getData();
		if(resources != null){
		if(!resources.isEmpty()){
			for (Resource resource : resources) {
				resource.setProfessor(this.professorDao.queryBaseInfo(con, resource.getProfessorId()));
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
@@ -282,7 +282,7 @@ public class ResourceService {
		if(address!=null)address="%"+address+"%";
		PageQueryResult<Resource> queryResult = this.resourceDao.queryPage(con, key, subject, industry, address, authType, pageSize, pageNo);
		List<Resource> resources = queryResult.getData();
		if(resources != null){
		if(!resources.isEmpty()){
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}