From 4f7eed6051a15f3c5f667a702898e1adb4376354 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 03 八月 2023 17:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 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 84a5c7b..90674ee 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
@@ -27,8 +27,6 @@
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;
@@ -74,7 +72,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
public R<List<AttributeVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition) {
- return R.data(AttributeWrapper.build().listEntityVO(attributeService.list(Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getKey))));
+ return R.data(AttributeWrapper.build().listEntityVO(attributeService.list(Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getId))));
}
/**
@@ -89,7 +87,7 @@
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
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));
+ IPage<Attribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getId));
BeanUtil.copy(page,pageVO);
pageVO.setRecords( AttributeWrapper.build().listEntityVO(page.getRecords()));
return R.data(pageVO);
@@ -97,8 +95,8 @@
@GetMapping("/query-page")
@ApiImplicitParams({
- @ApiImplicitParam(name = "key",value = "灞炴�у悕妯＄硦",paramType = "query",dataType = "string"),
- @ApiImplicitParam(name = "notIn",value = "灞炴�у悕鎺掗櫎",paramType = "query",dataType = "string")
+ @ApiImplicitParam(name = "key",value = "灞炴�х紪鍙锋ā绯�",paramType = "query",dataType = "string"),
+ @ApiImplicitParam(name = "notIn",value = "灞炴�х紪鍙锋帓闄�",paramType = "query",dataType = "string")
})
@ApiOperationSupport(order = 6)
@ApiOperation(value = "鏌ヨ鍒楄〃",notes = "浼犲叆鏌ョ殑鍊煎拰涓嶆煡鐨勫��")
@@ -107,13 +105,13 @@
if (StringUtil.isNotBlank(notInStr)){
List<String> notInList = Func.toStrList(",", notInStr);
if (!CollectionUtils.isEmpty(notInList)){
- wrapper = wrapper.notIn(Attribute::getKey,notInList);
+ wrapper = wrapper.notIn(Attribute::getId,notInList);
}
}
if (StringUtil.isNotBlank(key)){
- wrapper = wrapper.like(Attribute::getKey,key);
+ wrapper = wrapper.like(Attribute::getId,key);
}
- IPage<Attribute> page = attributeService.page(Condition.getPage(query),wrapper.orderByAsc(Attribute::getKey));
+ IPage<Attribute> page = attributeService.page(Condition.getPage(query),wrapper.orderByAsc(Attribute::getId));
IPage<AttributeVO> pageVO = new Page<>();
BeanUtil.copy(page,pageVO);
pageVO.setRecords(AttributeWrapper.build().listEntityVO(page.getRecords()));
@@ -129,33 +127,33 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆鍏冩暟鎹璞�")
- public R submit(@Valid @RequestBody AttributeDTO dto) {
+ public R submit(@RequestBody AttributeDTO dto) {
CacheUtil.clear(OmdCacheConstant.ATTR_CACHE);
return R.status(attributeService.submit(dto));
}
/**
* 鍒犻櫎
- * @param ids 涓婚敭闆嗗悎
+ * @param oid 涓婚敭闆嗗悎
* @return 鎵ц缁撴灉
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "鍒犻櫎", notes = "涓婚敭闆嗗悎")
- public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids) {
+ public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String oid) {
CacheUtil.clear(OmdCacheConstant.ATTR_CACHE);
- return R.status(attributeService.removeAttrs(ids));
+ return attributeService.remove(oid);
}
/**
* 鏌ョ湅搴旂敤鑼冨洿
- * @param id 涓婚敭
+ * @param oid 涓婚敭
* @return 鏌ヨ缁撴灉
*/
- @GetMapping("/applyRange")
+ @GetMapping("/apply-range")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "鏌ョ湅搴旂敤鑼冨洿",notes = "浼犲叆涓婚敭")
- public R applyRange(Long id){
- return R.data(attributeService.applyRange(id));
+ public R applyRange(String oid){
+ return R.data(attributeService.applyRange(oid));
}
}
--
Gitblit v1.9.3