1.添加巡检计划转维保单和报修单转维保单

src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java

@@ -61,10 +61,10 @@ public class DeviceInspectOrderEntity {
     private Integer status;
 
     /**
-     * 设备状态（0：异常；2：正常）
+     * 设备状态（0：异常；1：正常）
      */
     @TableField(value = "deviceStatus")
-    private String deviceStatus;
+    private Integer deviceStatus;
 
     /**
      * 创建人

src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java

@@ -41,7 +41,7 @@ public class AddDeviceInspectOrderRequest {
     /**
      * 设备状态（0：异常；1：正常）
      */
-    private String deviceStatus;
+    private Integer deviceStatus;
 
     /**
      * 养护说明

src/main/java/com/glxp/api/res/inv/DeviceInspectOrderResponse.java

@@ -50,7 +50,7 @@ public class DeviceInspectOrderResponse {
     /**
      * 设备状态（0：异常；1：正常）
      */
-    private String deviceStatus;
+    private Integer deviceStatus;
 
     /**
      * 创建人

src/main/java/com/glxp/api/service/inv/DeviceInspectOrderService.java

@@ -62,4 +62,20 @@ public interface DeviceInspectOrderService {
      */
     BaseResponse deleteOrder(String id);
 
+    /**
+     * 根据报修单号生成新的维保单
+     *
+     * @param repairOrderId
+     * @return
+     */
+    BaseResponse addByRepairOrderId(String repairOrderId);
+
+    /**
+     * 根据巡检计划单号生成新的维保单
+     *
+     * @param planOrderId
+     * @return
+     */
+    BaseResponse addByPlanOrderId(String planOrderId);
+
 }

src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java

@@ -7,7 +7,11 @@ 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.dao.inv.DeviceInspectPlanDao;
+import com.glxp.api.dao.inv.DeviceRepairOrderDao;
 import com.glxp.api.entity.inv.DeviceInspectOrderEntity;
+import com.glxp.api.entity.inv.DeviceInspectPlanEntity;
+import com.glxp.api.entity.inv.DeviceRepairOrderEntity;
 import com.glxp.api.req.inv.AddDeviceInspectOrderRequest;
 import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest;
 import com.glxp.api.res.inv.DeviceInspectOrderResponse;
@@ -35,6 +39,10 @@ public class DeviceInspectOrderServiceImpl implements DeviceInspectOrderService
     private CustomerService customerService;
     @Resource
     private GennerOrderUtils gennerOrderUtils;
+    @Resource
+    private DeviceRepairOrderDao deviceRepairOrderDao;
+    @Resource
+    private DeviceInspectPlanDao deviceInspectPlanDao;
 
     @Override
     public List<DeviceInspectOrderResponse> filterList(FilterDeviceInspectOrderRequest deviceInspectOrderRequest) {
@@ -109,4 +117,42 @@ public class DeviceInspectOrderServiceImpl implements DeviceInspectOrderService
         deviceInspectOrderDao.deleteById(id);
         return ResultVOUtils.success();
     }
+
+    @Override
+    public BaseResponse addByRepairOrderId(String repairOrderId) {
+        //查询报修单信息
+        DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(repairOrderId);
+        DeviceInspectOrderEntity orderEntity = new DeviceInspectOrderEntity();
+        orderEntity.setCode(deviceRepairOrderEntity.getCode());
+        orderEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode());
+        orderEntity.setInvCode(deviceRepairOrderEntity.getInvCode());
+        orderEntity.setStatus(0); //状态：新增
+        orderEntity.setType(1); //维保类型：报修
+        orderEntity.setDeviceStatus(1); //设备状态：正常
+        orderEntity.setLastOrderId(repairOrderId);
+        orderEntity.setCreateTime(new Date());
+        orderEntity.setUpdateTime(new Date());
+        orderEntity.setCreateUser(customerService.getUserIdStr());
+        deviceInspectOrderDao.insert(orderEntity);
+        return ResultVOUtils.success();
+    }
+
+    @Override
+    public BaseResponse addByPlanOrderId(String planOrderId) {
+        //查询报修单信息
+        DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(planOrderId);
+        DeviceInspectOrderEntity orderEntity = new DeviceInspectOrderEntity();
+        orderEntity.setCode(deviceInspectPlanEntity.getCode());
+        orderEntity.setDeptCode(deviceInspectPlanEntity.getDeptCode());
+        orderEntity.setInvCode(deviceInspectPlanEntity.getInvCode());
+        orderEntity.setStatus(0); //状态：新增
+        orderEntity.setType(1); //维保类型：计划
+        orderEntity.setDeviceStatus(1); //设备状态：正常
+        orderEntity.setLastOrderId(planOrderId);
+        orderEntity.setCreateTime(new Date());
+        orderEntity.setUpdateTime(new Date());
+        orderEntity.setCreateUser(customerService.getUserIdStr());
+        deviceInspectOrderDao.insert(orderEntity);
+        return ResultVOUtils.success();
+    }
 }

src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java

@@ -12,6 +12,7 @@ import com.glxp.api.req.inv.AddDeviceInspectPlanRequest;
 import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest;
 import com.glxp.api.res.inv.DeviceInspectPlanResponse;
 import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.inv.DeviceInspectOrderService;
 import com.glxp.api.service.inv.DeviceInspectPlanService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
@@ -35,6 +36,8 @@ public class DeviceInspectPlanServiceImpl implements DeviceInspectPlanService {
     private CustomerService customerService;
     @Resource
     private GennerOrderUtils gennerOrderUtils;
+    @Resource
+    private DeviceInspectOrderService deviceInspectOrderService;
 
     @Override
     public List<DeviceInspectPlanResponse> filterList(FilterDeviceInspectPlanRequest filterDeviceInspectPlanRequest) {
@@ -92,8 +95,8 @@ public class DeviceInspectPlanServiceImpl implements DeviceInspectPlanService {
         deviceInspectPlanEntity.setStatus(status);
         deviceInspectPlanEntity.setUpdateTime(new Date());
         if (status == 2) {
-            //TODO 审核通过后生成设备维保单
+            //审核通过，生成维保单
-            //审核通过
+            deviceInspectOrderService.addByPlanOrderId(orderId);
             deviceInspectPlanEntity.setAuditTime(new Date());
             deviceInspectPlanEntity.setAuditUser(customerService.getUserIdStr());
         }

src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.glxp.api.req.inv.AddDeviceRepairOrderRequest;
 import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest;
 import com.glxp.api.res.inv.DeviceRepairOrderResponse;
 import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.inv.DeviceInspectOrderService;
 import com.glxp.api.service.inv.DeviceRepairOrderService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
@@ -35,6 +36,8 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
     private CustomerService customerService;
     @Resource
     private GennerOrderUtils gennerOrderUtils;
+    @Resource
+    private DeviceInspectOrderService deviceInspectOrderService;
 
     @Override
     public List<DeviceRepairOrderResponse> filterList(FilterDeviceRepairOrderRequest filterDeviceRepairOrderRequest) {
@@ -92,7 +95,8 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
         deviceRepairOrderEntity.setStatus(status);
         Date date = new Date();
         if (status == 2) {
-            //审核通过 TODO 保修单审核通过，生成维保单
+            //审核通过，生成维保单
+            deviceInspectOrderService.addByRepairOrderId(orderId);
             deviceRepairOrderEntity.setAuditUser(customerService.getUserIdStr());
             deviceRepairOrderEntity.setAuditTime(date);
         }