Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
jiapeng
/
portal-web
Vērot 3
Pievienot zvaigznīti 0
Atdalīts 0
Kods Problēmas 0 Izmaiņu pieprasījumi 0 Revīzijas 289 Laidieni 0 Vikivietne
Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master' into test

jiapeng 7 gadi atpakaļ
vecāks
37ddbb9632 1f2357d53f
revīzija
4185dc654f
4 mainītis faili ar 51 papildinājumiem un 25 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 21 7
      src/main/java/com/ekexiu/portal/dao/ArticleDao.java
  2. 7 0
      src/main/java/com/ekexiu/portal/dao/PpaperDao.java
  3. 5 0
      src/main/java/com/ekexiu/portal/dao/PpatentDao.java
  4. 18 18
      src/main/java/com/ekexiu/portal/dao/ResourceDao.java

+ 21 - 7
src/main/java/com/ekexiu/portal/dao/ArticleDao.java
Parādīt failu 

@ -11,6 +11,7 @@ import java.util.List;
11 11 
import org.jfw.apt.annotation.Nullable;
12 12 
import org.jfw.apt.orm.annotation.dao.DAO;
13 13 
import org.jfw.apt.orm.annotation.dao.Dynamic;
14 
import org.jfw.apt.orm.annotation.dao.method.Exclude;
14 15 
import org.jfw.apt.orm.annotation.dao.method.From;
15 16 
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
16 17 
import org.jfw.apt.orm.annotation.dao.method.SetSentence;

@ -80,43 +81,52 @@ public abstract class ArticleDao {
80 81 
	@From(Article.class)
81 82 
	public abstract int deletePro(Connection con, String professorId) throws SQLException;
82 83
84 
	@Exclude("articleContent")
83 85 
	@SelectList
84 86 
	@Where("STATUS = '2'")
85 87 
	public abstract List<Article> queryTiming(Connection con, @LessThan String publishTime) throws SQLException;
86 88
89 
	@Exclude("articleContent")
87 90 
	@SelectList
88 91 
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
89 92 
	public abstract List<Article> queryPro(Connection con, String professorId) throws SQLException;
90 93
94 
	@Exclude("articleContent")
91 95 
	@SelectList
92 96 
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
93 97 
	@Where("STATUS = '1'")
94 98 
	public abstract List<Article> queryProPublish(Connection con, String professorId) throws SQLException;
95 99
100 
	@Exclude("articleContent")
96 101 
	@PageSelect
97 102 
	@OrderBy(" ORDER BY PUBLISH_TIME DESC,SHARE_ID ASC")
98 103 
	@Where("STATUS = '1'")
99 104 
	public abstract PageQueryResult<Article> pageQueryProPublish(Connection con, String professorId,int pageSize,int pageNo) throws SQLException;
100 105
106 
	@Exclude("articleContent")
101 107 
	@SelectList
102 108 
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
103 109 
	@Where("STATUS IN ('0','1','2')")
104 110 
	public abstract List<Article> queryForDesk(Connection con, String professorId) throws SQLException;
105 111
112 
	@Exclude("articleContent")
106 113 
	@SelectList
107 114 
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
108 115 
	public abstract List<Article> queryOrg(Connection con, String orgId) throws SQLException;
109 116
117
118 
	@Exclude("articleContent")
110 119 
	@SelectList
111 120 
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
112 121 
	@Where("STATUS = '1'")
113 122 
	public abstract List<Article> queryOrgPublish(Connection con, String orgId) throws SQLException;
114 123
124 
	@Exclude("articleContent")
115 125 
	@PageSelect
116 126 
	@OrderBy(" ORDER BY PUBLISH_TIME DESC,SHARE_ID ASC")
117 127 
	@Where("STATUS = '1'")
118 128 
	public abstract PageQueryResult<Article> pageQueryOrgPublish(Connection con, String orgId,int pageSize,int pageNo) throws SQLException;
119
129 
	@Exclude("articleContent")
120 130 
	@LimitSelect
121 131 
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
122 132 
	public abstract List<Article> queryLimit(Connection con,String orgId,@LessThan String modifyTime,int rows)throws SQLException;

@ -125,11 +135,12 @@ public abstract class ArticleDao {
125 135 
	@Nullable
126 136 
	public abstract Article queryOne(Connection con, String articleId) throws SQLException;
127 137
138
128 139 
	public List<Article> queryByPageViews(Connection con,String articleId,int rows)throws SQLException{
129 140 
		int index = 1;
130 141 
		boolean hasArticleId = null != articleId;
131 142 
		StringBuilder sql = new StringBuilder();
132 
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
143 
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,'',SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
133 144 
		sql.append(" WHERE STATUS = '1'");
134 145 
		if(hasArticleId){
135 146 
			sql.append(" AND ARTICLE_ID != ?");

@ -210,7 +221,7 @@ public abstract class ArticleDao {
210 221 
		boolean hasOrgId = null != orgId;
211 222 
		boolean hasArticleId = null != articleId;
212 223 
		StringBuilder sql = new StringBuilder();
213 
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
224 
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,'',SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
214 225 
		sql.append(" WHERE STATUS = '1'");
215 226 
		if(hasProId){
216 227 
			sql.append(" AND PROFESSOR_ID = ?");

@ -321,6 +332,7 @@ public abstract class ArticleDao {
321 332 
	@SelectList
322 333 
	public abstract List<Article> query(Connection con,@In String[] articleId) throws SQLException;
323 334
335 
	@Exclude("articleContent")
324 336 
	@LimitSelect
325 337 
	@Where("STATUS ='1'")
326 338 
	@OrderBy("ORDER BY PAGE_VIEWS DESC")

@ -422,6 +434,8 @@ public abstract class ArticleDao {
422 434 
//		}
423 435 
//	}
424 436 
//
437
438 
	@Exclude("articleContent")
425 439 
	@PageSelect
426 440 
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
427 441 
	@Where("STATUS = '1'")

@ -474,7 +488,7 @@ public abstract class ArticleDao {
474 488 
        if(firstPage){
475 489 
            queryResult.setPageNo(1);
476 490 
            sql = new StringBuilder();
477 
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
491 
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,'',SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
478 492 
            sql.append(whereSql);
479 493 
            sql.append(" ORDER BY SORT_NUM DESC, PUBLISH_TIME DESC");
480 494 
            sql.append(" LIMIT ").append(pageSize);

@ -490,7 +504,7 @@ public abstract class ArticleDao {
490 504 
            --pageNo;
491 505 
            int offset = (pageNo * pageSize);
492 506 
            sql = new StringBuilder();
493 
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
507 
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,'',SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
494 508 
            sql.append(whereSql);
495 509 
            sql.append(" ORDER BY SORT_NUM DESC,PUBLISH_TIME DESC");
496 510 
            sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(offset);

@ -626,7 +640,7 @@ public abstract class ArticleDao {
626 640 
        if(firstPage){
627 641 
        	queryResult.setPageNo(1);
628 642 
        	sql = new StringBuilder();
629 
        	sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS IN('0','2')");
643 
        	sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,'',SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS IN('0','2')");
630 644 
        	if(hasProfessorId){
631 645 
            	sql.append(" AND PROFESSOR_ID = ?");
632 646 
            }

@ -660,7 +674,7 @@ public abstract class ArticleDao {
660 674 
            --pageNo;
661 675 
            int offset = (pageNo * pageSize);
662 676 
            sql = new StringBuilder();
663 
            sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS IN('0','2')");
677 
            sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,'',SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS IN('0','2')");
664 678 
        	if(hasProfessorId){
665 679 
            	sql.append(" AND PROFESSOR_ID = ?");
666 680 
            }

+ 7 - 0
src/main/java/com/ekexiu/portal/dao/PpaperDao.java
Parādīt failu 

@ -9,6 +9,7 @@ import java.util.List;
9 9
10 10 
import org.jfw.apt.annotation.Nullable;
11 11 
import org.jfw.apt.orm.annotation.dao.DAO;
12 
import org.jfw.apt.orm.annotation.dao.method.Exclude;
12 13 
import org.jfw.apt.orm.annotation.dao.method.From;
13 14 
import org.jfw.apt.orm.annotation.dao.method.Or;
14 15 
import org.jfw.apt.orm.annotation.dao.method.OrderBy;

@ -43,12 +44,15 @@ public abstract class PpaperDao {
43 44 
	@From(Ppaper.class)
44 45 
	public abstract int update(Connection con, String id, @Set @Nullable String keywords) throws SQLException;
45 46
47
48 
	@Exclude("summary")
46 49 
	@PageQuery
47 50 
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
48 51 
	public abstract PageQueryResult<AssedPaper> pageQueryWithProfessor(Connection con,
49 52 
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID=?" })  String professorId,
50 53 
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
51 54
55 
	@Exclude("summary")
52 56 
	@PageQuery
53 57 
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
54 58 
	public abstract PageQueryResult<AssedPaper> pageQueryWithAuthor(Connection con,

@ -61,10 +65,13 @@ public abstract class PpaperDao {
61 65 
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
62 66 
	public abstract int incPageViews(Connection con,String id)throws SQLException;
63 67
68 
	@Exclude("summary")
64 69 
	@PageSelect
65 70 
	@OrderBy(" ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC")
66 71 
	public abstract PageQueryResult<Ppaper> query(Connection con,int pageSize,int pageNo) throws SQLException;
67 72
73
74 
	@Exclude("summary")
68 75 
	@PageSelect
69 76 
	@OrderBy(" ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC")
70 77 
	@Or

+ 5 - 0
src/main/java/com/ekexiu/portal/dao/PpatentDao.java
Parādīt failu 

@ -9,6 +9,7 @@ import java.util.List;
9 9
10 10 
import org.jfw.apt.annotation.Nullable;
11 11 
import org.jfw.apt.orm.annotation.dao.DAO;
12 
import org.jfw.apt.orm.annotation.dao.method.Exclude;
12 13 
import org.jfw.apt.orm.annotation.dao.method.From;
13 14 
import org.jfw.apt.orm.annotation.dao.method.Or;
14 15 
import org.jfw.apt.orm.annotation.dao.method.OrderBy;

@ -42,12 +43,14 @@ public abstract class PpatentDao {
42 43 
	@From(Ppatent.class)
43 44 
	public abstract int update(Connection con, String id, @Set String keywords) throws SQLException;
44 45
46 
	@Exclude("summary")
45 47 
	@PageQuery
46 48 
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
47 49 
	public abstract PageQueryResult<AssedPatent> pageQueryWithProfessor(Connection con,
48 50 
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID=?" }) String professId,
49 51 
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
50 52
53 
	@Exclude("summary")
51 54 
	@PageQuery
52 55 
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
53 56 
	public abstract PageQueryResult<AssedPatent> pageQueryWithAuthor(Connection con,

@ -61,10 +64,12 @@ public abstract class PpatentDao {
61 64 
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
62 65 
	public abstract int incPageViews(Connection con, String id) throws SQLException;
63 66
67 
	@Exclude("summary")
64 68 
	@PageSelect
65 69 
	@OrderBy(" ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC")
66 70 
	public abstract PageQueryResult<Ppatent> query(Connection con, int pageSize, int pageNo) throws SQLException;
67 71
72 
	@Exclude("summary")
68 73 
	@PageSelect
69 74 
	@OrderBy(" ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC")
70 75 
	@Or

+ 18 - 18
src/main/java/com/ekexiu/portal/dao/ResourceDao.java
Parādīt failu 

@ -162,14 +162,14 @@ public abstract class ResourceDao {
162 162 
        if(firstPage){
163 163 
        	queryResult.setPageNo(1);
164 164 
        	sql = new StringBuilder();
165 
        	sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
165 
        	sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
166 166 
        	if(hasProfessorId){
167 167 
            	sql.append(" AND PROFESSOR_ID = ?");
168 168 
            }
169 169 
        	if(hasKey){
170 170 
        		sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
171 171 
        	}
172 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
172 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
173 173 
        	if(hasProfessorId){
174 174 
            	sql.append(" AND PROFESSOR_ID = ?");
175 175 
            }

@ -190,14 +190,14 @@ public abstract class ResourceDao {
190 190 
            --pageNo;
191 191 
            int offset = (pageNo * pageSize);
192 192 
            sql = new StringBuilder();
193 
            sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
193 
            sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
194 194 
        	if(hasProfessorId){
195 195 
            	sql.append(" AND PROFESSOR_ID = ?");
196 196 
            }
197 197 
        	if(hasKey){
198 198 
        		sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
199 199 
        	}
200 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
200 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
201 201 
        	if(hasProfessorId){
202 202 
            	sql.append(" AND PROFESSOR_ID = ?");
203 203 
            }

@ -336,14 +336,14 @@ public abstract class ResourceDao {
336 336 
        if(firstPage){
337 337 
        	queryResult.setPageNo(1);
338 338 
        	sql = new StringBuilder();
339 
        	sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
339 
        	sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
340 340 
        	if(hasOrgId){
341 341 
            	sql.append(" AND ORG_ID = ?");
342 342 
            }
343 343 
        	if(hasKey){
344 344 
        		sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
345 345 
        	}
346 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
346 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
347 347 
        	if(hasOrgId){
348 348 
            	sql.append(" AND ORG_ID = ?");
349 349 
            }

@ -364,14 +364,14 @@ public abstract class ResourceDao {
364 364 
            --pageNo;
365 365 
            int offset = (pageNo * pageSize);
366 366 
            sql = new StringBuilder();
367 
            sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
367 
            sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
368 368 
        	if(hasOrgId){
369 369 
            	sql.append(" AND ORG_ID = ?");
370 370 
            }
371 371 
        	if(hasKey){
372 372 
        		sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
373 373 
        	}
374 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
374 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
375 375 
        	if(hasOrgId){
376 376 
            	sql.append(" AND ORG_ID = ?");
377 377 
            }

@ -470,7 +470,7 @@ public abstract class ResourceDao {
470 470 
        boolean hasProId = null != professorId;
471 471 
        boolean hasResId = null != resourceId;
472 472 
        StringBuilder sql = new StringBuilder();
473 
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
473 
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
474 474 
        sql.append(" WHERE STATUS = '1'");
475 475 
        if(hasResId){
476 476 
        	sql.append(" AND RESOURCE_ID != ?");

@ -565,7 +565,7 @@ public abstract class ResourceDao {
565 565 
        boolean hasOrgId = null != orgId;
566 566 
        boolean hasResId = null != resourceId;
567 567 
        StringBuilder sql = new StringBuilder();
568 
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
568 
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
569 569 
        sql.append(" WHERE STATUS = '1'");
570 570 
        if(hasResId){
571 571 
        	sql.append(" AND RESOURCE_ID != ?");

@ -669,7 +669,7 @@ public abstract class ResourceDao {
669 669 
        boolean hasKeys = null != keys;
670 670 
        boolean hasResId = null != resourceId;
671 671 
        StringBuilder sql = new StringBuilder();
672 
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
672 
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
673 673 
        sql.append(" WHERE STATUS = '1'");
674 674 
        if(hasResId){
675 675 
        	sql.append(" AND RESOURCE_ID != ?");

@ -958,7 +958,7 @@ public abstract class ResourceDao {
958 958 
        if(firstPage){
959 959 
        	queryResult.setPageNo(1);
960 960 
            sql = " SELECT RESOURCE_ID,RESOURCE_NAME,RESOURCE.SUBJECT,RESOURCE.INDUSTRY,"
961 
            		+ " SUPPORTED_SERVICES,RESOURCE.DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,"
961 
            		+ " SUPPORTED_SERVICES,'',PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,"
962 962 
            		+ " COOPERATION_NOTES,RESOURCE.CREATE_TIME,RESOURCE.MODIFY_TIME,PROFESSOR.NAME "
963 963 
            		+ " FROM RESOURCE LEFT JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID ";
964 964 
            sql = sql + " ORDER BY RESOURCE_NAME ";

@ -975,7 +975,7 @@ public abstract class ResourceDao {
975 975 
            --pageNo;
976 976 
            int offset = (pageNo * pageSize);
977 977 
            sql = " SELECT RESOURCE_ID,RESOURCE_NAME,RESOURCE.SUBJECT,RESOURCE.INDUSTRY,"
978 
            		+ " SUPPORTED_SERVICES,RESOURCE.DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,"
978 
            		+ " SUPPORTED_SERVICES,'',PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,"
979 979 
            		+ " COOPERATION_NOTES,RESOURCE.CREATE_TIME,RESOURCE.MODIFY_TIME,PROFESSOR.NAME "
980 980 
            		+ " FROM RESOURCE LEFT JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID ";
981 981 
            sql = sql + " ORDER BY RESOURCE_NAME ";

@ -1111,7 +1111,7 @@ public abstract class ResourceDao {
1111 1111 
	 */
1112 1112 
	public List<Resource> queryPro(Connection con,String professorId) throws SQLException{
1113 1113 
        int index = 1;
1114 
        String sql = "SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,INDUSTRY,SUPPORTED_SERVICES,DESCP,"
1114 
        String sql = "SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,INDUSTRY,SUPPORTED_SERVICES,'',"
1115 1115 
        		+ " PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,CREATE_TIME,MODIFY_TIME "
1116 1116 
        		+ " FROM RESOURCE WHERE PROFESSOR_ID = ? ORDER BY CREATE_TIME DESC";
1117 1117 
        PreparedStatement ps = con.prepareStatement(sql);

@ -1219,7 +1219,7 @@ public abstract class ResourceDao {
1219 1219 
        if(firstPage){
1220 1220 
            queryResult.setPageNo(1);
1221 1221 
            sql = new StringBuilder();
1222 
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
1222 
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
1223 1223 
            sql.append(whereSql);
1224 1224 
            sql.append(" ORDER BY SORT_NUM DESC,PUBLISH_TIME DESC");
1225 1225 
            sql.append(" LIMIT ").append(pageSize);

@ -1235,7 +1235,7 @@ public abstract class ResourceDao {
1235 1235 
            --pageNo;
1236 1236 
            int offset = (pageNo * pageSize);
1237 1237 
            sql = new StringBuilder();
1238 
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
1238 
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,'',PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
1239 1239 
            sql.append(whereSql);
1240 1240 
            sql.append(" ORDER BY SORT_NUM DESC,PUBLISH_TIME DESC");
1241 1241 
            sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(offset);

@ -1642,7 +1642,7 @@ public abstract class ResourceDao {
1642 1642 
        if(firstPage){
1643 1643 
        	queryResult.setPageNo(1);
1644 1644 
            sql = new StringBuilder();
1645 
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,R.SUBJECT,R.INDUSTRY,SUPPORTED_SERVICES,R.DESCP,PROFESSOR_ID,"
1645 
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,R.SUBJECT,R.INDUSTRY,SUPPORTED_SERVICES,'',PROFESSOR_ID,"
1646 1646 
            		+ " ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,R.CREATE_TIME,R.MODIFY_TIME,P.NAME,P.TITLE,"
1647 1647 
            		+ " P.DEPARTMENT,P.ADDRESS,P.OFFICE,AUTHENTICATION,P.AUTH_TYPE,P.AUTH_STATUS,O.NAME "
1648 1648 
            		+ " FROM RESOURCE R LEFT JOIN PROFESSOR P ON PROFESSOR_ID = P.ID "

@ -1664,7 +1664,7 @@ public abstract class ResourceDao {
1664 1664 
            --pageNo;
1665 1665 
            int offset = (pageNo * pageSize);
1666 1666 
            sql = new StringBuilder();
1667 
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,R.SUBJECT,R.INDUSTRY,SUPPORTED_SERVICES,R.DESCP,PROFESSOR_ID,"
1667 
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,R.SUBJECT,R.INDUSTRY,SUPPORTED_SERVICES,'',PROFESSOR_ID,"
1668 1668 
            		+ " ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,R.CREATE_TIME,R.MODIFY_TIME,P.NAME,P.TITLE,"
1669 1669 
            		+ " P.DEPARTMENT,P.ADDRESS,P.OFFICE,AUTHENTICATION,P.AUTH_TYPE,P.AUTH_STATUS,O.NAME "
1670 1670 
            		+ " FROM RESOURCE R LEFT JOIN PROFESSOR P ON PROFESSOR_ID = P.ID "