Bladeren bron

--update queryPage();

zzy.zhiyuan.foxmail 8 jaren geleden
bovenliggende
commit
cee9ee38c0
1 gewijzigde bestanden met toevoegingen van 14 en 19 verwijderingen
  1. 14 19
      src/main/java/com/ekexiu/portal/dao/ResourceDao.java

+ 14 - 19
src/main/java/com/ekexiu/portal/dao/ResourceDao.java

@ -691,12 +691,9 @@ public abstract class ResourceDao {
691 691
        boolean _m_7 = true;
692 692
        if(!_m_2){
693 693
            _m_7 =  false;
694
            sql.append(" WHERE ((RESOURCE_NAME LIKE ?) OR (SUPPORTED_SERVICES LIKE ?) "
695
            		+ " OR (RESOURCE.SUBJECT LIKE ?) OR (RESOURCE.INDUSTRY LIKE ?) "
696
            		+ " OR (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR "
697
            		+ " WHERE PROFESSOR.ADDRESS LIKE ? OR PROFESSOR.NAME LIKE ?))"
698
            		+ " OR (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE ORG_ID "
699
            		+ " IN(SELECT ORGANIZATION.ID FROM ORGANIZATION WHERE ORGANIZATION.NAME LIKE ?) )) ) ");
694
            sql.append(" WHERE ((RESOURCE_NAME LIKE ?) OR (SUPPORTED_SERVICES LIKE ?) OR (R.SUBJECT LIKE ?) OR (R.INDUSTRY LIKE ?) "
695
            		+ " OR (R.PROFESSOR_ID IN (SELECT ID FROM PROFESSOR WHERE ADDRESS LIKE ? OR NAME LIKE ?))"
696
            		+ " OR (R.PROFESSOR_ID IN (SELECT ID FROM PROFESSOR WHERE ORG_ID IN(SELECT ID FROM ORGANIZATION WHERE NAME LIKE ?) )) ) ");
700 697
        }
701 698
        if(!_m_4){
702 699
            if(_m_7){
@ -732,7 +729,7 @@ public abstract class ResourceDao {
732 729
		}
733 730
        StringBuilder _m_6 = sql;
734 731
        sql = new StringBuilder();
735
        sql.append(" SELECT COUNT(1) FROM RESOURCE ");
732
        sql.append(" SELECT COUNT(1) FROM RESOURCE R ");
736 733
        if(_m_6.length()>0){
737 734
            sql.append(_m_6);
738 735
        }
@ -781,12 +778,11 @@ public abstract class ResourceDao {
781 778
        if(_m_10){
782 779
            _result.setPageNo(1);
783 780
            sql = new StringBuilder();
784
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,RESOURCE.SUBJECT,RESOURCE.INDUSTRY,SUPPORTED_SERVICES,"
785
            		+ " RESOURCE.DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,RESOURCE.CREATE_TIME,"
786
            		+ " RESOURCE.MODIFY_TIME,PROFESSOR.NAME,PROFESSOR.TITLE,PROFESSOR.DEPARTMENT,PROFESSOR.ADDRESS,"
787
            		+ " PROFESSOR.OFFICE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ORGANIZATION.NAME "
788
            		+ " FROM RESOURCE LEFT JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID "
789
            		+ " LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID");
781
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,R.SUBJECT,R.INDUSTRY,SUPPORTED_SERVICES,R.DESCP,PROFESSOR_ID,"
782
            		+ " ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,R.CREATE_TIME,R.MODIFY_TIME,P.NAME,P.TITLE,"
783
            		+ " P.DEPARTMENT,P.ADDRESS,P.OFFICE,AUTHENTICATION,P.AUTH_TYPE,P.AUTH_STATUS,O.NAME "
784
            		+ " FROM RESOURCE R LEFT JOIN PROFESSOR P ON PROFESSOR_ID = P.ID "
785
            		+ " LEFT JOIN ORGANIZATION O ON P.ORG_ID = O.ID");
790 786
            if(_m_6.length()>0){
791 787
                sql.append(_m_6);
792 788
            }
@ -804,12 +800,11 @@ public abstract class ResourceDao {
804 800
            --pageNo;
805 801
            int _m_12 = (pageNo * pageSize);
806 802
            sql = new StringBuilder();
807
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,RESOURCE.SUBJECT,RESOURCE.INDUSTRY,SUPPORTED_SERVICES,"
808
            		+ " RESOURCE.DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,RESOURCE.CREATE_TIME,"
809
            		+ " RESOURCE.MODIFY_TIME,PROFESSOR.NAME,PROFESSOR.TITLE,PROFESSOR.DEPARTMENT,PROFESSOR.ADDRESS,"
810
            		+ " PROFESSOR.OFFICE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ORGANIZATION.NAME "
811
            		+ " FROM RESOURCE LEFT JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID "
812
            		+ " LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID");
803
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,R.SUBJECT,R.INDUSTRY,SUPPORTED_SERVICES,R.DESCP,PROFESSOR_ID,"
804
            		+ " ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,R.CREATE_TIME,R.MODIFY_TIME,P.NAME,P.TITLE,"
805
            		+ " P.DEPARTMENT,P.ADDRESS,P.OFFICE,AUTHENTICATION,P.AUTH_TYPE,P.AUTH_STATUS,O.NAME "
806
            		+ " FROM RESOURCE R LEFT JOIN PROFESSOR P ON PROFESSOR_ID = P.ID "
807
            		+ " LEFT JOIN ORGANIZATION O ON P.ORG_ID = O.ID");
813 808
            if(_m_6.length()>0){
814 809
                sql.append(_m_6);
815 810
            }