From a7db0253e8e6831327007057bff02e0a695ef337 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Tue, 12 Aug 2025 11:16:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEid=E8=AF=BB=E5=8F=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AttendanceArrangementServiceImpl.java | 15 ++++++++++++++- .../impl/AttendanceUserGroupServiceImpl.java | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java index c41842fd..b64ff3ba 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java @@ -40,7 +40,6 @@ import java.util.stream.Collectors; @Slf4j @RequiredArgsConstructor @Service -@DubboService(interfaceClass = SysUser.class) public class AttendanceArrangementServiceImpl implements IAttendanceArrangementService { private final AttendanceArrangementMapper baseMapper; @@ -503,6 +502,13 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS // judgeDate(bo, update); + //根据排班id获取人员id + //根据人员id删除人员信息 + //新增人员信息 + //根据排班id获取部门id + //根据部门id删除部门信息 + //新增部门信息 + //取出当前排班的id assert update != null; Long ArrangementId = update.getId(); @@ -513,6 +519,13 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS userGroupMapper.delete(Wrappers.lambdaQuery().in(AttendanceUserGroup::getEmployeeId, employeeIdList) .eq(AttendanceUserGroup::getScheduleId, ArrangementId)); + //根据排班id获取部门id + List deptIdList = userGroupMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceUserGroup::getScheduleId, ArrangementId)) + .stream().map(AttendanceUserGroup::getDeptId).toList(); + //根据deptId和ArrangementId删除attendanceDeptGroup表中的数据 + userGroupMapper.delete(Wrappers.lambdaQuery().in(AttendanceUserGroup::getDeptId, deptIdList) + .eq(AttendanceUserGroup::getScheduleId, ArrangementId)); + //用获取到的排班id向attendanceUserGroup表中批量插入数据 List userGroupList = bo.getUserGroupList(); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java index 44ecf723..63c4d027 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java @@ -91,9 +91,9 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi lqw.orderByAsc(AttendanceUserGroup::getId); lqw.eq(bo.getScheduleId() != null, AttendanceUserGroup::getScheduleId, bo.getScheduleId()); lqw.eq(bo.getEmployeeId() != null, AttendanceUserGroup::getEmployeeId, bo.getEmployeeId()); - lqw.like(StringUtils.isNotBlank(bo.getEmployeeName()), AttendanceUserGroup::getEmployeeName, bo.getEmployeeName()); +// lqw.like(StringUtils.isNotBlank(bo.getEmployeeName()), AttendanceUserGroup::getEmployeeName, bo.getEmployeeName()); lqw.eq(bo.getDeptId() != null, AttendanceUserGroup::getDeptId, bo.getDeptId()); - lqw.like(StringUtils.isNotBlank(bo.getDeptName()), AttendanceUserGroup::getDeptName, bo.getDeptName()); +// lqw.like(StringUtils.isNotBlank(bo.getDeptName()), AttendanceUserGroup::getDeptName, bo.getDeptName()); return lqw; }