From cc59b65bc63b839127c29775bcd410dd407de66d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 21 四月 2025 17:20:02 +0800
Subject: [PATCH] 设备采购计划与设备照片
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 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 ff907e2..b88c8af 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;
@@ -61,8 +62,16 @@
wrapper.eq(deviceDemandPlan.getDeclareCompId() !=null,DeviceDemandPlan::getDeclareCompId,deviceDemandPlan.getDeclareCompId());
wrapper.eq(deviceDemandPlan.getReleasePerson() !=null,DeviceDemandPlan::getReleasePerson,deviceDemandPlan.getReleasePerson());
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);
}
/**
@@ -76,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);
@@ -106,6 +116,18 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('platformx_deviceDemandPlan_add')" )
public R save(@RequestBody DeviceDemandPlan deviceDemandPlan) {
+
+ QueryWrapper<DeviceDemandPlan> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("declare_comp_id", deviceDemandPlan.getDeclareCompId());
+ queryWrapper.eq("year", deviceDemandPlan.getYear());
+ queryWrapper.eq("type",deviceDemandPlan.getType());
+ List<DeviceDemandPlan> list = deviceDemandPlanService.list(queryWrapper);
+ if (list.size() > 0) {
+ if (deviceDemandPlan.getType()==0) {
+ return R.failed(deviceDemandPlan.getDeclareCompName() + deviceDemandPlan.getYear() + "骞村害璁″垝宸插瓨鍦�");
+ }
+ return R.failed(deviceDemandPlan.getDeclareCompName() + deviceDemandPlan.getYear() + "璋冩暣璁″垝宸插瓨鍦�");
+ }
deviceDemandPlan.setNumber(maxSizeService.nextNo(MaxSizeContant.PLAN_NUM));
deviceDemandPlan.setType2(0);
return R.ok(deviceDemandPlanService.save(deviceDemandPlan));
@@ -139,6 +161,9 @@
plan.setReleasePerson(name);
plan.setStatus(3);
plan.setType2(1);
+ plan.setSendDate(new Date());
+ plan.setDeclareCompId(plan.getCompId());
+ plan.setDeclareCompName(plan.getCompName());
if(subs.size()>0){
deviceDemandPlanService.updateById(plan);
return R.ok("鎻愪氦鎴愬姛");
--
Gitblit v1.9.1