PRD《优化-咨询机构》相关

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

@@ -9,10 +9,7 @@ import com.dsk.cscec.domain.AdvisoryBodyCustomFormData;
 import com.dsk.cscec.domain.AdvisoryBodyCustomFormTemplate;
 import com.dsk.cscec.domain.bo.*;
 import com.dsk.cscec.domain.vo.*;
-import com.dsk.cscec.service.AdvisoryBodyCustomFormDataService;
-import com.dsk.cscec.service.AdvisoryBodyCustomFormTemplateService;
-import com.dsk.cscec.service.AdvisoryBodyService;
-import com.dsk.cscec.service.IDProjectService;
+import com.dsk.cscec.service.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,13 +34,16 @@ public class AdvisoryBodyManageController extends BaseController {
     private AdvisoryBodyCustomFormDataService customFormDataService;
     @Resource
     private AdvisoryBodyCustomFormTemplateService templateService;
+    @Resource
+    private DContractService contractService;
 
     /**
      * 获取项目列表
      */
     @GetMapping("/getProjectList")
     public TableDataInfo<ProjectSearchVo> getProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery) {
-        return projectService.queryProjectList(projectSearchBo, pageQuery);
+        //return projectService.queryProjectList(projectSearchBo, pageQuery);
+        return contractService.queryProjectList(projectSearchBo, pageQuery);
     }
 
     /**

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

+package com.dsk.cscec.controller;
+
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.cscec.service.DContractService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 合同维表(DContract)表控制层
+ *
+ * @author sxk
+ * @since 2024-06-21 13:38:28
+ */
+@RestController
+@RequestMapping("dContract")
+public class DContractController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private DContractService baseService;
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/AdvisoryBodyProject.java

@@ -65,4 +65,32 @@ public class AdvisoryBodyProject extends BaseEntity implements Serializable {
      * 是否为终审单位（0代表是 1代表否）
      */
     private String isFinalJudgeUnit;
+    /**
+     * 业主名称
+     */
+    private String ownerName;
+    /**
+     * 项目经理及联系方式
+     */
+    private String projectManagerAndPhone;
+    /**
+     * 商务经理及联系方式
+     */
+    private String businessManagerAndPhone;
+    /**
+     * 招标代理单位
+     */
+    private String bidAgencyUnit;
+    /**
+     * 一审单位
+     */
+    private String firstAuditUnit;
+    /**
+     * 二审单位
+     */
+    private String secondAuditUnit;
+    /**
+     * 三审单位
+     */
+    private String thirdAuditUnit;
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/ProjectSearchVo.java

 package com.dsk.cscec.domain.vo;
 
-import com.dsk.cscec.domain.AdvisoryBody;
-import com.dsk.cscec.domain.AdvisoryBodyProject;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -19,75 +16,91 @@ import java.util.Date;
 @AllArgsConstructor
 public class ProjectSearchVo {
     /**
-     * 项目主键
+     * 合同主键
      */
-    private Long projectKey;
-
-    /**
-     * 项目ID
-     */
-    private String projectId;
-
+    private String contractKey;
+    ///**
+    // * 项目主键
+    // */
+    //private Long projectKey;
+    ///**
+    // * 项目ID
+    // */
+    //private String projectId;
     /**
      * 项目名称
      */
     private String projectName;
-
-    /**
-     * 项目编码
-     */
-    private String projectCode;
-
-    /**
-     * 省市
-     */
-    private String provinceName;
-
-    /**
-     * 项目承接类型
-     */
-    private String isinvestproject;
-
-    /**
-     * 工程基础大类
-     */
-    private String projectType1;
-
+    ///**
+    // * 项目编码
+    // */
+    //private String projectCode;
+    ///**
+    // * 省市
+    // */
+    //private String provinceName;
+    ///**
+    // * 项目承接类型
+    // */
+    //private String isinvestproject;
+    ///**
+    // * 工程基础大类
+    // */
+    //private String projectType1;
+    ///**
+    // * 工程类别明细
+    // */
+    //private String projectType2;
+    ///**
+    // * 项目与咨询机构关系
+    // */
+    //private AdvisoryBodyProject advisoryBodyProject;
+    ///**
+    // * 合同金额
+    // */
+    //private BigDecimal contractOrigValue;
+    ///**
+    // * 业主单位Cid
+    // */
+    //private Long ownerUnitCid;
     /**
-     * 工程类别明细
+     * 业主单位
      */
-    private String projectType2;
-
+    private String ownerName;
+    ///**
+    // * 项目承接单位
+    // */
+    //private String contractOrgName;
+    ///**
+    // * 咨询机构(咨询机构表)
+    // */
+    //private AdvisoryBody advisoryBody;
     /**
-     * 项目与咨询机构关系
+     * 创建时间(合同生效日期)
      */
-    private AdvisoryBodyProject advisoryBodyProject;
-
+    private Date contractSignDate;
     /**
-     * 合同金额
+     * 项目经理及联系方式
      */
-    private BigDecimal contractOrigValue;
+    private String projectManagerAndPhone;
     /**
-     * 业主单位Cid
+     * 商务经理及联系方式
      */
-    private Long ownerUnitCid;
+    private String businessManagerAndPhone;
     /**
-     * 业主单位
+     * 招标代理单位
      */
-    private String ownerName;
-
+    private String bidAgencyUnit;
     /**
-     * 项目承接单位
+     * 一审单位
      */
-    private String contractOrgName;
-
+    private String firstAuditUnit;
     /**
-     * 咨询机构(咨询机构表)
+     * 二审单位
      */
-    private AdvisoryBody advisoryBody;
-
+    private String secondAuditUnit;
     /**
-     * 创建时间(合同生效日期)
+     * 三审单位
      */
-    private Date contractSignDate;
+    private String thirdAuditUnit;
 }

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsk.cscec.domain.DContract;
+import com.dsk.cscec.domain.bo.ProjectSearchBo;
+import com.dsk.cscec.domain.vo.ProjectSearchVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 合同维表(DContract)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-21 13:38:28
+ */
+public interface DContractMapper extends BaseMapper<DContract> {
+    /**
+     * 获取所有项目列表数据
+     */
+    Page<ProjectSearchVo> selectPageProjectList(IPage<ProjectSearchVo> page, @Param("bo") ProjectSearchBo bo);
+}
+

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.cscec.domain.DContract;
+import com.dsk.cscec.domain.bo.ProjectSearchBo;
+import com.dsk.cscec.domain.vo.ProjectSearchVo;
+
+/**
+ * 合同维表(DContract)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-21 13:38:29
+ */
+public interface DContractService extends IService<DContract> {
+    /**
+     * 获取所有项目列表数据
+     *
+     * @param projectSearchBo 查询实体
+     * @param pageQuery       分页对象
+     * @return 所有数据
+     */
+    TableDataInfo<ProjectSearchVo> queryProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery);
+}
+

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

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.cscec.domain.DContract;
+import com.dsk.cscec.domain.bo.ProjectSearchBo;
+import com.dsk.cscec.domain.vo.ProjectSearchVo;
+import com.dsk.cscec.mapper.AdvisoryBodyCustomFormDataMapper;
+import com.dsk.cscec.mapper.DContractMapper;
+import com.dsk.cscec.service.DContractService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 合同维表(DContract)表服务实现类
+ *
+ * @author sxk
+ * @since 2024-06-21 13:38:29
+ */
+@Service("dContractService")
+public class DContractServiceImpl extends ServiceImpl<DContractMapper, DContract> implements DContractService {
+    @Resource
+    private DContractMapper baseMapper;
+    @Resource
+    private AdvisoryBodyCustomFormDataMapper formDataMapper;
+
+    /**
+     * 获取所有项目列表数据
+     *
+     * @param projectSearchBo 查询实体
+     * @param pageQuery       分页对象
+     * @return 所有数据
+     */
+    @Override
+    public TableDataInfo<ProjectSearchVo> queryProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery) {
+        Page<ProjectSearchVo> page = baseMapper.selectPageProjectList(pageQuery.build(), projectSearchBo);
+        return TableDataInfo.build(page);
+    }
+}
+

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.cscec.mapper.DContractMapper">
+
+    <select id="selectPageProjectList" resultType="com.dsk.cscec.domain.vo.ProjectSearchVo">
+        select c.contract_key,
+        c.project_name,
+        c.owner_name,
+        c.contract_sign_date,
+        abp.project_manager_and_phone,
+        abp.business_manager_and_phone,
+        abp.bid_agency_unit,
+        abp.first_audit_unit,
+        abp.second_audit_unit,
+        abp.third_audit_unit
+        from d_contract c
+        left join advisory_body_project abp on c.contract_key = abp.project_key
+        <where>
+            <if test="bo.projectName != null and bo.projectName != ''">
+                c.project_name = #{bo.projectName}
+            </if>
+            <if test="bo.ownerUnit != null and bo.ownerUnit != ''">
+                and c.owner_name = #{bo.ownerUnit}
+            </if>
+        </where>
+        order by c.contract_sign_date desc
+    </select>
+</mapper>
\ No newline at end of file