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

@@ -21,10 +21,11 @@ import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlan;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail;
-import org.springblade.modules.business.service.*;
+import org.springblade.modules.business.service.IMaintenanceApplyGoodsService;
+import org.springblade.modules.business.service.IMaintenancePlanService;
+import org.springblade.modules.business.service.IMaintenanceTaskDetailService;
+import org.springblade.modules.business.service.IMaintenanceTaskService;
 import org.springblade.modules.business.sms.SmsService;
-import org.springblade.modules.system.pojo.entity.User;
-import org.springblade.modules.system.service.IUserService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -50,8 +51,6 @@ public class MaintenanceController extends BladeController {
     private final IMaintenanceTaskDetailService taskDetailService;
     private final IMaintenanceApplyGoodsService maintenanceApplyGoodsService;
     private final SmsService smsService;
-    private final IMessageService messageService;
-    private final IUserService userService;
 
     /*---------- 维修计划开始 ----------*/
 
@@ -138,7 +137,7 @@ public class MaintenanceController extends BladeController {
         taskOld.setServicemanName(task.getServicemanName());
         taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SUPERVISOR_CONFIRM.getValue());
         taskService.updateById(taskOld);
-        smsService.sendSms("15053473693", "张迪");
+        smsService.sendSms("17852327323", "靳娜");
         return R.success();
     }
 
@@ -188,10 +187,7 @@ public class MaintenanceController extends BladeController {
         taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SERVICEMAN_SUBMIT.getValue());
         taskOld.setFinishTime(DateUtil.now());
         taskService.updateById(taskOld);
-        List<User> deptPersonList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, task.getDeptId()));
+
-        for (User deptPerson : deptPersonList) {
-            messageService.saveMessage(task.getTaskCode(), "维修已完成，请确认", deptPerson.getId(), 1);
-        }
         return R.success();
     }
 
@@ -201,10 +197,7 @@ 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();
     }
 
@@ -284,9 +277,6 @@ public class MaintenanceController extends BladeController {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_SUBMIT.getValue());
         taskService.updateById(taskOld);
-        String role = "1839537055389515777";
-        User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
-        messageService.saveMessage(task.getTaskCode(), "维修方案已提交，请进行审核", user.getId(), 1);
         return R.success();
     }
 
@@ -296,10 +286,7 @@ public class MaintenanceController extends BladeController {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SUPERVISOR_CONFIRM.getValue());
         taskService.updateById(taskOld);
-        List<User> userList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, task.getDeptId()));
+
-        for (User user : userList) {
-            messageService.saveMessage(task.getTaskCode(), "维修方案已提交，请确认", user.getId(), 1);
-        }
         return R.success();
     }
 
@@ -314,7 +301,7 @@ public class MaintenanceController extends BladeController {
         taskOld.setApproveRemark(task.getApproveRemark());
         taskOld.setRepairStatus(MaintenanceStatusEnum.SUPERVISOR_CONFIRM_REFUSE.getValue());
         taskService.updateById(taskOld);
-        messageService.saveMessage(task.getTaskCode(), "维修方案已被驳回，请重新提交维修方案", task.getServicemanId(), 1);
+
         return R.success();
     }
 
@@ -351,10 +338,7 @@ public class MaintenanceController extends BladeController {
         taskOld.setApproveRemark(task.getApproveRemark());
         taskOld.setRepairStatus(MaintenanceStatusEnum.CUSTOMER_CONFIRM_REFUSE.getValue());
         taskService.updateById(taskOld);
-        //发送消息
+
-        String role = "1847220301770326017";
-        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

@@ -235,11 +235,8 @@ public class WorkOrderController extends BladeController {
         workOrderOld.setCustomerOpinion(workOrder.getCustomerOpinion());
         workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_ALLOT.getValue());
         workOrderService.updateById(workOrderOld);
-        if (workOrder.getRepairType() == 1) {
+        User repairPerson = userService.getById(workOrder.getRepairPerson());
-            messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的紧急维修单，请火速处理", workOrder.getRepairPerson(), 2);
+        messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的维修单，请尽快处理", repairPerson.getId(), 2);
-        } else {
-            messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的维修单，请尽快处理", workOrder.getRepairPerson(), 2);
-        }
         // todo 审核通过
 		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_ORDER_ALLOT.getName());
         return R.success("");
@@ -441,7 +438,6 @@ 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 审核通过
 		//保存日志
@@ -588,8 +584,6 @@ public class WorkOrderController extends BladeController {
 		//保存日志
 		LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_REPAIR_CONFIRM.getName());
 
-        //消息发送
-        messageService.saveMessage(workOrder.getRequirementCode(), "客户审核维修成果已通过，请尽快补填维修方案和物料相关", workOrder.getRepairPerson(), 2);
 		return R.success("");
 	}
 
@@ -615,9 +609,6 @@ public class WorkOrderController extends BladeController {
 		//保存日志
 		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

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

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

@@ -279,12 +279,8 @@ 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);
     }
 
@@ -346,7 +342,6 @@ 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);
 
     }