设备采购计划与设备照片

shiyunteng

9 天以前 cc59b65bc63b839127c29775bcd410dd407de66d

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

@@ -15,6 +15,7 @@
import com.by4cloud.platformx.device.constant.MaxSizeContant;
import com.by4cloud.platformx.device.entity.Device;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.entity.InvestmentPlan;
import com.by4cloud.platformx.device.service.DeviceInventoryService;
import com.by4cloud.platformx.device.service.DeviceService;
import com.by4cloud.platformx.device.service.JcMaxSizeService;
@@ -28,6 +29,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.List;
import java.util.Objects;

@@ -62,10 +64,12 @@
      wrapper.eq(Device::getReqStatus,1);
      wrapper.like(StrUtil.isNotBlank(device.getNumber()),Device::getNumber,device.getNumber());
      wrapper.like(StrUtil.isNotBlank(device.getName()),Device::getName,device.getName());
      wrapper.orderByDesc(Device::getCreateTime);
      Page<Device> page1 = deviceService.page(page, wrapper);
      for (Device device1 : page1.getRecords()) {
         QueryWrapper<DeviceInventory> wrapper1 = new QueryWrapper<>();
         wrapper1.lambda().eq(DeviceInventory::getDeviceId,device1.getId());
         wrapper1.lambda().eq(DeviceInventory::getDeviceId,device1.getId())
               .eq(DeviceInventory::getInventoryStatus,1);
         long count = inventoryService.count(wrapper1);
         device1.setNum(Integer.parseInt(count+""));
      }
@@ -155,6 +159,7 @@
         return R.ok(deviceService.save(device));
      }
      device.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_NUM));
      device.setReleaseDate(new Date());
      return R.ok(deviceService.save(device));
    }

@@ -181,7 +186,12 @@
    @PutMapping
    @PreAuthorize("@pms.hasPermission('platformx_device_edit')" )
    public R updateById(@RequestBody Device device) {
        return R.ok(deviceService.updateById(device));
      Device byId = deviceService.getById(device.getId());
      if(StringUtils.isNotBlank(byId.getNumber())){
         byId.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_NUM));
         byId.setReleaseDate(new Date());
      }
      return R.ok(deviceService.updateById(device));
    }

    /**
@@ -210,4 +220,13 @@
    public List<Device> export(Device device,Long[] ids) {
        return deviceService.list(Wrappers.lambdaQuery(device).in(ArrayUtil.isNotEmpty(ids), Device::getId, ids));
    }

   /**
    * 所有设备下拉
    * @return
    */
   @GetMapping("/getDropdowmList" )
   public R getDeviceList() {
      return R.ok(deviceService.list());
   }
}