ssyg/SIMS
2
0
Fork 0
mirror of https://github.com/suyiiyii/SIMS.git synced 2025-05-31 11:46:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

筛选

Browse Source
This commit is contained in:
tortoise 2024-09-09 20:30:52 +08:00
parent 181a98ea57
commit a67a6c77df
3 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/top/suyiiyii/sims/controller/RecordController.java
View File

@ -125,7 +125,6 @@ RecordController {
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "10") int size,
SearchRequest searchRequest) {
Integer s1;
List<Integer> studentIds = new ArrayList<>();
List<Record> records=new ArrayList<>();
@ -173,16 +172,10 @@ RecordController {
return Result.error("请选择正确奖惩类别");
}
List<Integer> idByCategoryName = categoryService.getIdByCategoryName(categoryName);
for (Integer i : idByCategoryName) {
List<Integer> sid = recordService.getSidByCategoryId(i);
studentIds.addAll(sid);
}
List<Record> records=new ArrayList<>();
HashSet<Integer> studentIds1= new HashSet<>(studentIds);
for (Integer Sid : studentIds1) {
if(Sid!=null){
records.addAll(recordService.getRecordsById(page,size,Sid));
}
for (Integer i : idByCategoryName) {
List<Record> recordsByCategoryId = recordService.getRecordsByCategoryId(page, size, i);
records.addAll(recordsByCategoryId);
}
List<RecordDto> RecordDtos = new ArrayList<>();
for (Record record : records) {
@ -202,25 +195,20 @@ RecordController {
@RequestParam(defaultValue = "10") int size,
String categoryName,HttpServletRequest request) {
int userId = JwtInterceptor.getUserIdFromReq(request);
List<Integer> studentIds = new ArrayList<>();
//CategoryName不是奖励或者惩罚
if (!categoryName.equals("奖励")
&& !categoryName.equals("惩罚")) {
return Result.error("请选择正确奖惩类别");
}
Integer studentId = userService.getStudentIdByUserId(userId);
List<Integer> idByCategoryName = categoryService.getIdByCategoryName(categoryName);
for (Integer i : idByCategoryName) {
List<Integer> sid = recordService.getSidByCategoryId(i);
if(sid!=null) {
studentIds.addAll(sid);
}
}
List<Record> records=new ArrayList<>();
HashSet<Integer> studentIds1= new HashSet<>(studentIds);
for (Integer Sid : studentIds1) {
Integer studentId1 =userService.getStudentIdByUserId(userId);
if (studentId1!= null && studentId1.equals(Sid)) {
records.addAll(recordService.getRecordsById(page, size, Sid));
for (Integer i : idByCategoryName) {
List<Record> records1 = recordService.getRecordsByCategoryId(page, size, i);
for (Record record : records1) {
if (record.getStudentId()==studentId) {
records.add(record);
}
}
}
List<RecordDto> RecordDtos = new ArrayList<>();

2
src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java
View File

@ -87,4 +87,6 @@ public interface RecordMapper {
void update(Integer id ,Boolean isRevoked,String userId, String adminRemark, String reason, Long handleTime);
@Update("UPDATE record SET is_revoked=#{isRevoked},operator_user_id=#{userId},revoke_remark = #{reason}, revoke_reason = #{revokeReason} WHERE id = #{id}")
void Rupdate(Integer id, String reason, Boolean isRevoked,String revokeReason, String userId);
@Select("SELECT * FROM record WHERE category_id = #{i} LIMIT #{page},#{size}")
List<Record> getRecordsByCategoryId(int page, int size, Integer i);
}

3
src/main/java/top/suyiiyii/sims/service/RecordService.java
View File

@ -124,4 +124,7 @@ public class RecordService {
return recordMapper.getCategoryIdById(id);
}
public List<Record> getRecordsByCategoryId(int page, int size, Integer i) {
return recordMapper.getRecordsByCategoryId(page, size, i);
}
}