From 4983e2cda34c65a05ab9ba3fe51feadaedc4996c Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 09 四月 2025 11:10:21 +0800
Subject: [PATCH] 年度计划 申请部门为空 一年只有一次年度和调整计划
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 db13e6d..e790780 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
@@ -9,10 +9,8 @@
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.dto.PurchaseWinningLetterQueryDTO;
+import com.by4cloud.platformx.device.entity.*;
import com.by4cloud.platformx.device.service.JcMaxSizeService;
import com.by4cloud.platformx.device.service.PurchaseWinningLetterService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -46,18 +44,14 @@
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
- * @param purchaseWinningLetter 涓爣閫氱煡涔�
+ * @param queryDTO 涓爣閫氱煡涔�
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
@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));
+ public R getPurchaseWinningLetterPage(@ParameterObject Page page, PurchaseWinningLetterQueryDTO queryDTO) {
+ return R.ok(purchaseWinningLetterService.pageNew(page, queryDTO));
}
@@ -84,7 +78,7 @@
@PreAuthorize("@pms.hasPermission('device_purchaseWinningLetter_add')" )
public R save(@RequestBody PurchaseWinningLetterEntity purchaseWinningLetter) {
purchaseWinningLetter.setWinningCode(maxSizeService.nextNo(MaxSizeContant.WINNING_CODE));
- return R.ok(purchaseWinningLetterService.save(purchaseWinningLetter));
+ return purchaseWinningLetterService.saveNew(purchaseWinningLetter);
}
/**
@@ -135,4 +129,13 @@
public R<List<PurchaseWinningLetterEntity>> getDropdownnList() {
return R.ok(purchaseWinningLetterService.list());
}
+
+ /**
+ * 鏍规嵁楠屾敹鏌ヨ璁惧涓嬫媺
+ * @return
+ */
+ @GetMapping("/getDropdownnById/{id}")
+ public R<List<Device>> getDropdownnByWinningId(@PathVariable("id")Long id) {
+ return R.ok(purchaseWinningLetterService.getDropdownnByWinningId(id));
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1