From 60175c0c0907c2b089795b746efef9f72417abc9 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Mon, 7 Apr 2025 15:58:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E5=90=8C-=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E9=A1=B9=E7=9B=AE=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/ProjectInfoController.java | 11 +++++++++ .../dromara/platform/domain/ContractInfo.java | 5 ++++ .../platform/domain/bo/ContractInfoBo.java | 13 +++++++++++ .../platform/domain/vo/ContractInfoVo.java | 6 +++++ .../platform/domain/vo/ProjectSelectVo.java | 9 ++++++++ .../platform/service/IProjectInfoService.java | 8 +++++++ .../service/impl/ProjectInfoServiceImpl.java | 23 +++++++++++++++++++ 7 files changed, 75 insertions(+) create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ProjectSelectVo.java diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java index eec033c..9455750 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java @@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.platform.domain.vo.ProjectSelectVo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -102,4 +103,14 @@ public class ProjectInfoController extends BaseController { @PathVariable String[] ids) { return toAjax(projectInfoService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 获取项目名称下拉框 + */ + @SaCheckPermission("platform:projectInfo:getNames") + @GetMapping("/getNames") + public R> getNames() { + return R.ok(projectInfoService.getNames()); + } + } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ContractInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ContractInfo.java index ab565dd..34f81b3 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ContractInfo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ContractInfo.java @@ -39,6 +39,11 @@ public class ContractInfo extends TenantEntity { */ private String contractCode; + /** + * 项目名称 + */ + private String projectName; + /** * 所有者ID */ diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.java index 9ebc108..7fa7189 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.java @@ -28,6 +28,19 @@ public class ContractInfoBo extends BaseEntity { @NotBlank(message = "唯一标识符不能为空", groups = { EditGroup.class }) private String id; + + /** + * 项目名称 + */ + @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectName; + +// /** +// * 项目ID +// */ +// @NotBlank(message = "项目id不能为空", groups = { AddGroup.class, EditGroup.class }) +// private String projectId; + /** * 合同名称 */ diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ContractInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ContractInfoVo.java index fe03a1e..f02cf6d 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ContractInfoVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ContractInfoVo.java @@ -48,6 +48,12 @@ public class ContractInfoVo implements Serializable { @ExcelProperty(value = "合同编号") private String contractCode; + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectName; + /** * 所有者ID */ diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ProjectSelectVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ProjectSelectVo.java new file mode 100644 index 0000000..b08e172 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ProjectSelectVo.java @@ -0,0 +1,9 @@ +package org.dromara.platform.domain.vo; + +import lombok.Data; + +@Data +public class ProjectSelectVo { + private String id; + private String projectName; +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IProjectInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IProjectInfoService.java index f914d18..68e6cb5 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IProjectInfoService.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IProjectInfoService.java @@ -4,6 +4,7 @@ import org.dromara.platform.domain.vo.ProjectInfoVo; import org.dromara.platform.domain.bo.ProjectInfoBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.platform.domain.vo.ProjectSelectVo; import java.util.Collection; import java.util.List; @@ -65,4 +66,11 @@ public interface IProjectInfoService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 查询项目信息名称列表 (下拉框) + * + * @return 项目信息名称列表 + */ + List getNames(); } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java index e7ab744..9593164 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.platform.service.impl; +import cn.hutool.core.collection.CollectionUtil; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.platform.domain.vo.ProjectSelectVo; import org.springframework.stereotype.Service; import org.dromara.platform.domain.bo.ProjectInfoBo; import org.dromara.platform.domain.vo.ProjectInfoVo; @@ -15,6 +17,7 @@ import org.dromara.platform.domain.ProjectInfo; import org.dromara.platform.mapper.ProjectInfoMapper; import org.dromara.platform.service.IProjectInfoService; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Collection; @@ -139,4 +142,24 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { } return baseMapper.deleteByIds(ids) > 0; } + + @Override + public List getNames() { + List selectVoList = new ArrayList<>(); + + //查询数据库 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + List projectInfos = baseMapper.selectList(queryWrapper); + + //封装VO + if (CollectionUtil.isNotEmpty(projectInfos)){ + for (ProjectInfo projectInfo : projectInfos) { + ProjectSelectVo selectVo = new ProjectSelectVo(); + selectVo.setId(projectInfo.getId()); + selectVo.setProjectName(projectInfo.getProjectName()); + selectVoList.add(selectVo); + } + } + return selectVoList; + } }