维修流程通知消息开发

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

@@ -22,10 +22,13 @@ import org.springblade.modules.business.pojo.dto.workorder.WorkOrderDTO;
 import org.springblade.modules.business.pojo.entity.workorder.WorkOrder;
 import org.springblade.modules.business.pojo.entity.workorder.WorkOrderApproval;
 import org.springblade.modules.business.pojo.vo.workorder.WorkOrderVO;
+import org.springblade.modules.business.service.IMessageService;
 import org.springblade.modules.business.service.IWorkOrderApprovalService;
 import org.springblade.modules.business.service.IWorkOrderFlowService;
 import org.springblade.modules.business.service.IWorkOrderService;
 import org.springblade.modules.system.pojo.entity.Dept;
+import org.springblade.modules.system.pojo.entity.User;
+import org.springblade.modules.system.service.IUserService;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.BufferedReader;
@@ -56,6 +59,11 @@ public class WorkOrderController extends BladeController {
 
     private final IWorkOrderFlowService flowService;
 
+    private final IUserService userService;
+
+    private final IMessageService messageService;
+
+
     /**
      * 查询工作订单列表
      *
@@ -223,6 +231,8 @@ 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);
         // todo 审核通过
 
         return R.success("");
@@ -290,7 +300,7 @@ public class WorkOrderController extends BladeController {
 
         WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.TRUE_STR, DateUtil.now(), workOrder.getApproveRemark());
         approvalService.save(approval);
-
+        messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请确认", workOrder.getInformant(), 2);
         return R.success("");
     }
 
@@ -322,7 +332,7 @@ public class WorkOrderController extends BladeController {
 
         WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.TRUE_STR, DateUtil.now(), workOrder.getApproveRemark());
         approvalService.save(approval);
-
+        messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已通过，请尽快维修", workOrder.getRepairPerson(), 2);
         // todo 审核通过
 
         return R.success("");
@@ -345,6 +355,9 @@ public class WorkOrderController extends BladeController {
 
         WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, DateUtil.now(), workOrder.getApproveRemark());
         approvalService.save(approval);
+        String role = "1839537055389515777";
+        User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+        messageService.saveMessage(workOrder.getRequirementCode(), "审批方案已驳回，请重新修改", user.getId(), 2);
         // todo 审核通过
 
         return R.success("");
@@ -360,6 +373,7 @@ public class WorkOrderController extends BladeController {
         workOrderOld.setCloseReason(workOrder.getCloseReason());
         workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue());
         workOrderService.updateById(workOrderOld);
+        messageService.saveMessage(workOrder.getRequirementCode(), "维修已完成，请确认是否解决", workOrder.getInformant(), 2);
 
         // todo 审核通过
 
@@ -394,7 +408,7 @@ 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 审核通过
 
         return R.success("");
@@ -410,7 +424,8 @@ public class WorkOrderController extends BladeController {
         workOrderOld.setCloseReason(workOrder.getCloseReason());
         workOrderOld.setStatus(WorkOrderStatusEnum.KF_REPAIR_FINISH.getValue());
         workOrderService.updateById(workOrderOld);
-
+        User customer = userService.getById(workOrder.getInformant());
+        messageService.saveMessage(workOrder.getRequirementCode(), "请注意维修单评价", customer.getId(), 2);
         return R.success("");
     }
 

src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java

@@ -20,6 +20,9 @@ public class MaintenanceTaskDetailGoods extends BaseEntity {
     //库存id
     private String warehouseId;
 
+    //产品id
+    private String productId;
+
     //规格
     private String rule;
 

src/main/java/org/springblade/modules/business/pojo/entity/Message.java

@@ -37,4 +37,7 @@ public class Message extends BaseEntity {
 
     private Long messageUser;
 
+    //需求单号
+    private String requirementCode;
+
 }

src/main/java/org/springblade/modules/business/service/IMessageService.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 public interface IMessageService extends BaseService<Message> {
 
-    void saveMessage(String title, String content, Long messageUser, Integer messageType);
+    void saveMessage(String requirementCode, String content, Long messageUser, Integer messageType);
 
 
     PageVO getMessageList(Integer current, Integer size, LocalDate start, LocalDate end, Integer status);

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

@@ -22,16 +22,17 @@ public class MessageServiceImpl extends BaseServiceImpl<MessageMapper, Message>
     /**
      * 保存消息
      *
-     * @param title
+     * @param requirementCode
      * @param content
      * @param messageUser
      * @param messageType
      */
     @Override
-    public void saveMessage(String title, String content, Long messageUser, Integer messageType) {
+    public void saveMessage(String requirementCode, String content, Long messageUser, Integer messageType) {
         Message saveInformation = new Message();
+        saveInformation.setRequirementCode(requirementCode);
         saveInformation.setSystemType("1");
-        saveInformation.setTitle(title);
+        saveInformation.setTitle("需求单");
         saveInformation.setContent(content);
         saveInformation.setMessageUser(messageUser);
         saveInformation.setTenantId(AuthUtil.getTenantId());

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

@@ -118,6 +118,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     @Transactional(rollbackFor = Exception.class)
     @Synchronized
     public boolean saveAndSubmit(List<WorkOrderVO> workOrders) {
+        String role = "1839536982874193922";
+        User customerService = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
         Date now = DateUtil.date();
         String todayStr = format.format(now);
@@ -131,6 +133,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             // 查询今天已提报数量
             String hz = count < 9 ? "0" + (count + 1) : count + 1 + "";
             String code = "WX-" + todayStr + "-" + hz;
+            messageService.saveMessage(code, "您有一个需求单需要处理", customerService.getId(), 2);
             workOrder.setFillingTime(now);
             workOrder.setRequirementCode(code);
             // 待接单
@@ -263,6 +266,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
         // 更新设备状态为故障
         deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_BREAKDOWN, workOrder.getDeviceId());
+        //发送消息给主管
+        String role = "1839537055389515777";
+        User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+        messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请审批", user.getId(), 2);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -283,6 +290,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
         // 更新设备状态为运行中
         deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_WORKING, workOrder.getDeviceId());
+        messageService.saveMessage(workOrder.getRequirementCode(), "维修方案审批未通过，请重新提交方案", workOrder.getRepairPerson(), 2);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -315,6 +323,10 @@ 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);
+
     }
 
     private void saveFiles(List<WorkOrderAttach> videoAttaches, List<WorkOrderAttach> picAttaches, Long orderId) {