This commit is contained in:
parent
5d042a2151
commit
625be80cf2
@ -114,18 +114,6 @@
|
|||||||
<groupId>org.dromara</groupId>
|
<groupId>org.dromara</groupId>
|
||||||
<artifactId>property-api</artifactId>
|
<artifactId>property-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.yulichang</groupId>
|
|
||||||
<artifactId>mybatis-plus-join</artifactId>
|
|
||||||
<version>1.2.4</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.dromara</groupId>
|
|
||||||
<artifactId>ruoyi-system</artifactId>
|
|
||||||
<version>2.4.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
@ -11,9 +11,6 @@ import jakarta.validation.constraints.*;
|
|||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import org.dromara.system.domain.SysDept;
|
|
||||||
import org.dromara.system.domain.SysRole;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 排班业务对象 attendance_arrangement
|
* 排班业务对象 attendance_arrangement
|
||||||
@ -67,9 +64,7 @@ public class AttendanceArrangementBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long status;
|
private Long status;
|
||||||
|
|
||||||
private List<SysRole> roleList;
|
// private List<>
|
||||||
|
|
||||||
private List<SysDept> deptList;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -15,6 +15,7 @@ import org.dromara.property.domain.vo.AttendanceArrangementVo;
|
|||||||
import org.dromara.property.domain.AttendanceArrangement;
|
import org.dromara.property.domain.AttendanceArrangement;
|
||||||
import org.dromara.property.mapper.AttendanceArrangementMapper;
|
import org.dromara.property.mapper.AttendanceArrangementMapper;
|
||||||
import org.dromara.property.service.IAttendanceArrangementService;
|
import org.dromara.property.service.IAttendanceArrangementService;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -33,6 +34,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
|
|||||||
|
|
||||||
private final AttendanceArrangementMapper baseMapper;
|
private final AttendanceArrangementMapper baseMapper;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询排班
|
* 查询排班
|
||||||
*
|
*
|
||||||
@ -90,6 +92,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
|
|||||||
* @param bo 排班
|
* @param bo 排班
|
||||||
* @return 是否新增成功
|
* @return 是否新增成功
|
||||||
*/
|
*/
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
@Override
|
@Override
|
||||||
public Boolean insertByBo(AttendanceArrangementBo bo) {
|
public Boolean insertByBo(AttendanceArrangementBo bo) {
|
||||||
AttendanceArrangement add = MapstructUtils.convert(bo, AttendanceArrangement.class);
|
AttendanceArrangement add = MapstructUtils.convert(bo, AttendanceArrangement.class);
|
||||||
@ -98,6 +101,12 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
|
|||||||
if (flag) {
|
if (flag) {
|
||||||
bo.setId(add.getId());
|
bo.setId(add.getId());
|
||||||
}
|
}
|
||||||
|
//取出当前新增的排班的id
|
||||||
|
Long ArrangementId = add.getId();
|
||||||
|
//向排班人员表中插入排班人员信息
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user