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/DeviceDemandPlanController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 a832ccf..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
@@ -85,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);
@@ -115,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));
@@ -148,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