diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java index bca7288..0b8728b 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java @@ -231,8 +231,11 @@ public class WorkOrderController extends BladeController { workOrderOld.setCustomerOpinion(workOrder.getCustomerOpinion()); workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_ALLOT.getValue()); workOrderService.updateById(workOrderOld); - User repairPerson = userService.getById(workOrder.getRepairPerson()); - messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的维修单,请尽快处理", repairPerson.getId(), 2); + if (workOrder.getRepairType() == 1) { + messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的紧急维修单,请火速处理", workOrder.getRepairPerson(), 2); + } else { + messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的维修单,请尽快处理", workOrder.getRepairPerson(), 2); + } // todo 审核通过 return R.success(""); diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java b/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java index 38bf724..41fe30a 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java @@ -20,217 +20,222 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) public class WorkOrder extends BaseEntity { - /** - * 工单状态: - * -1 草稿 0 待客服处理 - * 1 待维修人员确认 2 待提交维修方案 - * 3 待主管审批 4 待客户审批 - * 5 维修中 - * 6 客户评价 7 客服确认付款, 8 工单关闭 - */ - @Schema( - description = "业务状态", - hidden = true - ) - private Integer status; - - /** - * 流程实例id - */ - private String processInstanceId; - - /** - * 故障位置 - */ - private String faultLocation; - - /** - * 客服意见 - */ - private String customerOpinion; - - /** - * 设备id - */ - private Long deviceId; - - /** - * 设备名称 - */ - private String deviceName; - - /** - * 故障类型 - */ - private String faultType; - - /** - * 故障描述 - */ - private String faultDescribe; - - /** - * 填报人 - */ - private Long informant; - - /** - * 填报人电话 - */ - private String informantPhone; - - /** - * 填报时间 - */ - private Date fillingTime; - - /** - * 需求单号 - */ - private String requirementCode; - - /** - * 提报单位 - */ - private String reportUnit; - - /** - * 提报单位名称 - */ - @TableField(exist = false) - private String reportUnitName; - - /** - * 维修班组 - */ - private Long maintenanceTeam; - - /** - * 派单时间(客服) - */ - private Date dispatchTime; - - /** - * 计划完成时间 - */ - private Date planCompleteTime; - - /** - * 维修人员 - */ - private Long repairPerson; - - /** - * 备注 - */ - private String remark; - - /** - * 接单时间(维修人员) - */ - private Date receiveOrderTime; - - /** - * 故障原因 - */ - private String faultCause; - - /** - * 处理方法 - */ - private String processMethod; - - /** - * 是否需要申领物料(0否 1是) - */ - private Integer isNeedMaterial; - - /** - * 审批结果(0不通过 1通过) - */ - private Integer approveResult; - /** - * 审核节点 - */ - private String approvePoint; - /** - * 审批人 - */ - private Long approvePerson; - - /** - * 审批时间 - */ - private Date approveTime; - - /** - * 审批备注 - */ - private String approveRemark; - - /** - * 评价质量是否满意(0否 1是) - */ - private Integer isOkQuality; - - /** - * 评价安全是否满意(0否 1是) - */ - private Integer isOkSecure; - - /** - * 评价时效是否满意(0否 1是) - */ - private Integer isOkValidity; - - /** - * 签名图片地址 - */ - private String signatureUrl; - - /** - * 签名人 - */ - private String signaturePerson; - - /** - * 签名时间 - */ - private Date signatureTime; - - /** - * 签名时间 - */ - private Date finishTime; - - /** - * 维修人员驳回原因 - */ - private String repaiRejectReason; - - /** - * 维修负责人驳回原因 - */ - private String repaiTeamRejectReason; - - /** - * 关闭原因 - */ - private String closeReason; - - /** - * 总价 - */ - private Double totalPrice; - - /** - * 折扣 - */ - private Double discount; - - /** - * 折扣后总价 - */ - private Double discountPrice; + /** + * 工单状态: + * -1 草稿 0 待客服处理 + * 1 待维修人员确认 2 待提交维修方案 + * 3 待主管审批 4 待客户审批 + * 5 维修中 + * 6 客户评价 7 客服确认付款, 8 工单关闭 + */ + @Schema( + description = "业务状态", + hidden = true + ) + private Integer status; + + /** + * 流程实例id + */ + private String processInstanceId; + + /** + * 故障位置 + */ + private String faultLocation; + + /** + * 客服意见 + */ + private String customerOpinion; + + /** + * 设备id + */ + private Long deviceId; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 故障类型 + */ + private String faultType; + + /** + * 故障描述 + */ + private String faultDescribe; + + /** + * 填报人 + */ + private Long informant; + + /** + * 填报人电话 + */ + private String informantPhone; + + /** + * 填报时间 + */ + private Date fillingTime; + + /** + * 需求单号 + */ + private String requirementCode; + + /** + * 提报单位 + */ + private String reportUnit; + + /** + * 提报单位名称 + */ + @TableField(exist = false) + private String reportUnitName; + + /** + * 维修班组 + */ + private Long maintenanceTeam; + + /** + * 派单时间(客服) + */ + private Date dispatchTime; + + /** + * 计划完成时间 + */ + private Date planCompleteTime; + + /** + * 维修人员 + */ + private Long repairPerson; + + /** + * 备注 + */ + private String remark; + + /** + * 接单时间(维修人员) + */ + private Date receiveOrderTime; + + /** + * 故障原因 + */ + private String faultCause; + + /** + * 处理方法 + */ + private String processMethod; + + /** + * 是否需要申领物料(0否 1是) + */ + private Integer isNeedMaterial; + + /** + * 审批结果(0不通过 1通过) + */ + private Integer approveResult; + /** + * 审核节点 + */ + private String approvePoint; + /** + * 审批人 + */ + private Long approvePerson; + + /** + * 审批时间 + */ + private Date approveTime; + + /** + * 审批备注 + */ + private String approveRemark; + + /** + * 评价质量是否满意(0否 1是) + */ + private Integer isOkQuality; + + /** + * 评价安全是否满意(0否 1是) + */ + private Integer isOkSecure; + + /** + * 评价时效是否满意(0否 1是) + */ + private Integer isOkValidity; + + /** + * 签名图片地址 + */ + private String signatureUrl; + + /** + * 签名人 + */ + private String signaturePerson; + + /** + * 签名时间 + */ + private Date signatureTime; + + /** + * 签名时间 + */ + private Date finishTime; + + /** + * 维修人员驳回原因 + */ + private String repaiRejectReason; + + /** + * 维修负责人驳回原因 + */ + private String repaiTeamRejectReason; + + /** + * 关闭原因 + */ + private String closeReason; + + /** + * 总价 + */ + private Double totalPrice; + + /** + * 折扣 + */ + private Double discount; + + /** + * 折扣后总价 + */ + private Double discountPrice; + + /** + * 维修类型 + */ + private Integer repairType; }