From 7911497ffa51bd41fc334153b2a456ff02554747 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 01 四月 2025 15:20:37 +0800
Subject: [PATCH] 整体流程测试修改0401-2
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
index b894a96..9b2fe48 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
@@ -8,9 +8,12 @@
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.entity.DeviceManufacturer;
import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
import com.by4cloud.platformx.device.entity.PurchaseWinningLetterEntity;
+import com.by4cloud.platformx.device.service.JcMaxSizeService;
import com.by4cloud.platformx.device.service.PurchaseWinningLetterService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
@@ -38,6 +41,7 @@
public class PurchaseWinningLetterController {
private final PurchaseWinningLetterService purchaseWinningLetterService;
+ private final JcMaxSizeService maxSizeService;
/**
* 鍒嗛〉鏌ヨ
@@ -52,7 +56,7 @@
LambdaQueryWrapper<PurchaseWinningLetterEntity> wrapper = Wrappers.lambdaQuery();
wrapper.like(StringUtils.isNotEmpty(purchaseWinningLetter.getPurchasePlanCode()), PurchaseWinningLetterEntity::getPurchasePlanCode,purchaseWinningLetter.getPurchasePlanCode());
wrapper.like(StringUtils.isNotEmpty(purchaseWinningLetter.getWinningCode()), PurchaseWinningLetterEntity::getWinningCode,purchaseWinningLetter.getWinningCode());
- wrapper.orderBy(true,false, PurchaseWinningLetterEntity::getCreateTime);
+ wrapper.orderByDesc(PurchaseWinningLetterEntity::getCreateTime);
return R.ok(purchaseWinningLetterService.page(page, wrapper));
}
@@ -79,7 +83,8 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('device_purchaseWinningLetter_add')" )
public R save(@RequestBody PurchaseWinningLetterEntity purchaseWinningLetter) {
- return R.ok(purchaseWinningLetterService.save(purchaseWinningLetter));
+ purchaseWinningLetter.setWinningCode(maxSizeService.nextNo(MaxSizeContant.WINNING_CODE));
+ return purchaseWinningLetterService.saveNew(purchaseWinningLetter);
}
/**
@@ -121,4 +126,13 @@
public List<PurchaseWinningLetterEntity> export(PurchaseWinningLetterEntity purchaseWinningLetter,Long[] ids) {
return purchaseWinningLetterService.list(Wrappers.lambdaQuery(purchaseWinningLetter).in(ArrayUtil.isNotEmpty(ids), PurchaseWinningLetterEntity::getId, ids));
}
+
+ /**
+ * 鑾峰彇涓嬫媺鍒楄〃
+ * @return
+ */
+ @GetMapping("/getDropdownnList")
+ public R<List<PurchaseWinningLetterEntity>> getDropdownnList() {
+ return R.ok(purchaseWinningLetterService.list());
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1