巡检任务 设备维修新增是否生成工单

shiyunteng

6 天以前 fc8c86e7a365d5c6bdc37c2b05b9f83115ac2bc3

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java

@@ -1,14 +1,13 @@
package com.by4cloud.platformx.device.controller;

import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.device.constant.CommonStatusContant;
import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.entity.DeviceRepair;
import com.by4cloud.platformx.device.service.DeviceRepairService;
@@ -43,17 +42,14 @@
    /**
     * 分页查询
     * @param page 分页对象
     * @param deviceRepair 设备维修
     * @param queryDTO 设备维修
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('device_deviceRepair_view')" )
    public R getDeviceRepairPage(@ParameterObject Page page, @ParameterObject DeviceRepair deviceRepair) {
        LambdaQueryWrapper<DeviceRepair> wrapper = Wrappers.lambdaQuery();
      wrapper.eq(StrUtil.isNotBlank(deviceRepair.getSerialNo()),DeviceRepair::getSerialNo,deviceRepair.getSerialNo());
      wrapper.orderByDesc(DeviceRepair::getCreateTime);
        return R.ok(deviceRepairService.page(page, wrapper));
    public R getDeviceRepairPage(@ParameterObject Page page, DeviceRepairQueryDTO queryDTO) {
        return R.ok(deviceRepairService.pageNew(page, queryDTO));
    }


@@ -79,7 +75,8 @@
    @PostMapping
    @PreAuthorize("@pms.hasPermission('device_deviceRepair_add')" )
    public R save(@RequestBody DeviceRepair deviceRepair) {
      deviceRepair.setStatus(1);
      deviceRepair.setStatus(CommonStatusContant.DEVICE_REPAIR_STATUS_PANDING_APPROVAL);
      deviceRepair.setWoFlag(CommonStatusContant.DEVICE_REPAIR_FLAG_N);
        return R.ok(deviceRepairService.save(deviceRepair));
    }

@@ -142,4 +139,13 @@
   public R complete(@PathVariable("id")Long id) {
      return deviceRepairService.complete(id);
   }

   /**
    * 设备维修完成
    * @return
    */
   @GetMapping("/genWorkOrder/{id}" )
   public R genWorkOrder(@PathVariable("id")Long id) {
      return deviceRepairService.genWorkOrder(id);
   }
}