Преглед на файлове

解决专家信息录入不能新增的问题;解决专家搜索页面搜索出重复专家的问题。

zzy.zhiyuan.foxmail преди 8 години
родител
ревизия
5ab70248f7
променени са 3 файла, в които са добавени 26 реда и са изтрити 10 реда
  1. 9 9
      src/main/java/com/ekexiu/portal/dao/ProfessorDao.java
  2. 1 1
      src/main/java/com/ekexiu/portal/po/Professor.java
  3. 16 0
      src/main/webapp/page/professor.html

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

@ -312,7 +312,7 @@ public abstract class ProfessorDao {
312 312
        String sql = "SELECT OFFICE,SUBJECT,INDUSTRY,PROVINCE,ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,"
313 313
        		+ " TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,professor.ID,professor.NAME AS PNAME,professor.DESCP,"
314 314
        		+ " professor.CREATE_TIME,professor.MODIFY_TIME FROM PROFESSOR "
315
        		+ " LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ORDER BY ONAME";
315
        		+ " LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ORDER BY ONAME,professor.ID";
316 316
        PreparedStatement ps = con.prepareStatement(sql);
317 317
        try{
318 318
            ResultSet rs = ps.executeQuery();
@ -559,7 +559,7 @@ public abstract class ProfessorDao {
559 559
			if (whereSql.length() > 0) {
560 560
				sql.append(whereSql);
561 561
			}
562
			sql.append(" ORDER BY STAR_LEVEL DESC ");
562
			sql.append(" ORDER BY STAR_LEVEL DESC,PROFESSOR.ID ");
563 563
			sql.append(" LIMIT ").append(pageSize);
564 564
		} else {
565 565
			int _pageSize = totalSize / pageSize;
@ -578,7 +578,7 @@ public abstract class ProfessorDao {
578 578
			if (whereSql.length() > 0) {
579 579
				sql.append(whereSql);
580 580
			}
581
			sql.append(" ORDER BY STAR_LEVEL DESC ");
581
			sql.append(" ORDER BY STAR_LEVEL DESC,PROFESSOR.ID ");
582 582
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
583 583
		}
584 584
		ps = con.prepareStatement(sql.toString());
@ -740,7 +740,7 @@ public abstract class ProfessorDao {
740 740
			if (whereSql.length() > 0) {
741 741
				sql.append(whereSql);
742 742
			}
743
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC ");
743
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,PROFESSOR.ID ");
744 744
			sql.append(" LIMIT ").append(pageSize);
745 745
		} else {
746 746
			int _pageSize = totalSize / pageSize;
@ -759,7 +759,7 @@ public abstract class ProfessorDao {
759 759
			if (whereSql.length() > 0) {
760 760
				sql.append(whereSql);
761 761
			}
762
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC ");
762
			sql.append(" ORDER BY SORT_FIRST DESC,STAR_LEVEL DESC,PROFESSOR.ID ");
763 763
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
764 764
		}
765 765
		ps = con.prepareStatement(sql.toString());
@ -937,7 +937,7 @@ public abstract class ProfessorDao {
937 937
			if (whereSql.length() > 0) {
938 938
				sql.append(whereSql);
939 939
			}
940
			sql.append(" ORDER BY ONAME ");
940
			sql.append(" ORDER BY ONAME,PROFESSOR.ID ");
941 941
			sql.append(" LIMIT ").append(pageSize);
942 942
		} else {
943 943
			int _pageSize = totalSize / pageSize;
@ -957,7 +957,7 @@ public abstract class ProfessorDao {
957 957
			if (whereSql.length() > 0) {
958 958
				sql.append(whereSql);
959 959
			}
960
			sql.append(" ORDER BY ONAME ");
960
			sql.append(" ORDER BY ONAME,PROFESSOR.ID ");
961 961
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
962 962
		}
963 963
		ps = con.prepareStatement(sql.toString());
@ -1129,7 +1129,7 @@ public abstract class ProfessorDao {
1129 1129
			if (whereSql.length() > 0) {
1130 1130
				sql.append(whereSql);
1131 1131
			}
1132
			sql.append(" ORDER BY ONAME ");
1132
			sql.append(" ORDER BY ONAME,PROFESSOR.ID ");
1133 1133
			sql.append(" LIMIT ").append(pageSize);
1134 1134
		} else {
1135 1135
			int _pageSize = totalSize / pageSize;
@ -1149,7 +1149,7 @@ public abstract class ProfessorDao {
1149 1149
			if (whereSql.length() > 0) {
1150 1150
				sql.append(whereSql);
1151 1151
			}
1152
			sql.append(" ORDER BY ONAME ");
1152
			sql.append(" ORDER BY ONAME,PROFESSOR.ID ");
1153 1153
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
1154 1154
		}
1155 1155
		ps = con.prepareStatement(sql.toString());

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

@ -229,7 +229,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
229 229
		this.starAvg = starAvg;
230 230
	}
231 231
232
	@Column(handlerClass=WIntHandler.class,dbType="INT",insertable=true,nullable=false,renewable=false,queryable=true)
232
	@Column(handlerClass=WIntHandler.class,dbType="INT",insertable=true,nullable=true,renewable=false,queryable=true)
233 233
	public Integer getAuthentication() {
234 234
		return authentication;
235 235
	}

+ 16 - 0
src/main/webapp/page/professor.html

@ -118,6 +118,18 @@
118 118
							<input type="text" class="form-control" id="address" placeholder="所在城市">
119 119
						</div>
120 120
					</div>
121
					<div class="form-group">
122
						<label for="phone" class="col-sm-2 control-label">联系电话</label>
123
						<div class="col-sm-10">
124
							<input type="text" class="form-control" id="phone" placeholder="联系电话">
125
						</div>
126
					</div>
127
					<div class="form-group">
128
						<label for="email" class="col-sm-2 control-label">联系邮箱</label>
129
						<div class="col-sm-10">
130
							<input type="text" class="form-control" id="email" placeholder="联系邮箱">
131
						</div>
132
					</div>
121 133
					<div class="col-sm-2"></div>
122 134
					<div class="col-sm-10">
123 135
						<button id="saveProfessor" type="button" class="btn btn-default">保存</button>
@ -728,6 +740,8 @@
728 740
							$("#industry").val($info.industry);
729 741
							$("#province").val($info.province);
730 742
							$("#address").val($info.address);
743
							$("#phone").val($info.phone);
744
							$("#email").val($info.email);
731 745
							$("#sortFirst").val($info.sortFirst);
732 746
							$("#authType").val($info.authType);
733 747
							$("#authentication").val($info.authentication);
@ -1339,6 +1353,8 @@
1339 1353
				$data.office = $("#office").val();
1340 1354
				$data.province = $("#province").val();
1341 1355
				$data.address = $("#address").val();
1356
				$data.phone = $("#phone").val();
1357
				$data.email = $("#email").val();
1342 1358
				if (professorId) {
1343 1359
					$data.id = professorId;
1344 1360
				}