From ca6ec80da1bffc13e67b2ce5e34ff67f485cc74f Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 16 五月 2023 17:51:56 +0800
Subject: [PATCH] 业务类型新增按钮联调修正。 业务类型弹出表单细节修正。
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
index 16a5701..84a5c7b 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
@@ -1,6 +1,9 @@
package com.vci.ubcs.omd.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.constant.OmdCacheConstant;
@@ -18,10 +21,14 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -80,7 +87,7 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
- public R<IPage<AttributeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
+ public R<IPage<AttributeVO>> pageList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
IPage<AttributeVO> pageVO = new Page<>();
IPage<Attribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getKey));
BeanUtil.copy(page,pageVO);
@@ -88,6 +95,31 @@
return R.data(pageVO);
}
+ @GetMapping("/query-page")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "key",value = "灞炴�у悕妯＄硦",paramType = "query",dataType = "string"),
+ @ApiImplicitParam(name = "notIn",value = "灞炴�у悕鎺掗櫎",paramType = "query",dataType = "string")
+ })
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "鏌ヨ鍒楄〃",notes = "浼犲叆鏌ョ殑鍊煎拰涓嶆煡鐨勫��")
+ public R<IPage<AttributeVO>> queryPageList(String key,String notInStr,Query query){
+ LambdaQueryWrapper<Attribute> wrapper = Wrappers.<Attribute>query().lambda();
+ if (StringUtil.isNotBlank(notInStr)){
+ List<String> notInList = Func.toStrList(",", notInStr);
+ if (!CollectionUtils.isEmpty(notInList)){
+ wrapper = wrapper.notIn(Attribute::getKey,notInList);
+ }
+ }
+ if (StringUtil.isNotBlank(key)){
+ wrapper = wrapper.like(Attribute::getKey,key);
+ }
+ IPage<Attribute> page = attributeService.page(Condition.getPage(query),wrapper.orderByAsc(Attribute::getKey));
+ IPage<AttributeVO> pageVO = new Page<>();
+ BeanUtil.copy(page,pageVO);
+ pageVO.setRecords(AttributeWrapper.build().listEntityVO(page.getRecords()));
+ return R.data(pageVO);
+ }
+
/**
* 鏂板鎴栦慨鏀�
--
Gitblit v1.9.3