From 608f0d2c05d86510d546a362e44c10feb601b3f1 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 08 四月 2025 08:19:10 +0800
Subject: [PATCH] 优化项优化
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java | 7 +++++--
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java | 1 +
platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml | 1 +
platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml | 1 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java | 2 ++
5 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java
index 9c25d1a..a1c9a82 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java
+++ b/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));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
index f43eafa..38abc15 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
+++ b/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);
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java
index 20754f8..8ebf5de 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java
+++ b/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;
}
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml
index 460e9fa..4b53857 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
index 6137855..184a360 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
+++ b/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>
\ No newline at end of file
--
Gitblit v1.9.1