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/ContractController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
index 1d8bf4e..8d8d98c 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
@@ -10,8 +10,10 @@
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.service.ContractService;
+import com.by4cloud.platformx.device.service.JcMaxSizeService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -39,6 +41,7 @@
public class ContractController {
private final ContractService contractService;
+ private final JcMaxSizeService maxSizeService;
/**
* 鍒嗛〉鏌ヨ
@@ -54,6 +57,7 @@
wrapper.eq(contract.getType()!=null,Contract::getType,contract.getType());
wrapper.like(StringUtils.isNotEmpty(contract.getName()),Contract::getName,contract.getName());
wrapper.like(StringUtils.isNotEmpty(contract.getNumber()),Contract::getNumber,contract.getNumber());
+ wrapper.orderByDesc(Contract::getCreateTime);
return R.ok(contractService.page(page, wrapper));
}
@@ -67,7 +71,7 @@
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('platformx_contract_view')" )
public R getById(@PathVariable("id" ) Long id) {
- return R.ok(contractService.getById(id));
+ return R.ok(contractService.getDetailById(id));
}
/**
@@ -80,7 +84,8 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('platformx_contract_add')" )
public R save(@RequestBody Contract contract) {
- return R.ok(contractService.save(contract));
+ contract.setNumber(maxSizeService.nextNo(MaxSizeContant.CONTRACT_NUM));
+ return R.ok(contractService.saveDeep(contract));
}
/**
@@ -93,7 +98,7 @@
@PutMapping
@PreAuthorize("@pms.hasPermission('platformx_contract_edit')" )
public R updateById(@RequestBody Contract contract) {
- return R.ok(contractService.updateById(contract));
+ return R.ok(contractService.updateDeep(contract));
}
/**
@@ -106,7 +111,7 @@
@DeleteMapping
@PreAuthorize("@pms.hasPermission('platformx_contract_del')" )
public R removeById(@RequestBody Long[] ids) {
- return R.ok(contractService.removeBatchByIds(CollUtil.toList(ids)));
+ return R.ok(contractService.removeDeep(ids));
}
@@ -122,4 +127,26 @@
public List<Contract> export(Contract contract,Long[] ids) {
return contractService.list(Wrappers.lambdaQuery(contract).in(ArrayUtil.isNotEmpty(ids), Contract::getId, ids));
}
+
+ /**
+ * 瀹℃壒閫氳繃鍚堝悓
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "瀹℃壒閫氳繃鍚堝悓" , description = "瀹℃壒閫氳繃鍚堝悓" )
+ @GetMapping("/approved/{id}" )
+ public R approved(@PathVariable("id" ) Long id) {
+ return R.ok(contractService.approved(id));
+ }
+
+ /**
+ * 鑾峰彇瀹℃壒閫氳繃鍚堝悓鐨勪笅鎷夊垪琛�
+ * @return R
+ */
+ @Operation(summary = "鑾峰彇瀹℃壒閫氳繃鍚堝悓鐨勪笅鎷夊垪琛�" , description = "鑾峰彇瀹℃壒閫氳繃鍚堝悓鐨勪笅鎷夊垪琛�" )
+ @GetMapping("/getApprovedContractList" )
+ public R getApprovedContractList() {
+ return R.ok(contractService.getApprovedContractList());
+ }
+
}
--
Gitblit v1.9.1