From d9183aa80ae17d36b79dda48c6b1d7fa22a80ee3 Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 22 一月 2025 11:20:41 +0800 Subject: [PATCH] 现场型号代号/人员/组织接口调试 --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java index 870ccec..dcfbc4f 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java @@ -1,7 +1,11 @@ package com.vci.ubcs.omd.feign; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.vci.ubcs.omd.entity.Attribute; import com.vci.ubcs.omd.service.IAttributeService; +import com.vci.ubcs.omd.vo.AttributeVO; +import com.vci.ubcs.omd.wrapper.AttributeWrapper; +import com.vci.ubcs.starter.web.util.VciBaseUtil; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.tenant.annotation.NonDS; @@ -38,6 +42,18 @@ public R<List<Attribute>> getList(String key) { Map<String,Object> condition = new HashMap<>(); condition.put("key",key); - return R.data(service.list(Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getKey))); + return R.data(service.list(Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getId))); + } + + /** + * 鎸夐鍩熻幏鍙栧叏閮ㄥ睘鎬� + * + * @return 鏌ヨ缁撴灉 + */ + @Override + @GetMapping(GET_ALL) + public R<List<AttributeVO>> getAll() { + List<AttributeVO> voList = AttributeWrapper.build().listEntityVO(service.list()); + return R.data(voList); } } -- Gitblit v1.9.3