紧急维修流程通知消息开发+维保流程消息通知完善

src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java

@@ -201,7 +201,10 @@ public class MaintenanceController extends BladeController {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_CUSTOMER_CONFIRM.getValue());
         taskService.updateById(taskOld);
-
+        //发送消息
+        String role = "1839536982874193922";
+        User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+        messageService.saveMessage(task.getTaskCode(), "客户已经确认巡检任务完成", user.getId(), 1);
         return R.success();
     }
 

src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java

@@ -241,7 +241,7 @@ public class WorkOrderController extends BladeController {
             messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的维修单，请尽快处理", workOrder.getRepairPerson(), 2);
         }
         // todo 审核通过
-		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_ORDER_ALLOT.getName());
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_ORDER_ALLOT.getName());
         return R.success("");
     }
 
@@ -253,13 +253,13 @@ public class WorkOrderController extends BladeController {
     public R serviceReceive(@RequestBody WorkOrder workOrder) {
         WorkOrder workOrderOld = workOrderService.getById(workOrder.getId());
         workOrderOld.setReceiveOrderTime(DateUtil.now());
-		if(workOrderOld.getRepairType().equals(1)){
+        if (workOrderOld.getRepairType().equals(1)) {
             workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getValue());
             //保存日志
-			LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName());
+            LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName());
-		}else{
+        } else {
             //保存日志
-			LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_ORDER_ACCEPT.getName());
+            LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_ORDER_ACCEPT.getName());
             workOrderOld.setStatus(WorkOrderStatusEnum.WX_ORDER_ACCEPT.getValue());
         }
 
@@ -285,7 +285,7 @@ public class WorkOrderController extends BladeController {
         approvalService.save(approval);
         // todo 审核拒绝
         //保存日志
-		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_ORDER_REFUSE.getName());
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_ORDER_REFUSE.getName());
         return R.success("");
     }
 
@@ -320,7 +320,7 @@ public class WorkOrderController extends BladeController {
         messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请确认", workOrder.getInformant(), 2);
 
         //保存日志
-		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.ZG_REPAIR_PLAN_PASS.getName());
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.ZG_REPAIR_PLAN_PASS.getName());
 
         return R.success("");
     }
@@ -356,7 +356,7 @@ public class WorkOrderController extends BladeController {
         messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已通过，请尽快维修", workOrder.getRepairPerson(), 2);
         // todo 审核通过
         //保存日志
-		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_REPAIR_PLAN_PASS.getName());
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_PLAN_PASS.getName());
 
         return R.success("");
     }
@@ -383,7 +383,7 @@ public class WorkOrderController extends BladeController {
         messageService.saveMessage(workOrder.getRequirementCode(), "审批方案已驳回，请重新修改", user.getId(), 2);
         // todo 审核通过
         //保存日志
-		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_REPAIR_PLAN_REFUSE.getName());
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_PLAN_REFUSE.getName());
 
         return R.success("");
     }
@@ -396,14 +396,14 @@ public class WorkOrderController extends BladeController {
     public R servicemanRepairSubmit(@RequestBody WorkOrder workOrder) {
         WorkOrder workOrderOld = workOrderService.getById(workOrder.getId());
         workOrderOld.setCloseReason(workOrder.getCloseReason());
-        if(workOrderOld.getRepairType().equals(1)){
+        if (workOrderOld.getRepairType().equals(1)) {
             workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getValue());
             //保存日志
-			LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getName());
+            LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getName());
-		}else{
+        } else {
             workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue());
             //保存日志
-			LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_REPAIR_FINISH.getName());
+            LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_REPAIR_FINISH.getName());
         }
         workOrderService.updateById(workOrderOld);
         messageService.saveMessage(workOrder.getRequirementCode(), "维修已完成，请确认是否解决", workOrder.getInformant(), 2);
@@ -441,10 +441,11 @@ public class WorkOrderController extends BladeController {
 
         WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, DateUtil.now(), workOrder.getApproveRemark());
         approvalService.save(approval);
+        //消息发送
         messageService.saveMessage(workOrder.getRequirementCode(), "客户认为维修未完成，请尽快再次解决", workOrder.getRepairPerson(), 2);
         // todo 审核通过
         //保存日志
-		LogUtil.saveLog(workOrderOld.getRequirementCode(),"维修完成，客户审核未通过");
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), "维修完成，客户审核未通过");
 
         return R.success("");
     }
@@ -461,7 +462,7 @@ public class WorkOrderController extends BladeController {
         workOrderService.updateById(workOrderOld);
         User customer = userService.getById(workOrder.getInformant());
         messageService.saveMessage(workOrder.getRequirementCode(), "请注意维修单评价", customer.getId(), 2);
-		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_REPAIR_FINISH.getName());
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_REPAIR_FINISH.getName());
         return R.success("");
     }
 
@@ -476,7 +477,7 @@ public class WorkOrderController extends BladeController {
         workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_CLOSE.getValue());
         workOrderService.updateById(workOrderOld);
         //保存日志
-		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_ORDER_CLOSE.getName());
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_ORDER_CLOSE.getName());
         return R.success("");
     }
 
@@ -561,7 +562,7 @@ public class WorkOrderController extends BladeController {
      */
     @GetMapping("/find-list-by-device-id")
     public R<List<WorkOrder>> findListByDeviceId(Long deviceId) {
-		List<WorkOrder> list = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getDeviceId,deviceId).eq(BaseEntity::getIsDeleted,0));
+        List<WorkOrder> list = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getDeviceId, deviceId).eq(BaseEntity::getIsDeleted, 0));
         return R.data(list);
     }
 
@@ -585,8 +586,10 @@ public class WorkOrderController extends BladeController {
 
         // todo 审核通过
         //保存日志
-		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_REPAIR_CONFIRM.getName());
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_CONFIRM.getName());
 
+        //消息发送
+        messageService.saveMessage(workOrder.getRequirementCode(), "客户审核维修成果已通过，请尽快补填维修方案和物料相关", workOrder.getRepairPerson(), 2);
         return R.success("");
     }
 
@@ -610,7 +613,10 @@ public class WorkOrderController extends BladeController {
 
         // todo 审核通过
         //保存日志
-		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName());
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName());
+
+        //消息发送
+        messageService.saveMessage(workOrder.getRequirementCode(), "客户对维修成功不满意，请尽快再次维修", workOrder.getRepairPerson(), 2);
 
         return R.success("");
     }

src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java

@@ -241,6 +241,5 @@ public class WorkOrder extends BaseEntity {
     /**
      * 维修类型 1紧急维修 2故障维修 3改造需求
      */
-	private Integer repairType;
 
 }

src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java

@@ -151,7 +151,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             // 保存附件
             saveFiles(workOrder.getVideoAttaches(), workOrder.getPicAttaches(), workOrder.getId());
             //保存日志
-            LogUtil.saveLog(workOrder.getRequirementCode(),user.getName()+"提交,待客服处理。");
+            LogUtil.saveLog(workOrder.getRequirementCode(), user.getName() + "提交,待客服处理。");
         }
         return save;
     }
@@ -265,7 +265,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public void repairPlanSubmit(WorkOrder workOrder) {
         // 修改工单状态
         WorkOrder workOrderOld = this.getById(workOrder.getId());
-        if(workOrderOld.getRepairType().equals(1)){
+        if (workOrderOld.getRepairType().equals(1)) {
             workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_PLAN_SUBMIT_AFTER.getValue());
             //保存日志
             LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_REPAIR_PLAN_SUBMIT_AFTER.getName());
@@ -279,8 +279,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             //发送消息给主管
             String role = "1839537055389515777";
             User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+            if (workOrder.getRepairType() == 1) {
+                messageService.saveMessage(workOrder.getRequirementCode(), "维修方案及物料相关已补交，请评价", user.getId(), 2);
+            } else {
                 messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请审批", user.getId(), 2);
             }
+        }
         this.updateById(workOrderOld);
     }
 
@@ -305,7 +309,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         messageService.saveMessage(workOrder.getRequirementCode(), "维修方案审批未通过，请重新提交方案", workOrder.getRepairPerson(), 2);
 
         //保存日志
-        LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.ZG_REPAIR_PLAN_REFUSE.getName());
+        LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.ZG_REPAIR_PLAN_REFUSE.getName());
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -328,10 +332,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         // 若未产生费用，直接关闭工单
         if (workOrderOld.getDiscountPrice() == null || workOrderOld.getDiscountPrice() == 0) {
             workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_CLOSE.getValue());
-            LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_ORDER_CLOSE.getName());
+            LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_ORDER_CLOSE.getName());
         } else {
             workOrderOld.setStatus(WorkOrderStatusEnum.KH_EVALUATE_FINISH.getValue());
-            LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_EVALUATE_FINISH.getName());
+            LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_EVALUATE_FINISH.getName());
         }
         this.updateById(workOrderOld);
 
@@ -342,6 +346,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_WORKING, workOrder.getDeviceId());
         String role = "1839536982874193922";
         User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+        //消息发送
         messageService.saveMessage(workOrder.getRequirementCode(), "已完成维修，请确认客户是否付款", user.getId(), 2);
 
     }