From 9bafd2fe4654617cf3f5243df7a370fec2c86184 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 09 四月 2025 08:52:33 +0800
Subject: [PATCH] fix: 租赁计划修改page方法
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
index 7e0859e..1e9b78a 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
@@ -14,6 +14,7 @@
import com.by4cloud.platformx.device.entity.Device;
import com.by4cloud.platformx.device.entity.DeviceDemandPlan;
import com.by4cloud.platformx.device.entity.DeviceDemandSub;
+import com.by4cloud.platformx.device.entity.DeviceDemandTotal;
import com.by4cloud.platformx.device.service.*;
import com.by4cloud.platformx.device.util.NumUtils;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -63,7 +64,14 @@
wrapper.eq(deviceDemandPlan.getYear() !=null,DeviceDemandPlan::getYear,deviceDemandPlan.getYear());
wrapper.eq(DeviceDemandPlan::getType2,0);
wrapper.orderByDesc(DeviceDemandPlan::getCreateTime);
- return R.ok(deviceDemandPlanService.pageByScope(page, wrapper));
+ Page<DeviceDemandPlan> page1 = deviceDemandPlanService.pageByScope(page, wrapper);
+ for (DeviceDemandPlan record : page1.getRecords()) {
+ LambdaQueryWrapper<DeviceDemandTotal> totalWrapper = Wrappers.lambdaQuery();
+ totalWrapper.eq(DeviceDemandTotal::getPlanId,record.getId());
+ List<DeviceDemandTotal> list = deviceDemandTotalService.list(totalWrapper);
+ record.setTotalList(list);
+ }
+ return R.ok(page1);
}
/**
@@ -77,7 +85,8 @@
public R page2(@ParameterObject Page page, @ParameterObject DeviceDemandPlan deviceDemandPlan) {
LambdaQueryWrapper<DeviceDemandPlan> wrapper = Wrappers.lambdaQuery();
wrapper.eq(deviceDemandPlan.getDeclareCompId() !=null,DeviceDemandPlan::getDeclareCompId,deviceDemandPlan.getDeclareCompId());
- wrapper.eq(deviceDemandPlan.getReleasePerson() !=null,DeviceDemandPlan::getReleasePerson,deviceDemandPlan.getReleasePerson());
+ wrapper.eq(deviceDemandPlan.getCompId() !=null,DeviceDemandPlan::getCompId,deviceDemandPlan.getCompId());
+ wrapper.like(deviceDemandPlan.getReleasePerson() !=null,DeviceDemandPlan::getReleasePerson,deviceDemandPlan.getReleasePerson());
wrapper.eq(deviceDemandPlan.getYear() !=null,DeviceDemandPlan::getYear,deviceDemandPlan.getYear());
wrapper.eq(deviceDemandPlan.getStatus() !=null,DeviceDemandPlan::getStatus,deviceDemandPlan.getStatus());
wrapper.eq(DeviceDemandPlan::getType2,1);
@@ -140,6 +149,8 @@
plan.setReleasePerson(name);
plan.setStatus(3);
plan.setType2(1);
+ plan.setDeclareCompId(plan.getCompId());
+ plan.setDeclareCompName(plan.getCompName());
if(subs.size()>0){
deviceDemandPlanService.updateById(plan);
return R.ok("鎻愪氦鎴愬姛");
--
Gitblit v1.9.1