diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/workorder/entity/WorkOrderEntity.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/workorder/entity/WorkOrderEntity.java index 1ca68af..562af64 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/workorder/entity/WorkOrderEntity.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/workorder/entity/WorkOrderEntity.java @@ -1,5 +1,6 @@ package com.nu.modules.workorder.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -53,4 +54,8 @@ public class WorkOrderEntity implements Serializable { private String email; /**工单类型 1平台构建*/ private String workType; + private java.lang.String netUrl; + private java.lang.String accountNo; + private java.lang.String passwordText; + private java.lang.String orgTel; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java index 3732e55..6877324 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java @@ -100,9 +100,18 @@ public class WorkOrderController extends JeecgController edit(@RequestBody WorkOrder workOrder) { - workOrderService.updateMqById(workOrder); + workOrderService.updateById(workOrder); return Result.OK("提交成功!"); } + + + @AutoLog(value = "工单表-反馈") + @ApiOperation(value="工单表-反馈", notes="工单表-反馈") + @RequestMapping(value = "/updateMqById", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result updateMqById(@RequestBody WorkOrder workOrder) { + workOrderService.updateMqById(workOrder); + return Result.OK("提交成功!"); + } /** * 通过id删除 diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/entity/WorkOrder.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/entity/WorkOrder.java index 49d6738..10d05da 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/entity/WorkOrder.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/entity/WorkOrder.java @@ -116,4 +116,13 @@ public class WorkOrder implements Serializable { @Excel(name = "工单类型", width = 15) @ApiModelProperty(value = "工单类型") private java.lang.String workType; + + @ApiModelProperty(value = "访问地址") + private java.lang.String netUrl; + @ApiModelProperty(value = "账号") + private java.lang.String accountNo; + @ApiModelProperty(value = "密码") + private java.lang.String passwordText; + @ApiModelProperty(value = "机构负责人电话") + private java.lang.String orgTel; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/orginfo/listener/OrgInfoMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/orginfo/listener/OrgInfoMQListener.java index cc96dd4..3b8e2fe 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/orginfo/listener/OrgInfoMQListener.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/orginfo/listener/OrgInfoMQListener.java @@ -130,6 +130,7 @@ public class OrgInfoMQListener { workOrderEntity.setTel(dto.getOperateTelephone()); workOrderEntity.setEmail(dto.getOperateEmail()); workOrderEntity.setWorkType("1");//1平台构建 + workOrderEntity.setOrgTel(dto.getTel()); workOrderApi.createWorkOrder(workOrderEntity); } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java index 271e0e6..66be8ea 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java @@ -53,4 +53,7 @@ public class WorkOrderMQDto implements Serializable { private String email; /**状态 1平台构建*/ private String workType; + private java.lang.String netUrl; + private java.lang.String accountNo; + private java.lang.String passwordText; }