通知信息开发

master
薛宏祥 1 year ago
parent 1838a85a22
commit dd4342dd35
  1. 12
      src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java
  2. 3
      src/main/java/org/springblade/modules/business/pojo/entity/Message.java
  3. 2
      src/main/java/org/springblade/modules/business/service/IMessageService.java
  4. 1
      src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java
  5. 2
      src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java

@ -27,6 +27,8 @@ 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;
@ -57,6 +59,10 @@ public class WorkOrderController extends BladeController {
private final IWorkOrderFlowService flowService;
private final IUserService userService;
private final IMessageService messageService;
/**
* 查询工作订单列表
@ -172,7 +178,6 @@ public class WorkOrderController extends BladeController {
@ApiLog(value = "提报管理-保存工单并提交")
@PostMapping("/customer-save")
public R customerSave(@RequestBody List<WorkOrderVO> workOrder) {
;
return R.status(workOrderService.saveAndSubmit(workOrder));
}
@ -226,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("");
@ -413,7 +420,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("");
}

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

@ -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);

@ -30,6 +30,7 @@ public class MessageServiceImpl extends BaseServiceImpl<MessageMapper, Message>
@Override
public void saveMessage(String requirementCode, String content, Long messageUser, Integer messageType) {
Message saveInformation = new Message();
saveInformation.setRequirementCode(requirementCode);
saveInformation.setSystemType("1");
saveInformation.setTitle("需求单");
saveInformation.setContent(content);

@ -133,7 +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(), 1);
messageService.saveMessage(code, "您有一个需求单需要处理", customerService.getId(), 2);
workOrder.setFillingTime(now);
workOrder.setRequirementCode(code);
// 待接单

Loading…
Cancel
Save