From 2d9f1f41744f49377a7ec930635d4889b9d355c6 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 01 四月 2025 16:04:00 +0800
Subject: [PATCH] fix: 修改设备添加逻辑
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 7a585c7..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
@@ -3,11 +3,17 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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;
@@ -35,6 +41,7 @@
public class PurchaseWinningLetterController {
private final PurchaseWinningLetterService purchaseWinningLetterService;
+ private final JcMaxSizeService maxSizeService;
/**
* 鍒嗛〉鏌ヨ
@@ -47,6 +54,9 @@
@PreAuthorize("@pms.hasPermission('device_purchaseWinningLetter_view')" )
public R getPurchaseWinningLetterPage(@ParameterObject Page page, @ParameterObject PurchaseWinningLetterEntity purchaseWinningLetter) {
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.orderByDesc(PurchaseWinningLetterEntity::getCreateTime);
return R.ok(purchaseWinningLetterService.page(page, wrapper));
}
@@ -73,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);
}
/**
@@ -115,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