diff --git a/ruoyi-modules/Property/pom.xml b/ruoyi-modules/Property/pom.xml index f126b23..40ad288 100644 --- a/ruoyi-modules/Property/pom.xml +++ b/ruoyi-modules/Property/pom.xml @@ -114,18 +114,6 @@ org.dromara property-api - - com.github.yulichang - mybatis-plus-join - 1.2.4 - compile - - - org.dromara - ruoyi-system - 2.4.0 - compile - diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java index 2156d27..263f7d3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java @@ -11,9 +11,6 @@ import jakarta.validation.constraints.*; import java.util.Date; import java.util.List; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysRole; /** * 排班业务对象 attendance_arrangement @@ -67,9 +64,7 @@ public class AttendanceArrangementBo extends BaseEntity { */ private Long status; - private List roleList; - - private List deptList; +// private List<> } 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 07bc5e1..64b9f76 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 @@ -15,6 +15,7 @@ import org.dromara.property.domain.vo.AttendanceArrangementVo; import org.dromara.property.domain.AttendanceArrangement; import org.dromara.property.mapper.AttendanceArrangementMapper; import org.dromara.property.service.IAttendanceArrangementService; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -33,6 +34,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS private final AttendanceArrangementMapper baseMapper; + /** * 查询排班 * @@ -90,6 +92,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS * @param bo 排班 * @return 是否新增成功 */ + @Transactional(rollbackFor = Exception.class) @Override public Boolean insertByBo(AttendanceArrangementBo bo) { AttendanceArrangement add = MapstructUtils.convert(bo, AttendanceArrangement.class); @@ -98,6 +101,12 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS if (flag) { bo.setId(add.getId()); } + //取出当前新增的排班的id + Long ArrangementId = add.getId(); + //向排班人员表中插入排班人员信息 + + + return flag; }