platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java
@@ -154,6 +154,7 @@ public R getDeviceList(@PathVariable("deviceId")Long deviceId) { QueryWrapper<DeviceInventory> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("device_id",deviceId); queryWrapper.eq("inventory_status","1"); return R.ok(deviceInventoryService.list(queryWrapper)); } platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
@@ -8,6 +8,7 @@ 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.common.security.util.SecurityUtils; import com.by4cloud.platformx.device.constant.MaxSizeContant; import com.by4cloud.platformx.device.entity.DeviceLeasingLedger; import com.by4cloud.platformx.device.service.DeviceLeasingLedgerService; @@ -83,6 +84,7 @@ @PreAuthorize("@pms.hasPermission('device_deviceLeasingLedger_add')" ) public R save(@RequestBody DeviceLeasingLedger deviceLeasingLedger) { deviceLeasingLedger.setLedgerCode(maxSizeService.nextNo(MaxSizeContant.LEDGER_CODE)); deviceLeasingLedger.setLesseeContractId(SecurityUtils.getUser().getCompId()); return deviceLeasingLedgerService.saveDeep(deviceLeasingLedger); } platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java
@@ -32,11 +32,14 @@ public boolean complete(Long id) { PurchaseTendrOrderEntity orderEntity = baseMapper.selectById(id); PurchaseWinningLetterEntity entity = BeanUtil.copyProperties(orderEntity, PurchaseWinningLetterEntity.class); entity.setId(null); entity.setOrderId(id); entity.setWinningName(orderEntity.getOrderName()+"中标通知单"); entity.setWinningCode(maxSizeService.nextNo(MaxSizeContant.WINNING_CODE)); entity.setWinningPrice(orderEntity.getEstimatePrice()); entity.setTotalWinningAmount(orderEntity.getTotalPlanndAmount()); purchaseWinningLetterMapper.insert(entity); orderEntity.setStatus("2"); orderEntity.setStatus("3"); baseMapper.updateById(orderEntity); return true; } @@ -50,7 +53,7 @@ @Override public boolean approved(Long id) { PurchaseTendrOrderEntity orderEntity = baseMapper.selectById(id); orderEntity.setStatus("1"); orderEntity.setStatus("2"); baseMapper.updateById(orderEntity); return true; } platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml
@@ -40,5 +40,6 @@ <if test="queryDTO.serialNo != null and queryDTO.serialNo !=''"> and dr.serial_no like CONCAT('%', #{queryDTO.serialNo}, '%') </if> order by dr.create_time desc </select> </mapper> platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
@@ -38,5 +38,6 @@ <if test="queryDTO.serialNo != null and queryDTO.serialNo !=''"> and ds.serial_no like CONCAT('%', #{queryDTO.serialNo}, '%') </if> order by ds.create_time desc </select> </mapper>