|
@ -23,6 +23,7 @@ import org.jfw.util.StringUtil;
|
23
|
23
|
|
24
|
24
|
import com.ekexiu.portal.dao.AuthApplyDao;
|
25
|
25
|
import com.ekexiu.portal.dao.HonorDao;
|
|
26
|
import com.ekexiu.portal.dao.ImageDao;
|
26
|
27
|
import com.ekexiu.portal.dao.OrgDao;
|
27
|
28
|
import com.ekexiu.portal.dao.PaperDao;
|
28
|
29
|
import com.ekexiu.portal.dao.PartTimeJobDao;
|
|
@ -37,6 +38,7 @@ import com.ekexiu.portal.dao.UserDao;
|
37
|
38
|
import com.ekexiu.portal.dao.WatchDao;
|
38
|
39
|
import com.ekexiu.portal.po.AuthApply;
|
39
|
40
|
import com.ekexiu.portal.po.Professor;
|
|
41
|
import com.ekexiu.portal.po.Resource;
|
40
|
42
|
import com.ekexiu.portal.po.User;
|
41
|
43
|
import com.ekexiu.portal.pojo.EditProfessor;
|
42
|
44
|
import com.ekexiu.portal.pojo.EditResearchAreaLog;
|
|
@ -45,6 +47,8 @@ import com.ekexiu.portal.util.Calculate;
|
45
|
47
|
|
46
|
48
|
@Path("/professor")
|
47
|
49
|
public class ProfessorService {
|
|
50
|
@Autowrie
|
|
51
|
private ImageDao imageDao;
|
48
|
52
|
@Autowrie
|
49
|
53
|
private AuthApplyDao authApplyDao;
|
50
|
54
|
@Autowrie
|
|
@ -218,6 +222,14 @@ public class ProfessorService {
|
218
|
222
|
}
|
219
|
223
|
|
220
|
224
|
|
|
225
|
public ImageDao getImageDao() {
|
|
226
|
return imageDao;
|
|
227
|
}
|
|
228
|
|
|
229
|
public void setImageDao(ImageDao imageDao) {
|
|
230
|
this.imageDao = imageDao;
|
|
231
|
}
|
|
232
|
|
221
|
233
|
@Post
|
222
|
234
|
@Path
|
223
|
235
|
public String insert(@JdbcConn(true) Connection con, Professor professor, @Nullable String orgName)
|
|
@ -476,7 +488,13 @@ public class ProfessorService {
|
476
|
488
|
}
|
477
|
489
|
info.setEditResearchAreaLogs(logs);
|
478
|
490
|
info.setResearchAreas(this.researchAreaDao.query(con, id));
|
479
|
|
info.setResources(this.resourceDao.queryPro(con, id));
|
|
491
|
List<Resource> resources = this.resourceDao.queryPro(con, id);
|
|
492
|
if(resources != null){
|
|
493
|
for (Resource resource : resources) {
|
|
494
|
resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
|
|
495
|
}
|
|
496
|
}
|
|
497
|
info.setResources(resources);
|
480
|
498
|
}
|
481
|
499
|
return info;
|
482
|
500
|
|