1.调整维保单相关代码

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;

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;
+
 }

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;
 

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;
 

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