From a3ee02d1abc58c9a0c8cfc55e384a17fcb850196 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 13 十月 2023 11:04:53 +0800
Subject: [PATCH] 状态使用范围接口开发
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java
index a7562b9..d1e6b8c 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.controller;
+import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.entity.Status;
@@ -11,9 +12,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import java.util.HashMap;
import java.util.List;
@@ -50,12 +53,8 @@
@GetMapping("page")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉鏌ヨ鐘舵�佹睜",notes = "鍒嗛〉鏌ヨ鐘舵�佹睜")
- public R<IPage<StatusVO>> page(BaseQueryObject baseQueryObject){
- Map<String, String> conditionMap = baseQueryObject.getConditionMap();
- if (conditionMap == null){
- conditionMap = new HashMap<>();
- }
- return R.data(statusService.listStatus(conditionMap,baseQueryObject.getPageHelper()));
+ public R<IPage<StatusVO>> page(@ApiIgnore @RequestParam Map<String, Object> condition, Query query){
+ return R.data(statusService.listStatus(condition,query));
}
/**
@@ -65,7 +64,11 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鏂板鎴栦慨鏀�",notes = "浼犲叆鐘舵�佹睜椤甸潰瀵硅薄")
public R<StatusVO> submit(@RequestBody StatusVO statusVO){
- return R.data(statusService.addSave(statusVO));
+ if (StringUtils.isBlank(statusVO.getOid())){
+ return R.data(statusService.addSave(statusVO));
+ }else {
+ return R.data(statusService.editSave(statusVO));
+ }
}
/**
@@ -99,4 +102,16 @@
statusService.batchDelete(StatusVOList);
return R.status(true);
}
+
+ /**
+ * 鏌ョ湅浣跨敤鑼冨洿
+ * @param id 鐗堟湰瑙勫垯id
+ * @return 鎵ц缁撴灉
+ */
+ @GetMapping("/get-apply-range")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "鐗堟湰瑙勫垯id",notes = "浼犲叆id")
+ public R getApplyRange(String id){
+ return R.data(statusService.getApplyRange(id));
+ }
}
--
Gitblit v1.9.3