From 6577612f57dc34ca19636991446c5e3206806a80 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 20 四月 2023 10:45:26 +0800
Subject: [PATCH] 代码合并
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java
index bcf4d68..122ecd5 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java
@@ -1,5 +1,7 @@
package com.vci.ubcs.omd.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.constant.OmdCacheConstant;
import com.vci.ubcs.omd.dto.OmdAttributeDTO;
@@ -7,13 +9,16 @@
import com.vci.ubcs.omd.service.IOmdAttributeService;
import com.vci.ubcs.omd.vo.OmdAttributeVO;
import com.vci.ubcs.omd.wrapper.OmdAttributeWrapper;
+import com.vci.ubcs.system.vo.DictVO;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
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;
@@ -66,10 +71,29 @@
}
/**
- * 鏂板鎴栦慨鏀�
- * @param dto 鍏冩暟鎹〉闈紶杈撳璞�
- * @return 鎵ц缁撴灉
+ * 鍒嗛〉鍒楄〃
+ * @param condition 鏌ヨ鏉′欢
*/
+ @GetMapping("/page")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "key", value = "灞炴�у悕", paramType = "query", dataType = "string"),
+ })
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
+ public R<IPage<OmdAttributeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
+ IPage<OmdAttributeVO> pageVO = new Page<>();
+ IPage<OmdAttribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, OmdAttribute.class).lambda().orderByAsc(OmdAttribute::getKey));
+ BeanUtil.copy(page,pageVO);
+ pageVO.setRecords( OmdAttributeWrapper.build().listEntityVO(page.getRecords()));
+ return R.data(pageVO);
+ }
+
+
+ /**
+ * 鏂板鎴栦慨鏀�
+ * @param dto 鍏冩暟鎹〉闈紶杈撳璞�
+ * @return 鎵ц缁撴灉
+ */
@PostMapping("/submit")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆鍏冩暟鎹璞�")
--
Gitblit v1.9.3