From 299db8844a85b23659aa148e26e4472e2fed71b9 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Mon, 4 Aug 2025 10:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=90=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0(=E4=B8=8B=E6=8B=89=E6=A1=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HuzhouSubProjectinfoController.java | 12 ++++++++++++ .../modules/huzhou/entity/HuzhouPerforman.java | 3 +-- .../service/IHuzhouSubProjectinfoService.java | 3 +++ .../impl/HuzhouSubProjectinfoServiceImpl.java | 12 ++++++++++++ .../admin/modules/huzhou/vo/SubprojectSelectVo.java | 13 +++++++++++++ 5 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SubprojectSelectVo.java diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouSubProjectinfoController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouSubProjectinfoController.java index 1a4de2e..ecd006b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouSubProjectinfoController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouSubProjectinfoController.java @@ -4,9 +4,12 @@ import com.easy.admin.common.core.annotation.ResponseResult; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.entity.HuzhouSubProjectinfo; import com.easy.admin.modules.huzhou.service.IHuzhouSubProjectinfoService; +import com.easy.admin.modules.huzhou.vo.SubprojectSelectVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @ResponseResult @@ -34,4 +37,13 @@ public class HuzhouSubProjectinfoController { HuzhouSubProjectinfo subProjectMoneyinfo = subProjectinfoService.getRemainingMoneyinfo(projectinfo); return subProjectMoneyinfo; } + + /** + * 获取子项目名称(下拉框) + * @return + */ + @GetMapping("/getSubProjectNames") + public List getSubProjectNames(){ + return subProjectinfoService.getSubProjectNames(); + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerforman.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerforman.java index 6306fa3..131b6bf 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerforman.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerforman.java @@ -5,8 +5,7 @@ import lombok.Data; import java.io.Serializable; /** - * (HuzhouPerforman)实体类 - * + * 绩效考核模板实体类 * @author makejava * @since 2024-03-27 16:12:01 */ diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouSubProjectinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouSubProjectinfoService.java index a3bef9f..71ab21e 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouSubProjectinfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouSubProjectinfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfo; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.entity.HuzhouSubProjectinfo; +import com.easy.admin.modules.huzhou.vo.SubprojectSelectVo; import java.util.List; @@ -15,4 +16,6 @@ public interface IHuzhouSubProjectinfoService extends IService listByProjectIds(List projectIds); + + List getSubProjectNames(); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java index 614e1f4..8fbab50 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java @@ -10,6 +10,7 @@ import com.easy.admin.modules.huzhou.dao.HuzhouSubProjectinfoMapper; import com.easy.admin.modules.huzhou.entity.*; import com.easy.admin.modules.huzhou.service.*; import com.easy.admin.modules.huzhou.vo.HuzhouPlaninfoOV; +import com.easy.admin.modules.huzhou.vo.SubprojectSelectVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -182,4 +183,15 @@ public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl getSubProjectNames() { + List rs = new ArrayList<>(); + List subProjectInfos = subProjectinfoMapper.selectList(null); + for (HuzhouSubProjectinfo subProjectInfo : subProjectInfos) { + SubprojectSelectVo addVo = new SubprojectSelectVo(subProjectInfo.getProjectName(), subProjectInfo.getId()); + rs.add(addVo); + } + return rs.size() > 0 ? rs : null; + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SubprojectSelectVo.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SubprojectSelectVo.java new file mode 100644 index 0000000..eec9c98 --- /dev/null +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SubprojectSelectVo.java @@ -0,0 +1,13 @@ +package com.easy.admin.modules.huzhou.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SubprojectSelectVo { + private String label; + private String value; +}