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/PurchaseWinningLetterController.java | 6 +++++- 1 files changed, 5 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 b894a96..ed3d14f 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,11 @@ 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.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 +40,7 @@ public class PurchaseWinningLetterController { private final PurchaseWinningLetterService purchaseWinningLetterService; + private final JcMaxSizeService maxSizeService; /** * 鍒嗛〉鏌ヨ @@ -52,7 +55,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,6 +82,7 @@ @PostMapping @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)); } -- Gitblit v1.9.1