From 1eb6f4824c270de1a3d0bf766d44f1abb2c7f55d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 24 四月 2025 17:30:07 +0800
Subject: [PATCH] 巡检任务 设备维修新增是否生成工单字段 及 生成工单
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
index e98d976..7b858d5 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
@@ -3,10 +3,14 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.JcMaxSizeService;
import com.by4cloud.platformx.device.service.PurchaseTendrOrderService;
import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
import com.by4cloud.platformx.device.service.PurchaseTendrOrderService;
@@ -37,6 +41,7 @@
public class PurchaseTendrOrderController {
private final PurchaseTendrOrderService purchaseTendrOrderService;
+ private final JcMaxSizeService jcMaxSizeService;
/**
* 鍒嗛〉鏌ヨ
@@ -49,6 +54,9 @@
@PreAuthorize("@pms.hasPermission('platformx_purchaseTendrOrder_view')" )
public R getPurchaseTendrOrderPage(@ParameterObject Page page, @ParameterObject PurchaseTendrOrderEntity purchaseTendrOrder) {
LambdaQueryWrapper<PurchaseTendrOrderEntity> wrapper = Wrappers.lambdaQuery();
+ wrapper.like(StringUtils.isNotEmpty(purchaseTendrOrder.getOrderName()),PurchaseTendrOrderEntity::getOrderName,purchaseTendrOrder.getOrderName());
+ wrapper.like(StringUtils.isNotEmpty(purchaseTendrOrder.getPurchasePlanCode()),PurchaseTendrOrderEntity::getPurchasePlanCode,purchaseTendrOrder.getPurchasePlanCode());
+ wrapper.orderByDesc(PurchaseTendrOrderEntity::getCreateTime);
return R.ok(purchaseTendrOrderService.page(page, wrapper));
}
@@ -75,6 +83,7 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('platformx_purchaseTendrOrder_add')" )
public R save(@RequestBody PurchaseTendrOrderEntity purchaseTendrOrder) {
+ purchaseTendrOrder.setPurchasePlanCode(jcMaxSizeService.nextNo(MaxSizeContant.PURCHASE_PLAN_CODE));
return R.ok(purchaseTendrOrderService.save(purchaseTendrOrder));
}
@@ -119,8 +128,21 @@
}
/**
- * 閫氳繃id鍒犻櫎鎷涙爣閲囪喘鍗�
- * @param ids id鍒楄〃
+ * 閫氳繃id瀹℃牳鎷涙爣閲囪喘鍗�
+ * @param id id鍒楄〃
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id瀹℃牳鎷涙爣閲囪喘鍗�" , description = "閫氳繃id瀹℃牳鎷涙爣閲囪喘鍗�" )
+ @SysLog("閫氳繃id瀹℃牳鎷涙爣閲囪喘鍗�" )
+ @GetMapping("/approved/{id}")
+ @PreAuthorize("@pms.hasPermission('platformx_purchaseTendrOrder_approved')" )
+ public R approved(@PathVariable("id")Long id) {
+ return R.ok(purchaseTendrOrderService.approved(id));
+ }
+
+ /**
+ * 閫氳繃id瀹屾垚鎷涙爣閲囪喘鍗�
+ * @param id鍒楄〃
* @return R
*/
@Operation(summary = "閫氳繃id瀹屾垚鎷涙爣閲囪喘鍗�" , description = "閫氳繃id瀹屾垚鎷涙爣閲囪喘鍗�" )
@@ -130,4 +152,14 @@
public R complete(@PathVariable("id")Long id) {
return R.ok(purchaseTendrOrderService.complete(id));
}
+
+ /**
+ * 鑾峰彇鎷涙爣涓嬫媺鍒楄〃
+ * @return
+ */
+ @GetMapping("/getPurchaseRenderList" )
+ public R getPurchaseRenderList() {
+ return R.ok(purchaseTendrOrderService.getPurchaseRenderList());
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1