by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了自动派单排序

Browse Source
This commit is contained in:
yuyongle
2025-08-29 20:43:58 +08:00
parent e2fbd251b3
commit 826684ed66
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrdersType.java
View File

@@ -41,6 +41,10 @@ public class ServiceWorkOrdersType extends TenantEntity {
* 运作模式(0派单+抢单,1派单,2自动派单) * 运作模式(0派单+抢单,1派单,2自动派单)
*/ */
private String operationMode; private String operationMode;
/**
*部门id
*/
private Long deptId;
/** /**
* 排序值 * 排序值

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersTypeBo.java
View File

@@ -36,7 +36,11 @@ public class ServiceWorkOrdersTypeBo extends BaseEntity {
*/ */
@NotNull(message = "工单类型名称不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "工单类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String orderTypeName; private String orderTypeName;
/**
*部门id
*/
@NotNull(message = "部门id", groups = { EditGroup.class })
private Long deptId;
/** /**
* 运作模式 * 运作模式
*/ */

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersTypeVo.java
View File

@@ -44,6 +44,10 @@ public class ServiceWorkOrdersTypeVo implements Serializable {
*/ */
@ExcelProperty(value = "工单类型名称") @ExcelProperty(value = "工单类型名称")
private String orderTypeName; private String orderTypeName;
/**
*部门id
*/
private Long deptId;
/** /**
* 运作模式 * 运作模式

8
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java
View File

@@ -227,7 +227,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
boolean flags = workOrdersRecordMapper.insert(serviceWorkOrdersRecord) > 0; boolean flags = workOrdersRecordMapper.insert(serviceWorkOrdersRecord) > 0;
if (flags) { if (flags) {
if (serviceWorkOrdersType.getOperationMode().equals(OrderTypeOperationEnum.AUTOMATE_DISPATCH.getValue())) { if (serviceWorkOrdersType.getOperationMode().equals(OrderTypeOperationEnum.AUTOMATE_DISPATCH.getValue())) {
handleServiceWorkOrder(add); handleServiceWorkOrder(add,serviceWorkOrdersType);
} }
} }
} }
@@ -235,7 +235,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
} }
//自动派单 //自动派单
private void handleServiceWorkOrder(ServiceWorkOrders serviceWorkOrders) { private void handleServiceWorkOrder(ServiceWorkOrders serviceWorkOrders,ServiceWorkOrdersType serviceWorkOrdersType) {
LocalDate today = LocalDate.now(); LocalDate today = LocalDate.now();
// 1. 获取今日排班人员（优先查缓存，未命中则查询数据库并缓存） // 1. 获取今日排班人员（优先查缓存，未命中则查询数据库并缓存）
List<AttendanceUserGroup> attendanceUserGroups = RedisUtils.getCacheList(DateUtil.today()); List<AttendanceUserGroup> attendanceUserGroups = RedisUtils.getCacheList(DateUtil.today());
@@ -243,7 +243,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
new LambdaQueryWrapper<AttendanceUserGroup>() new LambdaQueryWrapper<AttendanceUserGroup>()
.le(AttendanceUserGroup::getStartDate, today) .le(AttendanceUserGroup::getStartDate, today)
.ge(AttendanceUserGroup::getEndDate, today) .ge(AttendanceUserGroup::getEndDate, today)
//.eq(AttendanceUserGroup::getDeptId, serviceWorkOrders.getCreateDept()) .eq(AttendanceUserGroup::getDeptId, serviceWorkOrdersType.getCreateDept())
.orderByAsc(AttendanceUserGroup::getStartDate) .orderByAsc(AttendanceUserGroup::getStartDate)
); );
if (CollUtil.isEmpty(attendanceUserGroups)|| attendanceUserGroups.size() != attendanceUserGroupList.size()) { if (CollUtil.isEmpty(attendanceUserGroups)|| attendanceUserGroups.size() != attendanceUserGroupList.size()) {
@@ -591,7 +591,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
boolean flags = workOrdersRecordMapper.insert(serviceWorkOrdersRecord) > 0; boolean flags = workOrdersRecordMapper.insert(serviceWorkOrdersRecord) > 0;
if (flags) { if (flags) {
if (serviceWorkOrdersType.getOperationMode().equals(OrderTypeOperationEnum.AUTOMATE_DISPATCH.getValue())) { if (serviceWorkOrdersType.getOperationMode().equals(OrderTypeOperationEnum.AUTOMATE_DISPATCH.getValue())) {
handleServiceWorkOrder(add); handleServiceWorkOrder(add,serviceWorkOrdersType);
} }
} }
} }