From bf13676673e9f0f090a68bd8cfbaefbf0d696d32 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期日, 26 十一月 2023 13:03:00 +0800
Subject: [PATCH] 讨论区关键字过滤、首页班级显示班级信息
---
src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java | 2 +-
src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java | 5 +++--
src/main/java/com/qxueyou/scc/user/service/impl/UserService.java | 10 +++++++---
src/main/java/com/qxueyou/scc/exercise/model/ExerciseGroup.java | 18 ++++++++++++++++--
src/main/java/com/qxueyou/scc/user/service/IUserService.java | 2 +-
src/main/java/com/qxueyou/scc/controller/UserController.java | 2 +-
src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java | 9 ++++++++-
7 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java b/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java
index 84024fa..294a85f 100644
--- a/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java
+++ b/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java
@@ -48,7 +48,7 @@
return new Result(false, "鐢ㄦ埛缂栧彿宸插瓨鍦ㄦ垨琚叾浠栫敤鎴峰崰鐢�");
}
- User user = userService.insertUser(teacherName, teacherNo, mobilePhone, password, Boolean.FALSE, ClientUtils.getOrgId());
+ User user = userService.insertUser(null,teacherName, teacherNo, mobilePhone, password, Boolean.FALSE, ClientUtils.getOrgId());
// userService.insertUser(teacherName, teacherNo, mobilePhone, password, Boolean.FALSE, ClientUtils.getOrgId());
userService.addRole(user.getUserId(), UserRole.ROLE_TEACHER_ID);
diff --git a/src/main/java/com/qxueyou/scc/controller/UserController.java b/src/main/java/com/qxueyou/scc/controller/UserController.java
index 10115ab..5302df6 100644
--- a/src/main/java/com/qxueyou/scc/controller/UserController.java
+++ b/src/main/java/com/qxueyou/scc/controller/UserController.java
@@ -88,7 +88,7 @@
if(roleId.equals(UserRole.ROLE_TEACHER_ID)){
result= teacherService.add(name, password, mobilePhone, account);
}else{
- user = userService.insertUser(name, account, mobilePhone, password, true, ClientUtils.getOrgId());
+ user = userService.insertUser(null,name, account, mobilePhone, password, true, ClientUtils.getOrgId());
result= userService.addRole(user.getUserId(), roleId);
}
diff --git a/src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java b/src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java
index 2226669..c412c73 100644
--- a/src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java
+++ b/src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java
@@ -62,7 +62,7 @@
* 棰樺簱鍒楄〃
*/
@RequestMapping(value = "/list", method = RequestMethod.GET)
- public @ResponseBody Result pageList(String keyword,Short status, Integer pageSize, Integer pageNum) {
+ public @ResponseBody Result pageList(String keyword,Short status, Integer pageSize, Integer pageNum,String typeStatus) {
//鍒ゆ柇鏄惁鏄暀甯�
// String teacherId = ClientUtils.isAdmin() ? null : teacherService.getTeacherIdByUserId(ClientUtils.getUserId());
String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
@@ -85,6 +85,10 @@
hqlCount = hqlCount.concat(" and createId=?");
queryParam.add(teacherId);
}
+ if (StringUtils.isNotBlank(typeStatus)) {
+ hqlCount = hqlCount.concat(" and typeStatus=?");
+ queryParam.add(typeStatus);
+ }
int totalCount = commonDAO.findCount(hqlCount,queryParam);
// page璧嬪��
@@ -101,6 +105,9 @@
hqlBuffer.append(" and g.createId=?");
}
+ if (StringUtils.isNotBlank(typeStatus)) {
+ hqlBuffer.append(" and g.typeStatus=?");
+ }
hqlBuffer.append(" order by g.createTime DESC");
List<Object[]> list = commonDAO.findList(hqlBuffer.toString(), page,queryParam,Object[].class);
if(list!=null&& list.size()>0){
diff --git a/src/main/java/com/qxueyou/scc/exercise/model/ExerciseGroup.java b/src/main/java/com/qxueyou/scc/exercise/model/ExerciseGroup.java
index 860dfc2..e9e84c7 100644
--- a/src/main/java/com/qxueyou/scc/exercise/model/ExerciseGroup.java
+++ b/src/main/java/com/qxueyou/scc/exercise/model/ExerciseGroup.java
@@ -196,7 +196,13 @@
@Column(name="GROUP_RANGE")
private short groupRange;
-
+ /**
+ * 鏂帮細棰樺簱绫诲瀷锛堢粌涔犻锛歟xercises锛屾祴璇曢锛歲uiz锛岃�冭瘯棰� 锛歟xaminationQuestion锛�
+ */
+ @Column(name="TYPE_STATUS")
+ private String typeStatus;
+
+
@Transient
private int singleSelectCount;
@@ -211,7 +217,15 @@
@Transient
private int fillBlanksCount;
-
+
+ public String getTypeStatus() {
+ return typeStatus;
+ }
+
+ public void setTypeStatus(String typeStatus) {
+ this.typeStatus = typeStatus;
+ }
+
public String getSubjectName() {
return subjectName;
}
diff --git a/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java b/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
index cebc39c..23eac55 100644
--- a/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
+++ b/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
@@ -58,7 +58,7 @@
return new Result(false, "瀛﹀彿宸插瓨鍦�");
}
- User user = userService.insertUser(name, studentNo, phoneNo, "000000", sex, orgId);
+ User user = userService.insertUser(null,name, studentNo, phoneNo, "000000", sex, orgId);
//ClsClass cls = clsService.read(classId);
@@ -96,7 +96,7 @@
return new Result(false, "韬唤璇佸凡瀛樺湪");
}
- User user = userService.insertUser(name, studentNo, phoneNo, "000000", sex, orgId);
+ User user = userService.insertUser(photo,name, studentNo, phoneNo, "000000", sex, orgId);
//ClsClass cls = clsService.read(classId);
@@ -178,6 +178,7 @@
user.setAccount(studentNo);
user.setSex(sex);
user.setMobilePhone(phoneNo);
+ user.setImgPath(photo);
//闅忔満瀛楃涓�
String salt= UUID.randomUUID().toString();
//鐩愬��
diff --git a/src/main/java/com/qxueyou/scc/user/service/IUserService.java b/src/main/java/com/qxueyou/scc/user/service/IUserService.java
index 02327a5..de939f1 100644
--- a/src/main/java/com/qxueyou/scc/user/service/IUserService.java
+++ b/src/main/java/com/qxueyou/scc/user/service/IUserService.java
@@ -31,7 +31,7 @@
* @param mobilePhone 鎵嬫満鍙�
* @return
*/
- User insertUser(String name, String account, String mobilePhone, String password, Boolean sex, String orgId);
+ User insertUser( String photo,String name, String account, String mobilePhone, String password, Boolean sex, String orgId);
/**
* 鏍规嵁璐︽埛鑾峰彇鐢ㄦ埛
diff --git a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
index 467e05d..8f5418f 100644
--- a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
+++ b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
@@ -90,11 +90,11 @@
}
@Override
- public User insertUser(String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
- return newUser(name, account, mobilePhone, password, sex, orgId);
+ public User insertUser( String photo,String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
+ return newUser( photo,name, account, mobilePhone, password, sex, orgId);
}
- private User newUser(String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
+ private User newUser(String photo,String name, String account, String mobilePhone, String password, Boolean sex, String orgId) {
//闅忔満瀛楃涓�
String salt= UUID.randomUUID().toString();
User user = new User();
@@ -107,6 +107,7 @@
String newPassword= DigestUtils.md5DigestAsHex((salt+password).getBytes());
user.setPassword(newPassword);
user.setMobilePhone(mobilePhone);
+ user.setImgPath(photo);
user.setSex(sex);
user.setOrganizationId(orgId);
save(user);
@@ -180,6 +181,9 @@
user.setImgPath(headPath);
TraceUtils.setUpdateTrace(user);
save(user);
+ this.bulkUpdate("update StuStudent set photo = ? , " +
+ " updateTime = sysdate(), updateId = ? , updator = ? where userId = ? " ,
+ new Object[]{ headPath,userId, ClientUtils.getUserName(), userId } );
return new Result(true);
}
--
Gitblit v1.8.0