From dc0dc216eec524e67ce19f820d2501a3798fcfe0 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 28 三月 2025 16:49:45 +0800
Subject: [PATCH] fix: 年度投资计划
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
index cb36a54..85732b8 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
@@ -8,7 +8,9 @@
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.MaxSizeContant;
import com.by4cloud.platformx.device.entity.Contract;
+import com.by4cloud.platformx.device.service.JcMaxSizeService;
import com.by4cloud.platformx.device.service.PurchaseTendrOrderService;
import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
import com.by4cloud.platformx.device.service.PurchaseTendrOrderService;
@@ -39,6 +41,7 @@
public class PurchaseTendrOrderController {
private final PurchaseTendrOrderService purchaseTendrOrderService;
+ private final JcMaxSizeService jcMaxSizeService;
/**
* 鍒嗛〉鏌ヨ
@@ -52,7 +55,7 @@
public R getPurchaseTendrOrderPage(@ParameterObject Page page, @ParameterObject PurchaseTendrOrderEntity purchaseTendrOrder) {
LambdaQueryWrapper<PurchaseTendrOrderEntity> wrapper = Wrappers.lambdaQuery();
wrapper.like(StringUtils.isNotEmpty(purchaseTendrOrder.getPurchasePlanCode()),PurchaseTendrOrderEntity::getPurchasePlanCode,purchaseTendrOrder.getPurchasePlanCode());
- wrapper.orderBy(true,false, PurchaseTendrOrderEntity::getCreateTime);
+ wrapper.orderByDesc(PurchaseTendrOrderEntity::getCreateTime);
return R.ok(purchaseTendrOrderService.page(page, wrapper));
}
@@ -79,6 +82,7 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('platformx_purchaseTendrOrder_add')" )
public R save(@RequestBody PurchaseTendrOrderEntity purchaseTendrOrder) {
+ purchaseTendrOrder.setPurchasePlanCode(jcMaxSizeService.nextNo(MaxSizeContant.PURCHASE_PLAN_CODE));
return R.ok(purchaseTendrOrderService.save(purchaseTendrOrder));
}
@@ -134,4 +138,14 @@
public R complete(@PathVariable("id")Long id) {
return R.ok(purchaseTendrOrderService.complete(id));
}
+
+ /**
+ * 鑾峰彇鎷涙爣涓嬫媺鍒楄〃
+ * @return
+ */
+ @GetMapping("/getPurchaseRenderList" )
+ public R getPurchaseRenderList() {
+ return R.ok(purchaseTendrOrderService.getPurchaseRenderList());
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1