Explorar el Código

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

zzy.zhiyuan.foxmail %!s(int64=8) %!d(string=hace) años
padre
commit
5ab70248f7

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

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

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

229
		this.starAvg = starAvg;
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
	public Integer getAuthentication() {
233
	public Integer getAuthentication() {
234
		return authentication;
234
		return authentication;
235
	}
235
	}

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

118
							<input type="text" class="form-control" id="address" placeholder="所在城市">
118
							<input type="text" class="form-control" id="address" placeholder="所在城市">
119
						</div>
119
						</div>
120
					</div>
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
					<div class="col-sm-2"></div>
133
					<div class="col-sm-2"></div>
122
					<div class="col-sm-10">
134
					<div class="col-sm-10">
123
						<button id="saveProfessor" type="button" class="btn btn-default">保存</button>
135
						<button id="saveProfessor" type="button" class="btn btn-default">保存</button>
728
							$("#industry").val($info.industry);
740
							$("#industry").val($info.industry);
729
							$("#province").val($info.province);
741
							$("#province").val($info.province);
730
							$("#address").val($info.address);
742
							$("#address").val($info.address);
743
							$("#phone").val($info.phone);
744
							$("#email").val($info.email);
731
							$("#sortFirst").val($info.sortFirst);
745
							$("#sortFirst").val($info.sortFirst);
732
							$("#authType").val($info.authType);
746
							$("#authType").val($info.authType);
733
							$("#authentication").val($info.authentication);
747
							$("#authentication").val($info.authentication);
1339
				$data.office = $("#office").val();
1353
				$data.office = $("#office").val();
1340
				$data.province = $("#province").val();
1354
				$data.province = $("#province").val();
1341
				$data.address = $("#address").val();
1355
				$data.address = $("#address").val();
1356
				$data.phone = $("#phone").val();
1357
				$data.email = $("#email").val();
1342
				if (professorId) {
1358
				if (professorId) {
1343
					$data.id = professorId;
1359
					$data.id = professorId;
1344
				}
1360
				}