Browse Source

--update queryPro();

zzy.zhiyuan.foxmail 8 years ago
parent
commit
07362ccdd5

+ 7 - 0
src/main/java/com/ekexiu/portal/po/Article.java

@ -26,6 +26,7 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
26 26
	private String articleType;
27 27
	private int articleAgree;
28 28
	private EditProfessor professor;
29
	private Organization organization;
29 30
	
30 31
	public EditProfessor getProfessor() {
31 32
		return professor;
@ -33,6 +34,12 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
33 34
	public void setProfessor(EditProfessor professor) {
34 35
		this.professor = professor;
35 36
	}
37
	public Organization getOrganization() {
38
		return organization;
39
	}
40
	public void setOrganization(Organization organization) {
41
		this.organization = organization;
42
	}
36 43
	@Column(DE.id_32)
37 44
	public String getArticleId() {
38 45
		return articleId;

+ 14 - 1
src/main/java/com/ekexiu/portal/service/WatchService.java

@ -13,6 +13,7 @@ import org.jfw.apt.web.annotation.param.JdbcConn;
13 13
import org.jfw.util.PageQueryResult;
14 14

15 15
import com.ekexiu.portal.dao.ArticleDao;
16
import com.ekexiu.portal.dao.OrgDao;
16 17
import com.ekexiu.portal.dao.ProfessorDao;
17 18
import com.ekexiu.portal.dao.ResearchAreaDao;
18 19
import com.ekexiu.portal.dao.ResourceDao;
@ -36,6 +37,8 @@ public class WatchService {
36 37
	private ResearchAreaDao researchAreaDao;
37 38
	@Autowrie
38 39
	private ArticleDao articleDao;
40
	@Autowrie
41
	private OrgDao orgDao;
39 42
	
40 43
	public WatchDao getWatchDao() {
41 44
		return watchDao;
@ -73,6 +76,12 @@ public class WatchService {
73 76
	public void setArticleDao(ArticleDao articleDao) {
74 77
		this.articleDao = articleDao;
75 78
	}
79
	public OrgDao getOrgDao() {
80
		return orgDao;
81
	}
82
	public void setOrgDao(OrgDao orgDao) {
83
		this.orgDao = orgDao;
84
	}
76 85
	
77 86
	@Post
78 87
	@Path
@ -121,7 +130,11 @@ public class WatchService {
121 130
			for (Watch watch : watchs) {
122 131
				Article article = this.articleDao.queryOne(con, watch.getWatchObject());
123 132
				if(article != null){
124
					article.setProfessor(this.professorDao.queryBaseInfo(con, article.getProfessorId()));
133
					if("1".equals(article.getArticleType())){
134
						article.setProfessor(this.professorDao.queryBaseInfo(con, article.getProfessorId()));
135
					}else if("2".equals(article.getArticleType())){
136
						article.setOrganization(this.orgDao.query(con, article.getOrgId()));
137
					}
125 138
				}
126 139
				watch.setArticle(article);
127 140
			}