Browse Source

换班更新查询

yejian016332 3 years ago
parent
commit
ad0874af42

+ 4 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/classSchedule/service/ScheduleUserChangeService.java

@@ -5,6 +5,7 @@ import com.github.zuihou.base.service.SuperService;
 import com.github.zuihou.business.classSchedule.dto.ScheduleUserChangeSaveDTO;
 import com.github.zuihou.business.classSchedule.dto.ScheduleUserChangeUpdateDTO;
 import com.github.zuihou.business.classSchedule.entity.ScheduleUserChange;
+import com.github.zuihou.business.classSchedule.entity.ScheduleUserChangeDate;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.security.model.SysUser;
 
@@ -52,4 +53,7 @@ public interface ScheduleUserChangeService extends SuperService<ScheduleUserChan
      */
     Boolean delete(List<Long> ids);
 
+    List<Long> queryUserApplyData(ScheduleUserChange scheduleUserChange);
+
+    List<Long> queryUserChangeData(ScheduleUserChange scheduleUserChange);
 }

+ 18 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/classSchedule/service/impl/ScheduleUserChangeServiceImpl.java

@@ -188,4 +188,22 @@ public class ScheduleUserChangeServiceImpl extends SuperServiceImpl<ScheduleUser
         }
         return true;
     }
+
+    @Override
+    public List<Long> queryUserApplyData(ScheduleUserChange scheduleUserChange) {
+        List<ScheduleUserChangeDate> userApplyDatas = scheduleUserChangeDateService.list(Wraps.<ScheduleUserChangeDate>lbQ().eq(ScheduleUserChangeDate::getChangeId,scheduleUserChange.getId()).eq(ScheduleUserChangeDate::getType,"1"));
+        List<Long> applyList = userApplyDatas.stream().map((map) -> {
+            return map.getFrequencyId();
+        }).collect(Collectors.toList());
+        return applyList;
+    }
+
+    @Override
+    public List<Long> queryUserChangeData(ScheduleUserChange scheduleUserChange) {
+        List<ScheduleUserChangeDate> userChangeDatas = scheduleUserChangeDateService.list(Wraps.<ScheduleUserChangeDate>lbQ().eq(ScheduleUserChangeDate::getChangeId,scheduleUserChange.getId()).eq(ScheduleUserChangeDate::getType,"2"));
+        List<Long> changeList = userChangeDatas.stream().map((map) -> {
+            return map.getFrequencyId();
+        }).collect(Collectors.toList());
+        return changeList;
+    }
 }

+ 12 - 0
imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/classSchedule/ScheduleUserChangeController.java

@@ -2,7 +2,9 @@ package com.github.zuihou.business.controller.classSchedule;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.classSchedule.entity.AuthUser;
 import com.github.zuihou.business.classSchedule.entity.ScheduleUserChange;
 import com.github.zuihou.business.classSchedule.dto.ScheduleUserChangeSaveDTO;
 import com.github.zuihou.business.classSchedule.dto.ScheduleUserChangeUpdateDTO;
@@ -97,4 +99,14 @@ public class ScheduleUserChangeController extends SuperController<ScheduleUserCh
         return success(baseService.delete(ids));
     }
 
+    @PostMapping("/queryUserApplyData")
+    public R<List<Long>> queryUserApplyData(@RequestBody ScheduleUserChange scheduleUserChange) {
+        return success(baseService.queryUserApplyData(scheduleUserChange));
+    }
+
+    @PostMapping("/queryUserChangeData")
+    public R<List<Long>> queryUserChangeData(@RequestBody ScheduleUserChange scheduleUserChange) {
+        return success(baseService.queryUserChangeData(scheduleUserChange));
+    }
+
 }