|
@ -116,7 +116,7 @@ public abstract class ProfessorDao {
|
116
|
116
|
|
117
|
117
|
public List<EditProfessor> queryInvite(Connection con, String id) throws SQLException{
|
118
|
118
|
int index = 1;
|
119
|
|
String sql = "SELECT OFFICE,ADDRESS,ORG_ID,O.NAME,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,P.ID,P.NAME "
|
|
119
|
String sql = "SELECT OFFICE,ADDRESS,ORG_ID,O.NAME,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,P.ID,P.NAME,ORG_AUTH "
|
120
|
120
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID "
|
121
|
121
|
+ " INNER JOIN LUSER L ON P.ID=L.ID WHERE L.INVITER_ID = ? ORDER BY P.CREATE_TIME DESC,P.ID";
|
122
|
122
|
PreparedStatement ps = con.prepareStatement(sql);
|
|
@ -155,6 +155,7 @@ public abstract class ProfessorDao {
|
155
|
155
|
professor.setAuthStatus(rs.getInt(8));
|
156
|
156
|
professor.setId(rs.getString(9));
|
157
|
157
|
professor.setName(rs.getString(10));
|
|
158
|
professor.setOrgAuth(rs.getString(11));
|
158
|
159
|
professors.add(professor);
|
159
|
160
|
}
|
160
|
161
|
return professors;
|
|
@ -175,7 +176,7 @@ public abstract class ProfessorDao {
|
175
|
176
|
*/
|
176
|
177
|
public Professor queryAuth(Connection con, String id) throws SQLException{
|
177
|
178
|
int index = 1;
|
178
|
|
String sql = " SELECT AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,AUTH_STATUS_EXPERT FROM PROFESSOR WHERE ID = ? ";
|
|
179
|
String sql = " SELECT AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,AUTH_STATUS_EXPERT,ORG_AUTH FROM PROFESSOR WHERE ID = ? ";
|
179
|
180
|
PreparedStatement ps = con.prepareStatement(sql);
|
180
|
181
|
try{
|
181
|
182
|
ps.setString(index++,id);
|
|
@ -187,6 +188,7 @@ public abstract class ProfessorDao {
|
187
|
188
|
professor.setAuthType(rs.getInt(2));
|
188
|
189
|
professor.setAuthStatus(rs.getInt(3));
|
189
|
190
|
professor.setAuthStatusExpert(rs.getInt(4));
|
|
191
|
professor.setOrgAuth(rs.getString(5));
|
190
|
192
|
return professor;
|
191
|
193
|
}else{
|
192
|
194
|
return null;
|
|
@ -208,7 +210,7 @@ public abstract class ProfessorDao {
|
208
|
210
|
*/
|
209
|
211
|
public EditProfessor queryBaseInfo(Connection con, String id) throws SQLException {
|
210
|
212
|
int index = 1;
|
211
|
|
String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.ADDRESS,ORGANIZATION.NAME "
|
|
213
|
String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.ADDRESS,P.ORG_AUTH,ORGANIZATION.NAME "
|
212
|
214
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
|
213
|
215
|
PreparedStatement ps = con.prepareStatement(sql);
|
214
|
216
|
try{
|
|
@ -242,7 +244,8 @@ public abstract class ProfessorDao {
|
242
|
244
|
address = null;
|
243
|
245
|
}
|
244
|
246
|
professor.setAddress(address);
|
245
|
|
String orgName = rs.getString(10);
|
|
247
|
professor.setOrgAuth(rs.getString(10));
|
|
248
|
String orgName = rs.getString(11);
|
246
|
249
|
if(rs.wasNull()){
|
247
|
250
|
orgName = null;
|
248
|
251
|
}
|
|
@ -269,7 +272,7 @@ public abstract class ProfessorDao {
|
269
|
272
|
public EditProfessor queryEditBaseInfo(Connection con, String id) throws SQLException {
|
270
|
273
|
int index = 1;
|
271
|
274
|
String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,"
|
272
|
|
+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,ORGANIZATION.NAME "
|
|
275
|
+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME "
|
273
|
276
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
|
274
|
277
|
PreparedStatement ps = con.prepareStatement(sql);
|
275
|
278
|
try{
|
|
@ -305,7 +308,8 @@ public abstract class ProfessorDao {
|
305
|
308
|
professor.setAddress(address);
|
306
|
309
|
professor.setStarLevel(rs.getBigDecimal(10));
|
307
|
310
|
professor.setConsultCount(rs.getInt(11));
|
308
|
|
String orgName = rs.getString(12);
|
|
311
|
professor.setOrgAuth(rs.getString(12));
|
|
312
|
String orgName = rs.getString(13);
|
309
|
313
|
if(rs.wasNull()){
|
310
|
314
|
orgName = null;
|
311
|
315
|
}
|
|
@ -328,8 +332,8 @@ public abstract class ProfessorDao {
|
328
|
332
|
|
329
|
333
|
public Professor query(Connection con, String id) throws SQLException{
|
330
|
334
|
int index = 1;
|
331
|
|
String sql = "SELECT P.OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,P.DEPARTMENT,ORG_ID,P.TITLE,AUTHENTICATION,"
|
332
|
|
+ "AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.PHONE,P.EMAIL,ORGANIZATION.NAME "
|
|
335
|
String sql = "SELECT P.OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,P.DEPARTMENT,ORG_ID,P.TITLE,AUTHENTICATION,AUTH_TYPE,"
|
|
336
|
+ "P.AUTH_STATUS,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.PHONE,P.EMAIL,P.ORG_AUTH,ORGANIZATION.NAME "
|
333
|
337
|
+ "FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
|
334
|
338
|
PreparedStatement ps = con.prepareStatement(sql);
|
335
|
339
|
try{
|
|
@ -396,7 +400,8 @@ public abstract class ProfessorDao {
|
396
|
400
|
email = null;
|
397
|
401
|
}
|
398
|
402
|
professor.setEmail(email);
|
399
|
|
String orgName = rs.getString(18);
|
|
403
|
professor.setOrgAuth(rs.getString(18));
|
|
404
|
String orgName = rs.getString(19);
|
400
|
405
|
if(rs.wasNull()){
|
401
|
406
|
orgName = null;
|
402
|
407
|
}
|
|
@ -416,8 +421,8 @@ public abstract class ProfessorDao {
|
416
|
421
|
|
417
|
422
|
public List<Professor> query(Connection con) throws SQLException{
|
418
|
423
|
String sql = "SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.PROVINCE,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,"
|
419
|
|
+ " TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME AS PNAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME FROM "
|
420
|
|
+ " PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ORDER BY ONAME,P.ID";
|
|
424
|
+ " TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME AS PNAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH "
|
|
425
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ORDER BY ONAME,P.ID";
|
421
|
426
|
PreparedStatement ps = con.prepareStatement(sql);
|
422
|
427
|
try{
|
423
|
428
|
ResultSet rs = ps.executeQuery();
|
|
@ -476,6 +481,7 @@ public abstract class ProfessorDao {
|
476
|
481
|
professor.setDescp(descp);
|
477
|
482
|
professor.setCreateTime(rs.getString(16));
|
478
|
483
|
professor.setModifyTime(rs.getString(17));
|
|
484
|
professor.setOrgAuth(rs.getString(18));
|
479
|
485
|
professors.add(professor);
|
480
|
486
|
}
|
481
|
487
|
return professors;
|
|
@ -680,7 +686,7 @@ public abstract class ProfessorDao {
|
680
|
686
|
if (1 == pageNo) {
|
681
|
687
|
queryResult.setPageNo(1);
|
682
|
688
|
sql = new StringBuilder();
|
683
|
|
sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,ORGANIZATION.NAME"
|
|
689
|
sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
|
684
|
690
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
|
685
|
691
|
if (whereSql.length() > 0) {
|
686
|
692
|
sql.append(whereSql);
|
|
@ -699,7 +705,7 @@ public abstract class ProfessorDao {
|
699
|
705
|
--pageNo;
|
700
|
706
|
int offset = (pageNo * pageSize);
|
701
|
707
|
sql = new StringBuilder();
|
702
|
|
sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,ORGANIZATION.NAME"
|
|
708
|
sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
|
703
|
709
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
|
704
|
710
|
if (whereSql.length() > 0) {
|
705
|
711
|
sql.append(whereSql);
|
|
@ -736,7 +742,8 @@ public abstract class ProfessorDao {
|
736
|
742
|
professor.setId(rs.getString(7));
|
737
|
743
|
professor.setName(rs.getString(8));
|
738
|
744
|
professor.setOrgId(rs.getString(9));
|
739
|
|
String orgName = rs.getString(10);
|
|
745
|
professor.setOrgAuth(rs.getString(10));
|
|
746
|
String orgName = rs.getString(11);
|
740
|
747
|
if(rs.wasNull()){
|
741
|
748
|
orgName = null;
|
742
|
749
|
}
|
|
@ -865,7 +872,7 @@ public abstract class ProfessorDao {
|
865
|
872
|
if (1 == pageNo) {
|
866
|
873
|
queryResult.setPageNo(1);
|
867
|
874
|
sql = new StringBuilder();
|
868
|
|
sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,ORGANIZATION.NAME"
|
|
875
|
sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
|
869
|
876
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
|
870
|
877
|
if (whereSql.length() > 0) {
|
871
|
878
|
sql.append(whereSql);
|
|
@ -884,7 +891,7 @@ public abstract class ProfessorDao {
|
884
|
891
|
--pageNo;
|
885
|
892
|
int offset = (pageNo * pageSize);
|
886
|
893
|
sql = new StringBuilder();
|
887
|
|
sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,ORGANIZATION.NAME"
|
|
894
|
sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
|
888
|
895
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
|
889
|
896
|
if (whereSql.length() > 0) {
|
890
|
897
|
sql.append(whereSql);
|
|
@ -946,7 +953,8 @@ public abstract class ProfessorDao {
|
946
|
953
|
professor.setId(rs.getString(7));
|
947
|
954
|
professor.setName(rs.getString(8));
|
948
|
955
|
professor.setOrgId(rs.getString(9));
|
949
|
|
String orgName = rs.getString(10);
|
|
956
|
professor.setOrgAuth(rs.getString(10));
|
|
957
|
String orgName = rs.getString(11);
|
950
|
958
|
if(rs.wasNull()){
|
951
|
959
|
orgName = null;
|
952
|
960
|
}
|
|
@ -1067,7 +1075,7 @@ public abstract class ProfessorDao {
|
1067
|
1075
|
queryResult.setPageNo(1);
|
1068
|
1076
|
sql = new StringBuilder();
|
1069
|
1077
|
sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,organization.NAME,TITLE,"
|
1070
|
|
+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT "
|
|
1078
|
+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH "
|
1071
|
1079
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=organization.ID ");
|
1072
|
1080
|
if (whereSql.length() > 0) {
|
1073
|
1081
|
sql.append(whereSql);
|
|
@ -1087,7 +1095,7 @@ public abstract class ProfessorDao {
|
1087
|
1095
|
int offset = (pageNo * pageSize);
|
1088
|
1096
|
sql = new StringBuilder();
|
1089
|
1097
|
sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,organization.NAME,TITLE,"
|
1090
|
|
+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT "
|
|
1098
|
+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH "
|
1091
|
1099
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=organization.ID ");
|
1092
|
1100
|
if (whereSql.length() > 0) {
|
1093
|
1101
|
sql.append(whereSql);
|
|
@ -1166,6 +1174,7 @@ public abstract class ProfessorDao {
|
1166
|
1174
|
professor.setName(rs.getString(12));
|
1167
|
1175
|
professor.setStarLevel(rs.getBigDecimal(13));
|
1168
|
1176
|
professor.setConsultCount(rs.getInt(14));
|
|
1177
|
professor.setOrgAuth(rs.getString(15));
|
1169
|
1178
|
professors.add(professor);
|
1170
|
1179
|
}
|
1171
|
1180
|
return queryResult;
|
|
@ -1263,7 +1272,7 @@ public abstract class ProfessorDao {
|
1263
|
1272
|
queryResult.setPageNo(1);
|
1264
|
1273
|
sql = new StringBuilder();
|
1265
|
1274
|
sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME,"
|
1266
|
|
+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME "
|
|
1275
|
+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH "
|
1267
|
1276
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ");
|
1268
|
1277
|
if (whereSql.length() > 0) {
|
1269
|
1278
|
sql.append(whereSql);
|
|
@ -1283,7 +1292,7 @@ public abstract class ProfessorDao {
|
1283
|
1292
|
int offset = (pageNo * pageSize);
|
1284
|
1293
|
sql = new StringBuilder();
|
1285
|
1294
|
sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME,"
|
1286
|
|
+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME "
|
|
1295
|
+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH "
|
1287
|
1296
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ");
|
1288
|
1297
|
if (whereSql.length() > 0) {
|
1289
|
1298
|
sql.append(whereSql);
|
|
@ -1368,6 +1377,7 @@ public abstract class ProfessorDao {
|
1368
|
1377
|
professor.setDescp(descp);
|
1369
|
1378
|
professor.setCreateTime(rs.getString(13));
|
1370
|
1379
|
professor.setModifyTime(rs.getString(14));
|
|
1380
|
professor.setOrgAuth(rs.getString(15));
|
1371
|
1381
|
professors.add(professor);
|
1372
|
1382
|
}
|
1373
|
1383
|
return queryResult;
|
|
@ -1472,7 +1482,7 @@ public abstract class ProfessorDao {
|
1472
|
1482
|
queryResult.setPageNo(1);
|
1473
|
1483
|
sql = new StringBuilder();
|
1474
|
1484
|
sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,O.NAME,TITLE,AUTHENTICATION,"
|
1475
|
|
+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME "
|
|
1485
|
+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME,P.ORG_AUTH "
|
1476
|
1486
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID LEFT JOIN LUSER L ON P.ID=L.ID");
|
1477
|
1487
|
if (whereSql.length() > 0) {
|
1478
|
1488
|
sql.append(whereSql);
|
|
@ -1492,7 +1502,7 @@ public abstract class ProfessorDao {
|
1492
|
1502
|
int offset = (pageNo * pageSize);
|
1493
|
1503
|
sql = new StringBuilder();
|
1494
|
1504
|
sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,O.NAME,TITLE,AUTHENTICATION,"
|
1495
|
|
+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME "
|
|
1505
|
+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME,P.ORG_AUTH "
|
1496
|
1506
|
+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID LEFT JOIN LUSER L ON P.ID=L.ID");
|
1497
|
1507
|
if (whereSql.length() > 0) {
|
1498
|
1508
|
sql.append(whereSql);
|
|
@ -1571,6 +1581,7 @@ public abstract class ProfessorDao {
|
1571
|
1581
|
userInfo.setPhone(rs.getString(14));
|
1572
|
1582
|
userInfo.setActiveTime(rs.getString(15));
|
1573
|
1583
|
userInfo.setActiveState(!(rs.getString(15)==null));
|
|
1584
|
userInfo.setOrgAuth(rs.getString(16));
|
1574
|
1585
|
userInfos.add(userInfo);
|
1575
|
1586
|
}
|
1576
|
1587
|
return queryResult;
|