diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java index 9d2de73..3e66a8a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java @@ -3,7 +3,6 @@ package com.hnac.hzims.operational.duty.service.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.Query; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.hnac.hzims.monitor.utils.DateUtils; @@ -31,7 +30,6 @@ import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; @@ -39,7 +37,6 @@ import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.sql.Time; import java.text.DateFormat; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalDateTime; @@ -1226,7 +1223,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl> allUserList = userClient.userListByDeptId(deptId); + R> allUserList = userClient.userList("200000",deptId); return allUserList; } @@ -1394,7 +1391,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl deptDutyClassMap = deptDutyClassList.stream().collect(Collectors.toMap(ImsDutyClassEntity::getId, Function.identity())); // 获取部门的所有组员 - List allUserList = userClient.userListByDeptId(deptId).getData(); + List allUserList = userClient.userList("200000",deptId).getData(); Map deptUserMap = allUserList.stream().collect(Collectors.toMap(User::getId, User::getName)); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -1419,7 +1416,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl restUserList = userClient.userListByDeptId(deptId).getData(); + List restUserList = userClient.userList("200000",deptId).getData(); // 获取一天的排班 List dutyMainDayList = dutyMainList.stream().filter(var -> dateFormat.format(var.getDutyDate()).equals(dateStr)).collect(Collectors.toList());