Browse Source

工单信息表字段修改

ops-management-platform-backend-dev
gjh 3 weeks ago
parent
commit
5c8a0d07cb
  1. 19
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java
  2. 27
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java
  3. 19
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java
  4. 15
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java

19
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java

@ -13,7 +13,7 @@ import java.io.Serial;
* 工单信息对象 work_order_info
*
* @author gejunhao
* @date 2025-01-13
* @date 2025-02-21
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ -42,7 +42,7 @@ public class WorkOrderInfo extends TenantEntity {
/**
* 保修人员ID
*/
private Long repairerId;
private String repairerId;
/**
* 是否事故 (0: , 1: )
@ -52,7 +52,7 @@ public class WorkOrderInfo extends TenantEntity {
/**
* 响应级别 (0: 常规, 1: 紧急, 2: 特急)
*/
private String responseLevel;
private Long responseLevel;
/**
* 响应时限
@ -67,7 +67,7 @@ public class WorkOrderInfo extends TenantEntity {
/**
* 故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)
*/
private String faultSubcategory;
private Long faultSubcategory;
/**
* 所属机构
@ -92,7 +92,7 @@ public class WorkOrderInfo extends TenantEntity {
/**
* 维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)
*/
private String maintenanceRequirement;
private Long maintenanceRequirement;
/**
* 派遣意见
@ -114,11 +114,20 @@ public class WorkOrderInfo extends TenantEntity {
*/
private String longitude;
/**
* 当前状态
*/
private Long status;
/**
* 删除标志0代表存在 2代表删除
*/
@TableLogic
private String delFlag;
/**
* 处理时限
*/
private int handleTime;
}

27
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java

@ -17,7 +17,7 @@ import org.dromara.common.translation.constant.TransConstant;
* 工单信息业务对象 work_order_info
*
* @author gejunhao
* @date 2025-01-13
* @date 2025-02-21
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ -46,8 +46,8 @@ public class WorkOrderInfoBo extends BaseEntity {
/**
* 保修人员ID
*/
@NotNull(message = "保修人员ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long repairerId;
@NotBlank(message = "保修人员ID不能为空", groups = { AddGroup.class, EditGroup.class })
private String repairerId;
/**
* 是否事故 (0: , 1: )
@ -58,8 +58,8 @@ public class WorkOrderInfoBo extends BaseEntity {
/**
* 响应级别 (0: 常规, 1: 紧急, 2: 特急)
*/
@NotBlank(message = "响应级别 (0: 常规, 1: 紧急, 2: 特急)不能为空", groups = { AddGroup.class, EditGroup.class })
private String responseLevel;
@NotNull(message = "响应级别 (0: 常规, 1: 紧急, 2: 特急)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long responseLevel;
/**
* 响应时限
@ -76,8 +76,8 @@ public class WorkOrderInfoBo extends BaseEntity {
/**
* 故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)
*/
@NotBlank(message = "故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)不能为空", groups = { AddGroup.class, EditGroup.class })
private String faultSubcategory;
@NotNull(message = "故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long faultSubcategory;
/**
* 所属机构
@ -106,8 +106,8 @@ public class WorkOrderInfoBo extends BaseEntity {
/**
* 维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)
*/
@NotBlank(message = "维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)不能为空", groups = { AddGroup.class, EditGroup.class })
private String maintenanceRequirement;
@NotNull(message = "维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long maintenanceRequirement;
/**
* 派遣意见
@ -133,5 +133,14 @@ public class WorkOrderInfoBo extends BaseEntity {
@NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
private String longitude;
/**
* 当前状态
*/
@NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Long status;
/**
* 处理时限
*/
private int handleTime;
}

19
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java

@ -20,7 +20,7 @@ import java.util.Date;
* 工单信息视图对象 work_order_info
*
* @author gejunhao
* @date 2025-01-13
* @date 2025-02-21
*/
@Data
@ExcelIgnoreUnannotated
@ -52,7 +52,7 @@ public class WorkOrderInfoVo implements Serializable {
* 保修人员ID
*/
@ExcelProperty(value = "保修人员ID")
private Long repairerId;
private String repairerId;
/**
* 是否事故 (0: , 1: )
@ -64,7 +64,7 @@ public class WorkOrderInfoVo implements Serializable {
* 响应级别 (0: 常规, 1: 紧急, 2: 特急)
*/
@ExcelProperty(value = "响应级别 (0: 常规, 1: 紧急, 2: 特急)")
private String responseLevel;
private Long responseLevel;
/**
* 响应时限
@ -82,7 +82,7 @@ public class WorkOrderInfoVo implements Serializable {
* 故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)
*/
@ExcelProperty(value = "故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)")
private String faultSubcategory;
private Long faultSubcategory;
/**
* 所属机构
@ -117,7 +117,7 @@ public class WorkOrderInfoVo implements Serializable {
* 维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)
*/
@ExcelProperty(value = "维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)")
private String maintenanceRequirement;
private Long maintenanceRequirement;
/**
* 派遣意见
@ -143,5 +143,14 @@ public class WorkOrderInfoVo implements Serializable {
@ExcelProperty(value = "经度")
private String longitude;
/**
* 当前状态
*/
@ExcelProperty(value = "当前状态")
private Long status;
/**
* 处理时限
*/
private int handleTime;
}

15
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java

@ -23,7 +23,7 @@ import java.util.Collection;
* 工单信息Service业务层处理
*
* @author gejunhao
* @date 2025-01-13
* @date 2025-02-21
*/
@RequiredArgsConstructor
@Service
@ -73,21 +73,22 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
LambdaQueryWrapper<WorkOrderInfo> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), WorkOrderInfo::getProjectName, bo.getProjectName());
lqw.eq(StringUtils.isNotBlank(bo.getRepairer()), WorkOrderInfo::getRepairer, bo.getRepairer());
lqw.eq(bo.getRepairerId() != null, WorkOrderInfo::getRepairerId, bo.getRepairerId());
lqw.eq(StringUtils.isNotBlank(bo.getRepairerId()), WorkOrderInfo::getRepairerId, bo.getRepairerId());
lqw.eq(bo.getIsAccident() != null, WorkOrderInfo::getIsAccident, bo.getIsAccident());
lqw.eq(StringUtils.isNotBlank(bo.getResponseLevel()), WorkOrderInfo::getResponseLevel, bo.getResponseLevel());
lqw.eq(bo.getResponseLevel() != null, WorkOrderInfo::getResponseLevel, bo.getResponseLevel());
lqw.eq(bo.getResponseTime() != null, WorkOrderInfo::getResponseTime, bo.getResponseTime());
lqw.eq(StringUtils.isNotBlank(bo.getFaultCategory()), WorkOrderInfo::getFaultCategory, bo.getFaultCategory());
lqw.eq(StringUtils.isNotBlank(bo.getFaultSubcategory()), WorkOrderInfo::getFaultSubcategory, bo.getFaultSubcategory());
lqw.eq(bo.getFaultSubcategory() != null, WorkOrderInfo::getFaultSubcategory, bo.getFaultSubcategory());
lqw.eq(StringUtils.isNotBlank(bo.getInstitution()), WorkOrderInfo::getInstitution, bo.getInstitution());
lqw.eq(StringUtils.isNotBlank(bo.getFaultLocation()), WorkOrderInfo::getFaultLocation, bo.getFaultLocation());
lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), WorkOrderInfo::getFaultDescription, bo.getFaultDescription());
lqw.eq(StringUtils.isNotBlank(bo.getFaultImage()), WorkOrderInfo::getFaultImage, bo.getFaultImage());
lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceRequirement()), WorkOrderInfo::getMaintenanceRequirement, bo.getMaintenanceRequirement());
lqw.eq(bo.getMaintenanceRequirement() != null, WorkOrderInfo::getMaintenanceRequirement, bo.getMaintenanceRequirement());
lqw.eq(StringUtils.isNotBlank(bo.getDispatchOpinion()), WorkOrderInfo::getDispatchOpinion, bo.getDispatchOpinion());
lqw.eq(bo.getIsDispatched() != null, WorkOrderInfo::getIsDispatched, bo.getIsDispatched());
lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), WorkOrderInfo::getLatitude, bo.getLatitude());
lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), WorkOrderInfo::getLongitude, bo.getLongitude());
lqw.eq(bo.getStatus() != null, WorkOrderInfo::getStatus, bo.getStatus());
return lqw;
}
@ -100,7 +101,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
@Override
public Boolean insertByBo(WorkOrderInfoBo bo) {
WorkOrderInfo add = MapstructUtils.convert(bo, WorkOrderInfo.class);
//validEntityBeforeSave(add);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
@ -117,7 +118,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
@Override
public Boolean updateByBo(WorkOrderInfoBo bo) {
WorkOrderInfo update = MapstructUtils.convert(bo, WorkOrderInfo.class);
//validEntityBeforeSave(update);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}

Loading…
Cancel
Save