Browse Source

专家表添加认证类型、认证状态字段,搜索专家过滤条件添加专家类型。

zzy.zhiyuan.foxmail 8 years ago
parent
commit
370396c4dc

+ 58 - 45
src/main/java/com/ekexiu/portal/dao/ProfessorDao.java

41
	
41
	
42
	@UpdateWith
42
	@UpdateWith
43
	@From(Professor.class)
43
	@From(Professor.class)
44
	public abstract int updateAuthentication(Connection con, String id, @Set boolean authentication) throws SQLException;
44
	public abstract int updateAuthentication(Connection con, String id, @Set Integer authentication, 
45
			@Set Integer authType) throws SQLException;
45
	
46
	
46
	@UpdateWith
47
	@UpdateWith
47
	@From(Professor.class)
48
	@From(Professor.class)
49
	
50
	
50
	@UpdateWith
51
	@UpdateWith
51
	@From(Professor.class)
52
	@From(Professor.class)
52
	public abstract int updateConsultCount(Connection con, String id, @Set int consultCount) throws SQLException;
53
	public abstract int updateConsultCount(Connection con, String id, @Set Integer consultCount) throws SQLException;
53

54

54
	@UpdateWith
55
	@UpdateWith
55
	@From(Professor.class)
56
	@From(Professor.class)
108
                    	title = null;
109
                    	title = null;
109
                	}
110
                	}
110
                    professor.setTitle(title);
111
                    professor.setTitle(title);
111
                    professor.setAuthentication("1".equals(rs.getString(4)));
112
                    professor.setAuthentication(rs.getInt(4));
112
                    professor.setId(rs.getString(5));
113
                    professor.setId(rs.getString(5));
113
                    professor.setName(rs.getString(6));
114
                    professor.setName(rs.getString(6));
114
                    String address = rs.getString(7);
115
                    String address = rs.getString(7);
163
                		title = null;
164
                		title = null;
164
                	}
165
                	}
165
                    professor.setTitle(title);
166
                    professor.setTitle(title);
166
                    professor.setAuthentication("1".equals(rs.getString(4)));
167
                    professor.setAuthentication(rs.getInt(4));
167
                    professor.setId(rs.getString(5));
168
                    professor.setId(rs.getString(5));
168
                    professor.setName(rs.getString(6));
169
                    professor.setName(rs.getString(6));
169
                    String address = rs.getString(7);
170
                    String address = rs.getString(7);
188
	
189
	
189
	public Professor query(Connection con, String id) throws SQLException{
190
	public Professor query(Connection con, String id) throws SQLException{
190
        int _m_1 = 1;
191
        int _m_1 = 1;
191
        String sql = "SELECT P.OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,P.DEPARTMENT,ORG_ID,P.TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,ORGANIZATION.NAME FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
192
        String sql = "SELECT P.OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,P.DEPARTMENT,ORG_ID,P.TITLE,"
193
        		+ "AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,ORGANIZATION.NAME "
194
        		+ "FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
192
        PreparedStatement ps = con.prepareStatement(sql);
195
        PreparedStatement ps = con.prepareStatement(sql);
193
        try{
196
        try{
194
            ps.setString(_m_1++,id);
197
            ps.setString(_m_1++,id);
228
                        _m_7 = null;
231
                        _m_7 = null;
229
                    }
232
                    }
230
                    _result.setTitle(_m_7);
233
                    _result.setTitle(_m_7);
231
                    _result.setAuthentication("1".equals(rs.getString(8)));
234
                    _result.setAuthentication(rs.getInt(8));
232
                    _result.setId(rs.getString(9));
235
                    _result.setId(rs.getString(9));
233
                    _result.setName(rs.getString(10));
236
                    _result.setName(rs.getString(10));
234
                    String _m_8 = rs.getString(11);
237
                    String _m_8 = rs.getString(11);
288
                    organization.setName(rs.getString(7));
291
                    organization.setName(rs.getString(7));
289
                    _obj.setOrganization(organization);
292
                    _obj.setOrganization(organization);
290
                    _obj.setTitle(rs.getString(8));
293
                    _obj.setTitle(rs.getString(8));
291
                    _obj.setAuthentication("1".equals(rs.getString(9)));
294
                    _obj.setAuthentication(rs.getInt(9));
292
                    _obj.setId(rs.getString(10));
295
                    _obj.setId(rs.getString(10));
293
                    _obj.setName(rs.getString(11));
296
                    _obj.setName(rs.getString(11));
294
                    String _m_4 = rs.getString(12);
297
                    String _m_4 = rs.getString(12);
453
	public PageQueryResult<EditProfessor> queryHot(Connection con, int pageSize, int pageNo) throws SQLException {
456
	public PageQueryResult<EditProfessor> queryHot(Connection con, int pageSize, int pageNo) throws SQLException {
454
		PageQueryResult<EditProfessor> _result = new PageQueryResult<EditProfessor>();
457
		PageQueryResult<EditProfessor> _result = new PageQueryResult<EditProfessor>();
455
		StringBuilder sql = new StringBuilder();
458
		StringBuilder sql = new StringBuilder();
456
		sql.append(" WHERE AUTHENTICATION = '1' ");
459
		sql.append(" WHERE AUTH_TYPE = 1 ");
457
		StringBuilder whereSql = sql;
460
		StringBuilder whereSql = sql;
458
		sql = new StringBuilder();
461
		sql = new StringBuilder();
459
		sql.append("SELECT COUNT(1) FROM PROFESSOR");
462
		sql.append("SELECT COUNT(1) FROM PROFESSOR");
539
                    	title = null;
542
                    	title = null;
540
                    }
543
                    }
541
                    professor.setTitle(title);
544
                    professor.setTitle(title);
542
                    professor.setAuthentication("1".equals(rs.getString(4)));
545
                    professor.setAuthentication(rs.getInt(4));
543
                    professor.setId(rs.getString(5));
546
                    professor.setId(rs.getString(5));
544
                    professor.setName(rs.getString(6));
547
                    professor.setName(rs.getString(6));
545
                    professor.setOrgId(rs.getString(7));
548
                    professor.setOrgId(rs.getString(7));
576
	 * @throws SQLException
579
	 * @throws SQLException
577
	 */
580
	 */
578
	public PageQueryResult<EditProfessor> queryAPP(Connection con, @Nullable String key, String subject, String industry, 
581
	public PageQueryResult<EditProfessor> queryAPP(Connection con, @Nullable String key, String subject, String industry, 
579
			String province, String address, @Nullable Integer authentication, int pageSize, int pageNo) throws SQLException {
582
			String province, String address, Integer authType, int pageSize, int pageNo) throws SQLException {
580
		PageQueryResult<EditProfessor> _result = new PageQueryResult<EditProfessor>();
583
		PageQueryResult<EditProfessor> _result = new PageQueryResult<EditProfessor>();
581
		StringBuilder sql = new StringBuilder();
584
		StringBuilder sql = new StringBuilder();
582
		boolean hasKey = null != key;
585
		boolean hasKey = null != key;
590
		boolean hasIndustry = null != industry;
593
		boolean hasIndustry = null != industry;
591
		boolean hasProvince = null != province;
594
		boolean hasProvince = null != province;
592
		boolean hasAddress = null != address;
595
		boolean hasAddress = null != address;
593
		boolean hasAuth = null != authentication;
596
		boolean hasAuthType = null != authType;
594
		if (hasSubject) {
597
		if (hasSubject) {
595
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
598
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
596
		}
599
		}
603
		if (hasAddress) {
606
		if (hasAddress) {
604
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
607
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
605
		}
608
		}
606
		if (hasAuth) {
607
			if(0 == authentication){
608
				sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTHENTICATION = '0')");
609
			}else if(1 == authentication){
610
				sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTHENTICATION = '1')");
611
			}
609
		if (hasAuthType) {
610
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTH_TYPE = ?)");
612
		}
611
		}
613
		StringBuilder whereSql = sql;
612
		StringBuilder whereSql = sql;
614
		sql = new StringBuilder();
613
		sql = new StringBuilder();
642
			if (hasAddress) {
641
			if (hasAddress) {
643
				ps.setString(paramIndex++, address);
642
				ps.setString(paramIndex++, address);
644
			}
643
			}
644
			if (hasAuthType) {
645
				ps.setInt(paramIndex++, authType);
646
			}
645
			_result.setPageSize(pageSize);
647
			_result.setPageSize(pageSize);
646
			ResultSet _pageRs = ps.executeQuery();
648
			ResultSet _pageRs = ps.executeQuery();
647
			try {
649
			try {
720
			if (hasAddress) {
722
			if (hasAddress) {
721
				ps.setString(paramIndex++, address);
723
				ps.setString(paramIndex++, address);
722
			}
724
			}
723
			java.sql.ResultSet rs = ps.executeQuery();
725
			if (hasAuthType) {
726
				ps.setInt(paramIndex++, authType);
727
			}
728
			ResultSet rs = ps.executeQuery();
724
			try {
729
			try {
725
				List<EditProfessor> _m_11 = new ArrayList<EditProfessor>();
730
				List<EditProfessor> _m_11 = new ArrayList<EditProfessor>();
726
				_result.setData(_m_11);
731
				_result.setData(_m_11);
741
                    	title = null;
746
                    	title = null;
742
                    }
747
                    }
743
                    professor.setTitle(title);
748
                    professor.setTitle(title);
744
                    professor.setAuthentication("1".equals(rs.getString(4)));
749
                    professor.setAuthentication(rs.getInt(4));
745
                    professor.setId(rs.getString(5));
750
                    professor.setId(rs.getString(5));
746
                    professor.setName(rs.getString(6));
751
                    professor.setName(rs.getString(6));
747
                    professor.setOrgId(rs.getString(7));
752
                    professor.setOrgId(rs.getString(7));
776
	 * @throws SQLException
781
	 * @throws SQLException
777
	 */
782
	 */
778
	public PageQueryResult<EditProfessor> queryEditBaseInfo(Connection con, @Nullable String key, String subject, 
783
	public PageQueryResult<EditProfessor> queryEditBaseInfo(Connection con, @Nullable String key, String subject, 
779
			String industry, String address,@Nullable Integer authentication, int pageSize, int pageNo) throws SQLException {
784
			String industry, String address, Integer authType, int pageSize, int pageNo) throws SQLException {
780
		PageQueryResult<EditProfessor> _result = new PageQueryResult<EditProfessor>();
785
		PageQueryResult<EditProfessor> _result = new PageQueryResult<EditProfessor>();
781
		StringBuilder sql = new StringBuilder();
786
		StringBuilder sql = new StringBuilder();
782
		boolean hasKey = null != key;
787
		boolean hasKey = null != key;
789
		boolean hasSubject = null != subject;
794
		boolean hasSubject = null != subject;
790
		boolean hasIndustry = null != industry;
795
		boolean hasIndustry = null != industry;
791
		boolean hasAddress = null != address;
796
		boolean hasAddress = null != address;
792
		boolean hasAuth = null != authentication;
797
		boolean hasAuthType = null != authType;
793
		if (hasSubject) {
798
		if (hasSubject) {
794
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
799
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
795
		}
800
		}
799
		if (hasAddress) {
804
		if (hasAddress) {
800
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
805
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
801
		}
806
		}
802
		if (hasAuth) {
803
			if(0 == authentication){
804
				sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTHENTICATION = '0')");
805
			}else if(1 == authentication){
806
				sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTHENTICATION = '1')");
807
			}
807
		if (hasAuthType) {
808
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTH_TYPE = ?)");
808
		}
809
		}
809

810

810
		StringBuilder whereSql = sql;
811
		StringBuilder whereSql = sql;
834
			if (hasAddress) {
835
			if (hasAddress) {
835
				ps.setString(paramIndex++, address);
836
				ps.setString(paramIndex++, address);
836
			}
837
			}
838
			if (hasAuthType) {
839
				ps.setInt(paramIndex++, authType);
840
			}
837
			_result.setPageSize(pageSize);
841
			_result.setPageSize(pageSize);
838
			ResultSet _pageRs = ps.executeQuery();
842
			ResultSet _pageRs = ps.executeQuery();
839
			try {
843
			try {
909
			if (hasAddress) {
913
			if (hasAddress) {
910
				ps.setString(paramIndex++, address);
914
				ps.setString(paramIndex++, address);
911
			}
915
			}
912
			java.sql.ResultSet rs = ps.executeQuery();
916
			if (hasAuthType) {
917
				ps.setInt(paramIndex++, authType);
918
			}
919
			ResultSet rs = ps.executeQuery();
913
			try {
920
			try {
914
				List<EditProfessor> _m_11 = new ArrayList<EditProfessor>();
921
				List<EditProfessor> _m_11 = new ArrayList<EditProfessor>();
915
				_result.setData(_m_11);
922
				_result.setData(_m_11);
946
						title = null;
953
						title = null;
947
					}
954
					}
948
					professor.setTitle(title);
955
					professor.setTitle(title);
949
					professor.setAuthentication("1".equals(rs.getString(8)));
956
					professor.setAuthentication(rs.getInt(8));
950
					professor.setId(rs.getString(9));
957
					professor.setId(rs.getString(9));
951
					professor.setName(rs.getString(10));
958
					professor.setName(rs.getString(10));
952
					professor.setStarLevel(rs.getBigDecimal(11));
959
					professor.setStarLevel(rs.getBigDecimal(11));
971
	public PageQueryResult<Professor> query(Connection con, @Nullable String key, String subject, String industry, String address, int pageSize, int pageNo)
978
	public PageQueryResult<Professor> query(Connection con, @Nullable String key, String subject, String industry, String address, int pageSize, int pageNo)
972
			throws SQLException {
979
			throws SQLException {
973

980

974
		org.jfw.util.PageQueryResult<com.ekexiu.portal.po.Professor> _result = new org.jfw.util.PageQueryResult<com.ekexiu.portal.po.Professor>();
981
		PageQueryResult<Professor> _result = new PageQueryResult<Professor>();
975

982

976
		StringBuilder sql = new StringBuilder();
983
		StringBuilder sql = new StringBuilder();
977
		boolean hasKey = null != key;
984
		boolean hasKey = null != key;
978
		if (hasKey) {
985
		if (hasKey) {
979
			sql.append(
980
					" WHERE (( professor.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) OR (ORG_ID IN(SELECT organization.ID FROM ORGANIZATION WHERE organization.NAME LIKE ?)) OR ( professor.NAME LIKE ?) OR (professor.SUBJECT LIKE ?) OR (professor.INDUSTRY LIKE ?) OR (professor.ADDRESS LIKE ?))");
986
			sql.append(" WHERE (( professor.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
987
					+ " OR (ORG_ID IN(SELECT organization.ID FROM ORGANIZATION WHERE organization.NAME LIKE ?)) "
988
					+ " OR ( professor.NAME LIKE ?) OR (professor.SUBJECT LIKE ?) "
989
					+ " OR (professor.INDUSTRY LIKE ?) OR (professor.ADDRESS LIKE ?))");
981
		}
990
		}
982
		boolean hasSubject = null != subject;
991
		boolean hasSubject = null != subject;
983
		boolean hasIndustry = null != industry;
992
		boolean hasIndustry = null != industry;
998
		if (whereSql.length() > 0) {
1007
		if (whereSql.length() > 0) {
999
			sql.append(whereSql);
1008
			sql.append(whereSql);
1000
		}
1009
		}
1001
		java.sql.PreparedStatement ps = con.prepareStatement(sql.toString());
1010
		PreparedStatement ps = con.prepareStatement(sql.toString());
1002
		int paramIndex = 1;
1011
		int paramIndex = 1;
1003
		int totalSize = 0;
1012
		int totalSize = 0;
1004
		try {
1013
		try {
1020
				ps.setString(paramIndex++, address);
1029
				ps.setString(paramIndex++, address);
1021
			}
1030
			}
1022
			_result.setPageSize(pageSize);
1031
			_result.setPageSize(pageSize);
1023
			java.sql.ResultSet _pageRs = ps.executeQuery();
1032
			ResultSet _pageRs = ps.executeQuery();
1024
			try {
1033
			try {
1025
				_pageRs.next();
1034
				_pageRs.next();
1026
				totalSize = _pageRs.getInt(1);
1035
				totalSize = _pageRs.getInt(1);
1039
		_result.setTotal(totalSize);
1048
		_result.setTotal(totalSize);
1040
		if (0 == totalSize) {
1049
		if (0 == totalSize) {
1041
			_result.setPageNo(1);
1050
			_result.setPageNo(1);
1042
			_result.setData(java.util.Collections.<com.ekexiu.portal.po.Professor> emptyList());
1051
			_result.setData(Collections.<Professor> emptyList());
1043
			return _result;
1052
			return _result;
1044
		}
1053
		}
1045
		paramIndex = 1;
1054
		paramIndex = 1;
1046
		if (1 == pageNo) {
1055
		if (1 == pageNo) {
1047
			_result.setPageNo(1);
1056
			_result.setPageNo(1);
1048
			sql = new StringBuilder();
1057
			sql = new StringBuilder();
1049
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,TITLE,AUTHENTICATION,professor.ID,professor.NAME AS PNAME,professor.DESCP,professor.CREATE_TIME,professor.MODIFY_TIME FROM PROFESSOR LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ");
1058
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,TITLE,"
1059
					+ " AUTHENTICATION,professor.ID,professor.NAME AS PNAME,professor.DESCP,professor.CREATE_TIME,"
1060
					+ " professor.MODIFY_TIME FROM PROFESSOR LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ");
1050
			if (whereSql.length() > 0) {
1061
			if (whereSql.length() > 0) {
1051
				sql.append(whereSql);
1062
				sql.append(whereSql);
1052
			}
1063
			}
1064
			--pageNo;
1075
			--pageNo;
1065
			int _m_10 = (pageNo * pageSize);
1076
			int _m_10 = (pageNo * pageSize);
1066
			sql = new StringBuilder();
1077
			sql = new StringBuilder();
1067
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,TITLE,AUTHENTICATION,professor.ID,professor.NAME AS PNAME,professor.DESCP,professor.CREATE_TIME,professor.MODIFY_TIME FROM PROFESSOR LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ");
1078
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,TITLE,"
1079
					+ " AUTHENTICATION,professor.ID,professor.NAME AS PNAME,professor.DESCP,professor.CREATE_TIME,"
1080
					+ " professor.MODIFY_TIME FROM PROFESSOR LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ");
1068
			if (whereSql.length() > 0) {
1081
			if (whereSql.length() > 0) {
1069
				sql.append(whereSql);
1082
				sql.append(whereSql);
1070
			}
1083
			}
1090
			if (hasAddress) {
1103
			if (hasAddress) {
1091
				ps.setString(paramIndex++, address);
1104
				ps.setString(paramIndex++, address);
1092
			}
1105
			}
1093
			java.sql.ResultSet rs = ps.executeQuery();
1106
			ResultSet rs = ps.executeQuery();
1094
			try {
1107
			try {
1095
				java.util.List<com.ekexiu.portal.po.Professor> _m_11 = new java.util.ArrayList<com.ekexiu.portal.po.Professor>();
1108
				List<Professor> _m_11 = new ArrayList<Professor>();
1096
				_result.setData(_m_11);
1109
				_result.setData(_m_11);
1097
				while (rs.next()) {
1110
				while (rs.next()) {
1098
					com.ekexiu.portal.po.Professor _obj = new com.ekexiu.portal.po.Professor();
1099
					java.lang.String _m_13 = rs.getString(1);
1111
					Professor _obj = new Professor();
1112
					String _m_13 = rs.getString(1);
1100
					if (rs.wasNull()) {
1113
					if (rs.wasNull()) {
1101
						_m_13 = null;
1114
						_m_13 = null;
1102
					}
1115
					}
1103
					_obj.setOffice(_m_13);
1116
					_obj.setOffice(_m_13);
1104
					java.lang.String _m_14 = rs.getString(2);
1117
					String _m_14 = rs.getString(2);
1105
					if (rs.wasNull()) {
1118
					if (rs.wasNull()) {
1106
						_m_14 = null;
1119
						_m_14 = null;
1107
					}
1120
					}
1108
					_obj.setSubject(_m_14);
1121
					_obj.setSubject(_m_14);
1109
					java.lang.String _m_15 = rs.getString(3);
1122
					String _m_15 = rs.getString(3);
1110
					if (rs.wasNull()) {
1123
					if (rs.wasNull()) {
1111
						_m_15 = null;
1124
						_m_15 = null;
1112
					}
1125
					}
1130
						title = null;
1143
						title = null;
1131
					}
1144
					}
1132
					_obj.setTitle(title);
1145
					_obj.setTitle(title);
1133
					_obj.setAuthentication("1".equals(rs.getString(9)));
1146
					_obj.setAuthentication(rs.getInt(9));
1134
					_obj.setId(rs.getString(10));
1147
					_obj.setId(rs.getString(10));
1135
					_obj.setName(rs.getString(11));
1148
					_obj.setName(rs.getString(11));
1136
					java.lang.String _m_16 = rs.getString(12);
1149
					String _m_16 = rs.getString(12);
1137
					if (rs.wasNull()) {
1150
					if (rs.wasNull()) {
1138
						_m_16 = null;
1151
						_m_16 = null;
1139
					}
1152
					}

+ 33 - 14
src/main/java/com/ekexiu/portal/po/Professor.java

20
20
21
	private String id;
21
	private String id;
22
	private String name;
22
	private String name;
23
	private boolean authentication;
24
	
25
	private String office;
23
	private String office;
26
	/**
24
	/**
27
	 *职称 
25
	 *职称 
45
	private BigDecimal starLevel;
43
	private BigDecimal starLevel;
46
	private Integer consultCount;
44
	private Integer consultCount;
47
	private BigDecimal starAvg;
45
	private BigDecimal starAvg;
46
	private Integer authentication;
47
	private Integer authType;
48
	private Integer authStatus;
49
	
48
	private Organization organization;
50
	private Organization organization;
49
	private List<Resource> resources;
51
	private List<Resource> resources;
50
	
52
	
154
	public void setTitle(String title) {
156
	public void setTitle(String title) {
155
		this.title = title;
157
		this.title = title;
156
	}
158
	}
157
	/**
158
	 * 是否认证
159
	 * @return
160
	 */
161
	@Column(value=DE.boolean_de)
162
	public boolean isAuthentication() {
163
		return authentication;
164
	}
165
166
	public void setAuthentication(boolean authentication) {
167
		this.authentication = authentication;
168
	}
169
159
170
	@Column(DE.id_32)
160
	@Column(DE.id_32)
171
	public String getId() {
161
	public String getId() {
236
		this.starAvg = starAvg;
226
		this.starAvg = starAvg;
237
	}
227
	}
238
228
229
	@Column(handlerClass=WIntHandler.class,dbType="INT",insertable=false,nullable=false,renewable=false,queryable=true)
230
	public Integer getAuthentication() {
231
		return authentication;
232
	}
233
234
	public void setAuthentication(Integer authentication) {
235
		this.authentication = authentication;
236
	}
237
238
	@Column(handlerClass=WIntHandler.class,dbType="INT",insertable=false,nullable=false,renewable=false,queryable=true)
239
	public Integer getAuthType() {
240
		return authType;
241
	}
242
243
	public void setAuthType(Integer authType) {
244
		this.authType = authType;
245
	}
246
247
	@Column(handlerClass=WIntHandler.class,dbType="INT",insertable=false,nullable=false,renewable=false,queryable=true)
248
	public Integer getAuthStatus() {
249
		return authStatus;
250
	}
251
252
	public void setAuthStatus(Integer authStatus) {
253
		this.authStatus = authStatus;
254
	}
255
	
256
	
257
239
}
258
}

+ 7 - 7
src/main/java/com/ekexiu/portal/service/ProfessorService.java

203
		if(professor.getId() == null ) {
203
		if(professor.getId() == null ) {
204
			professor.setId(StringUtil.buildUUID());
204
			professor.setId(StringUtil.buildUUID());
205
		}
205
		}
206
		professor.setAuthentication(false);
207
		if (professor.getOrgId() == null) {
206
		if (professor.getOrgId() == null) {
208
			if(null != this.orgDao.queryByName(con, orgName)){
207
			if(null != this.orgDao.queryByName(con, orgName)){
209
				professor.setOrgId(this.orgDao.queryByName(con, orgName));
208
				professor.setOrgId(this.orgDao.queryByName(con, orgName));
297
	@Path("/pqAPP")
296
	@Path("/pqAPP")
298
	public PageQueryResult<EditProfessor> queryAPP(@JdbcConn Connection con, @Nullable String key,
297
	public PageQueryResult<EditProfessor> queryAPP(@JdbcConn Connection con, @Nullable String key,
299
			@Nullable String subject,@Nullable String industry,@Nullable String province,
298
			@Nullable String subject,@Nullable String industry,@Nullable String province,
300
			@Nullable String address, @Nullable Integer authentication, 
299
			@Nullable String address, @DefaultValue("1") Integer authType, 
301
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo) throws SQLException{
300
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo) throws SQLException{
302
		if(key!=null) {key="%"+key+"%";}
301
		if(key!=null) {key="%"+key+"%";}
303
		if(subject!=null) {subject ="%"+subject+"%";}
302
		if(subject!=null) {subject ="%"+subject+"%";}
304
		if(null!=industry) {industry="%"+industry+"%";}
303
		if(null!=industry) {industry="%"+industry+"%";}
305
		if(null!=province) {province="%"+province+"%";}
304
		if(null!=province) {province="%"+province+"%";}
306
		if(null!=address) {address="%"+address+"%";}
305
		if(null!=address) {address="%"+address+"%";}
307
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryAPP(con,key,subject,industry,province,address,authentication,pageSize,pageNo);
306
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryAPP(con,key,subject,industry,province,address,authType,pageSize,pageNo);
308
		List<EditProfessor> editProfessors = queryResult.getData();
307
		List<EditProfessor> editProfessors = queryResult.getData();
309
		if(editProfessors != null) {
308
		if(editProfessors != null) {
310
			for (EditProfessor editProfessor : editProfessors) {
309
			for (EditProfessor editProfessor : editProfessors) {
319
	
318
	
320
	@Post
319
	@Post
321
	@Path("/authentication")
320
	@Path("/authentication")
322
	public void updateAuthentication(@JdbcConn(true) Connection con, String id, boolean authentication) throws SQLException{
323
		this.professorDao.updateAuthentication(con, id, authentication);
321
	public void updateAuthentication(@JdbcConn(true) Connection con, String id, Integer authentication, 
322
			Integer authType) throws SQLException{
323
		this.professorDao.updateAuthentication(con, id, authentication, authType);
324
	}
324
	}
325
	
325
	
326
	@Post
326
	@Post
372
	@Get
372
	@Get
373
	@Path("/pqBaseInfo")
373
	@Path("/pqBaseInfo")
374
	PageQueryResult<EditProfessor> queryEditBaseInfo(@JdbcConn(false) Connection con,@Nullable String key,
374
	PageQueryResult<EditProfessor> queryEditBaseInfo(@JdbcConn(false) Connection con,@Nullable String key,
375
			@Nullable String subject,@Nullable String industry,@Nullable String address,@Nullable Integer authentication, 
375
			@Nullable String subject,@Nullable String industry,@Nullable String address,@DefaultValue("1") Integer authType, 
376
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
376
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
377
		if(key!=null) {key="%"+key+"%";}
377
		if(key!=null) {key="%"+key+"%";}
378
		if(subject!=null) {subject ="%"+subject+"%";}
378
		if(subject!=null) {subject ="%"+subject+"%";}
379
		if(null!=industry) {industry="%"+industry+"%";}
379
		if(null!=industry) {industry="%"+industry+"%";}
380
		if(null!=address) {address="%"+address+"%";}
380
		if(null!=address) {address="%"+address+"%";}
381
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryEditBaseInfo(con, key, subject, industry, address, authentication, pageSize, pageNo);
381
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryEditBaseInfo(con, key, subject, industry, address, authType, pageSize, pageNo);
382
		List<EditProfessor> editProfessors = queryResult.getData();
382
		List<EditProfessor> editProfessors = queryResult.getData();
383
		if(editProfessors != null){
383
		if(editProfessors != null){
384
			for (EditProfessor editProfessor : editProfessors) {
384
			for (EditProfessor editProfessor : editProfessors) {