Browse Source

查询咨询聊天记录返回值添加是否存在专家头像字段

zzy.zhiyuan.foxmail 8 years ago
parent
commit
ddb2787cd3

+ 0 - 17
src/main/java/com/ekexiu/portal/dao/ConsultDao.java

@ -651,8 +651,6 @@ public abstract class ConsultDao {
651 651
					consult.setRevoveryTime(rs.getString(16));
652 652
					consult.setReadStatus(rs.getInt(17));
653 653
					consult.setCreateTime(rs.getString(18));
654
					EditProfessor professor = this.professorDao.queryBaseInfo(con, consult.getConsultantId());
655
					consult.setProfessor(professor);
656 654
					_m_11.add(consult);
657 655
				}
658 656
				return queryResult;
@ -1022,8 +1020,6 @@ public abstract class ConsultDao {
1022 1020
					consult.setRevoveryTime(rs.getString(16));
1023 1021
					consult.setReadStatus(rs.getInt(17));
1024 1022
					consult.setCreateTime(rs.getString(18));
1025
					EditProfessor professor = this.professorDao.queryBaseInfo(con, consult.getProfessorId());
1026
					consult.setProfessor(professor);
1027 1023
					_m_11.add(consult);
1028 1024
				}
1029 1025
				return queryResult;
@ -1418,19 +1414,6 @@ public abstract class ConsultDao {
1418 1414
					consult.setRevoveryTime(rs.getString(16));
1419 1415
					consult.setReadStatus(rs.getInt(17));
1420 1416
					consult.setCreateTime(rs.getString(18));
1421
					EditProfessor professor = new EditProfessor();
1422
					if(0 == consultOrNeed){
1423
						if(professorId.equals(consult.getProfessorId())){
1424
							professor = this.professorDao.queryBaseInfo(con, consult.getConsultantId());
1425
						}else if(professorId.equals(consult.getConsultantId())){
1426
							professor = this.professorDao.queryBaseInfo(con, consult.getProfessorId());
1427
						}
1428
					}else if(1 == consultOrNeed){
1429
						professor = this.professorDao.queryBaseInfo(con, consult.getConsultantId());
1430
					}else if(2 == consultOrNeed){
1431
						professor = this.professorDao.queryBaseInfo(con, consult.getProfessorId());
1432
					}
1433
					consult.setProfessor(professor);
1434 1417
					_m_11.add(consult);
1435 1418
				}
1436 1419
				return queryResult;

+ 26 - 6
src/main/java/com/ekexiu/portal/service/ConsultService.java

@ -176,8 +176,11 @@ public class ConsultService {
176 176
		List<Consult> consults = queryResult.getData();
177 177
		if(consults != null){
178 178
			for (Consult consult : consults) {
179
				int hasHeadImage = this.imageService.hasProfessorImage(consult.getConsultantId());
180
				consult.getProfessor().setHasHeadImage(hasHeadImage);
179
				EditProfessor professor = this.professorDao.queryBaseInfo(con, consult.getConsultantId());
180
				if(professor!=null){
181
					professor.setHasHeadImage(this.imageService.hasProfessorImage(consult.getConsultantId()));
182
				}
183
				consult.setProfessor(professor);
181 184
			}
182 185
			queryResult.setData(consults);
183 186
		}
@ -201,8 +204,11 @@ public class ConsultService {
201 204
		List<Consult> consults = queryResult.getData();
202 205
		if(consults != null){
203 206
			for (Consult consult : consults) {
204
				int hasHeadImage = this.imageService.hasProfessorImage(consult.getProfessorId());
205
				consult.getProfessor().setHasHeadImage(hasHeadImage);
207
				EditProfessor professor = this.professorDao.queryBaseInfo(con, consult.getProfessorId());
208
				if(professor!=null){
209
					professor.setHasHeadImage(this.imageService.hasProfessorImage(consult.getProfessorId()));
210
				}
211
				consult.setProfessor(professor);
206 212
			}
207 213
			queryResult.setData(consults);
208 214
		}
@ -226,8 +232,22 @@ public class ConsultService {
226 232
		List<Consult> consults = queryResult.getData();
227 233
		if(consults != null){
228 234
			for (Consult consult : consults) {
229
				int hasHeadImage = this.imageService.hasProfessorImage(consult.getProfessorId());
230
				consult.getProfessor().setHasHeadImage(hasHeadImage);
235
				EditProfessor professor = new EditProfessor();
236
				if(0 == consultOrNeed){
237
					if(professorId.equals(consult.getProfessorId())){
238
						professor = this.professorDao.queryBaseInfo(con, consult.getConsultantId());
239
					}else if(professorId.equals(consult.getConsultantId())){
240
						professor = this.professorDao.queryBaseInfo(con, consult.getProfessorId());
241
					}
242
				}else if(1 == consultOrNeed){
243
					professor = this.professorDao.queryBaseInfo(con, consult.getConsultantId());
244
				}else if(2 == consultOrNeed){
245
					professor = this.professorDao.queryBaseInfo(con, consult.getProfessorId());
246
				}
247
				if(professor!=null){
248
					professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
249
				}
250
				consult.setProfessor(professor);
231 251
			}
232 252
			queryResult.setData(consults);
233 253
		}

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

@ -211,7 +211,6 @@ public class ProfessorService {
211 211
			}
212 212
		}
213 213
		this.professorDao.insert(con, professor);
214
		this.imageService.saveDefaultHeadImage(professor.getId());
215 214
		return professor.getId();
216 215
	}
217 216