获取项目承接类型下拉列表

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyManageController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 咨询机构管理控制层
@@ -30,7 +31,7 @@ import javax.validation.constraints.NotNull;
 @RequestMapping("advisory/body")
 public class AdvisoryBodyManageController extends BaseController {
     @Resource
-    private IDProjectService baseService;
+    private IDProjectService projectService;
     @Resource
     private AdvisoryBodyService advisoryBodyService;
     @Resource
@@ -43,7 +44,7 @@ public class AdvisoryBodyManageController extends BaseController {
      */
     @GetMapping("/getProjectList")
     public TableDataInfo<ProjectSearchVo> getProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery) {
-        return baseService.queryProjectList(projectSearchBo, pageQuery);
+        return projectService.queryProjectList(projectSearchBo, pageQuery);
     }
 
     /**
@@ -54,12 +55,20 @@ public class AdvisoryBodyManageController extends BaseController {
         return advisoryBodyService.queryAdvisoryBodyList(advisoryBodySearchBo, pageQuery);
     }
 
+    /**
+     * 获取项目承接类型下拉列表
+     */
+    @GetMapping("/getIsInvestProject")
+    public R<List<String>> getIsInvestProject() {
+        return R.ok(projectService.queryIsInvestProject());
+    }
+
     /**
      * 获取合作项目明细
      */
     @GetMapping("/getCooperateProjectDetailList")
     public TableDataInfo<CooperateProjectDetailSearchVo> getCooperateProjectDetailList(@Validated CooperateProjectDetailSearchBo cooperateProjectDetailSearchBo, PageQuery pageQuery) {
-        return baseService.queryCooperateProjectDetailList(cooperateProjectDetailSearchBo, pageQuery);
+        return projectService.queryCooperateProjectDetailList(cooperateProjectDetailSearchBo, pageQuery);
     }
 
     /**
@@ -67,7 +76,7 @@ public class AdvisoryBodyManageController extends BaseController {
      */
     @GetMapping("/getProjectDetail")
     public R<ProjectDetailVo> getProjectDetail(@Validated ProjectDetailBo projectDetailBo) {
-        return R.ok(baseService.queryProjectDetail(projectDetailBo));
+        return R.ok(projectService.queryProjectDetail(projectDetailBo));
     }
 
     /**
@@ -78,8 +87,6 @@ public class AdvisoryBodyManageController extends BaseController {
         return R.ok(advisoryBodyService.checkAdvisoryBodyExist(advisoryBodyName));
     }
 
-    //todo:咨询机构合作明细,项目承接类型下拉列表接口
-
     /**
      * 编辑咨询机构结算信息
      * 包含:
@@ -88,7 +95,6 @@ public class AdvisoryBodyManageController extends BaseController {
      */
     @PostMapping("/editAdvisoryBody")
     public R<Void> editAdvisoryBody(@Validated EditAdvisoryBodyInfoBo editInfoBo) {
-        System.out.println("👉🏻editInfoBo:"+editInfoBo);
         return toAjax(advisoryBodyService.editAdvisoryBody(editInfoBo));
     }
 
@@ -101,6 +107,7 @@ public class AdvisoryBodyManageController extends BaseController {
     }
 
     //todo:自定义表单表格只存一条json数据改造
+
     /**
      * 新增咨询机构自定义表单
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DProjectMapper.java

@@ -9,6 +9,8 @@ import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 项目维表(DProject)表数据库访问层
  *
@@ -21,9 +23,13 @@ public interface DProjectMapper extends BaseMapper<DProject> {
      */
     Page<ProjectSearchVo> selectPageProjectList(@Param("page") Page<ProjectSearchVo> page, @Param(Constants.WRAPPER) Wrapper<DProject> queryWrapper);
 
+    /**
+     * 获取项目承接类型下拉列表
+     */
+    List<String> queryIsInvestProject();
+
     /**
      * 获取合作项目明细
      */
     Page<CooperateProjectDetailSearchVo> selectPageCooperateProjectDetailList(@Param("page") Page<CooperateProjectDetailSearchVo> page, @Param(Constants.WRAPPER) Wrapper<DProject> Wrapper);
-}
-
+}
\ No newline at end of file

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDProjectService.java

@@ -11,6 +11,8 @@ import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectDetailVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
 
+import java.util.List;
+
 /**
  * 项目维表(DProject)表服务接口
  *
@@ -27,6 +29,13 @@ public interface IDProjectService extends IService<DProject> {
      */
     TableDataInfo<ProjectSearchVo> queryProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery);
 
+    /**
+     * 获取项目承接类型下拉列表
+     *
+     * @return 去重后的项目承接类型
+     */
+    List<String> queryIsInvestProject();
+
     /**
      * 获取合作项目明细
      *

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java

@@ -130,6 +130,16 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
         return wrapper;
     }
 
+    /**
+     * 获取项目承接类型下拉列表
+     *
+     * @return 去重后的项目承接类型
+     */
+    @Override
+    public List<String> queryIsInvestProject() {
+        return baseMapper.queryIsInvestProject();
+    }
+
     /**
      * 根据项目主键查询咨询机构
      *

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DProjectMapper.xml

@@ -21,6 +21,12 @@
             ${ew.getCustomSqlSegment}
     </select>
 
+    <select id="queryIsInvestProject" resultType="java.lang.String">
+        SELECT DISTINCT isinvestproject
+        FROM d_project
+        WHERE (isinvestproject != '')
+    </select>
+
     <select id="selectPageCooperateProjectDetailList"
             resultType="com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo">
         select p.project_key,