From d1e932c8ae1a7f9d557e48469bfe0ecc4c0b741c Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 29 Mar 2023 16:32:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E7=BB=B4=E4=BF=9D=E5=8D=95?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/entity/inv/DeviceInspectOrderEntity.java | 2 +- .../glxp/api/req/inv/AddDeviceInspectOrderRequest.java | 9 +++++++-- .../api/req/inv/FilterDeviceInspectOrderRequest.java | 2 +- .../com/glxp/api/res/inv/DeviceInspectOrderResponse.java | 4 ++-- .../service/inv/impl/DeviceInspectOrderServiceImpl.java | 8 ++++++++ 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java index ec961d27c..67f6cd5cf 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java @@ -49,7 +49,7 @@ public class DeviceInspectOrderEntity { private String lastOrderId; /** - * 维保类型（1：报修；2：计划） + * 维保类型（1：报修；2：计划；3：手动） */ @TableField(value = "`type`") private Integer type; diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java b/src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java index 0640359cc..2921bab9b 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java @@ -29,12 +29,12 @@ public class AddDeviceInspectOrderRequest { private String lastOrderId; /** - * 维保类型（1：报修；2：计划） + * 维保类型（1：报修；2：计划；3：手动） */ private Integer type; /** - * 状态（1：新增；2：未审核；3：已审核） + * 状态（0：新增；1：未审核；2：已审核） */ private Integer status; @@ -43,4 +43,9 @@ public class AddDeviceInspectOrderRequest { */ private String deviceStatus; + /** + * 养护说明 + */ + private String remark; + } diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java index fc51d36b9..13fa15a8e 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java @@ -47,7 +47,7 @@ public class FilterDeviceInspectOrderRequest extends ListPageRequest { private Integer status; /** - * 设备状态（0：异常；2：正常） + * 设备状态（0：异常；1：正常） */ private Integer deviceStatus; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceInspectOrderResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceInspectOrderResponse.java index 0f7f57af5..a0e7d65e4 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceInspectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inv/DeviceInspectOrderResponse.java @@ -38,7 +38,7 @@ public class DeviceInspectOrderResponse { private String lastOrderId; /** - * 维保类型（1：报修；2：计划） + * 维保类型（1：报修；2：计划；3：手动） */ private Integer type; @@ -48,7 +48,7 @@ public class DeviceInspectOrderResponse { private Integer status; /** - * 设备状态（0：异常；2：正常） + * 设备状态（0：异常；1：正常） */ private String deviceStatus; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java index 8123a24af..1912a1cfa 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.Constant; import com.glxp.api.dao.inv.DeviceInspectOrderDao; import com.glxp.api.entity.inv.DeviceInspectOrderEntity; import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; @@ -12,6 +13,8 @@ import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest; import com.glxp.api.res.inv.DeviceInspectOrderResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inv.DeviceInspectOrderService; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,6 +33,8 @@ public class DeviceInspectOrderServiceImpl implements DeviceInspectOrderService private DeviceInspectOrderDao deviceInspectOrderDao; @Resource private CustomerService customerService; + @Resource + private GennerOrderUtils gennerOrderUtils; @Override public List filterList(FilterDeviceInspectOrderRequest deviceInspectOrderRequest) { @@ -47,6 +52,9 @@ public class DeviceInspectOrderServiceImpl implements DeviceInspectOrderService DeviceInspectOrderEntity deviceInspectOrderEntity = new DeviceInspectOrderEntity(); BeanUtil.copyProperties(addDeviceInspectOrderRequest, deviceInspectOrderEntity); Date date = new Date(); + String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_ORDER, "yyyyMMdd")); + deviceInspectOrderEntity.setOrderId(orderId); + deviceInspectOrderEntity.setStatus(0); deviceInspectOrderEntity.setCreateUser(customerService.getUserIdStr()); deviceInspectOrderEntity.setAuditUser(customerService.getUserIdStr()); deviceInspectOrderEntity.setCreateTime(date);