新增合同-所属项目下拉框

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<List<ProjectSelectVo>> getNames() {
+        return R.ok(projectInfoService.getNames());
+    }
+
 }

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
      */

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;
+
     /**
      * 合同名称
      */

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
      */

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;
+}

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<String> ids, Boolean isValid);
+
+    /**
+     * 查询项目信息名称列表 (下拉框)
+     *
+     * @return 项目信息名称列表
+     */
+    List<ProjectSelectVo> getNames();
 }

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<ProjectSelectVo> getNames() {
+        List<ProjectSelectVo> selectVoList = new ArrayList<>();
+
+        //查询数据库
+        LambdaQueryWrapper<ProjectInfo> queryWrapper = new LambdaQueryWrapper<>();
+        List<ProjectInfo> 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;
+    }
 }