Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

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

@@ -74,8 +74,9 @@ public class AdvisoryBodyManageController extends BaseController {
      * 获取项目详情
      */
     @GetMapping("/getProjectDetail")
-    public R<ProjectDetailVo> getProjectDetail(@Validated ProjectDetailBo projectDetailBo) {
+    public R<ProjectDetailNewVo> getProjectDetail(@Validated ProjectDetailBo projectDetailBo) {
         return R.ok(projectService.queryProjectDetail(projectDetailBo));
+
     }
 
     /**

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

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -18,6 +19,13 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class DContract implements Serializable {
     private static final long serialVersionUID = 374272443452482335L;
+
+    /**
+     * 省市
+     */
+    private String addr;
+
+
     /**
      * 合同主键
      */

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

+package com.dsk.cscec.domain.vo;
+
+import com.dsk.cscec.domain.AdvisoryBody;
+import com.dsk.cscec.domain.AdvisoryBodyProject;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author sxk
+ * @date 2023.12.14
+ * @time 16:18
+ */
+@Data
+public class ProjectDetailNewVo {
+    //咨询机构结算信息
+    /**
+     * 咨询机构
+     */
+    private AdvisoryBody advisoryBody;
+    /**
+     * 项目信息
+     */
+    private AdvisoryBodyProject advisoryBodyProject;
+    /**
+     * 法定代表人
+     */
+    private String corporatePerson;
+    /**
+     * 注册地址
+     */
+    private String regAddress;
+
+
+
+
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    //工程基本信息-项目主体
+    /**
+     * 业主名称(业主单位)
+     */
+    private String ownerName;
+    /**
+     * 承包单位主键(工程承包单位)
+     */
+    private String contractunitName;
+
+    /**
+     * 评审级别
+     */
+    private String auditLevel;
+    //国内外
+    /**
+     * 省市
+     */
+    private String addr;
+    /**
+     * 项目承接类型
+     */
+    private String contractMoneychange;
+    /**
+     * 合同总工期
+     */
+    private BigDecimal projectDays;
+    /**
+     * 合同签订日期
+     */
+    private Date contractSignDate;
+    /**
+     * 项目周期
+     */
+    private BigDecimal projectDays2;
+
+    /**
+     * 工程类别大类
+     */
+    private String projectMaintype;
+
+    /**
+     * 工程类型明细
+     */
+    private String projectType2;
+    /**
+     * 建筑面积
+     */
+    private BigDecimal constructArea;
+    /**
+     * 合同金额_补充协议
+     */
+    private BigDecimal contractModifyMoney;
+    /**
+     * 合同金额_不含补充协议
+     */
+    private BigDecimal contractOrigMoney;
+    /**
+     * 合同自施额_不含补充协议
+     */
+    private BigDecimal contractOrigSelfmoney;
+    /**
+     * 计价依据
+     */
+    private String contractValuationMode;
+    /**
+     * 是否分别签订执行和备案合同
+     */
+    private String iscontractdb;
+
+    /**
+     * 支付方式
+     */
+    private String steppayTypeNew;
+    /**
+     * 按月度支付比例
+     */
+    private BigDecimal steppayScaleNew;
+
+    /**
+     * 审核期限
+     */
+    private String steppayCheckDays;
+    /**
+     * 支付期限
+     */
+    private String steppayPayDays ;
+
+    /**
+     * 累计支付
+     */
+    private BigDecimal endpayRate;
+    /**
+     * 保修金预留比例
+     */
+    private BigDecimal repairCostRate;
+
+
+
+    /**
+     * 担保形式
+     */
+    private String suretyType;
+
+
+
+    /**
+     * 担保额度
+     */
+    private String prepaySuretyMargin;
+
+    /**
+     * 竣工结算审核期限
+     */
+    private String endpayCheck;
+
+
+    /**
+     * 工期拖期违约金比例
+     */
+    private String projBrokencontractRange;
+
+    /**
+     * 违约金有无上限
+     */
+    private String ishaveupper;
+
+    /**
+     * 上限比例
+     */
+    private String upperValue;
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsk.cscec.domain.DContract;
 import com.dsk.cscec.domain.DProject;
 import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
@@ -18,6 +19,10 @@ import java.util.List;
  * @since 2023-12-10 15:34:46
  */
 public interface DProjectMapper extends BaseMapper<DProject> {
+
+    DContract getDContractMsgByContractKey(@Param("contractKey") Long contractKey);
+
+
     /**
      * 获取所有项目列表数据
      */
@@ -37,4 +42,4 @@ public interface DProjectMapper extends BaseMapper<DProject> {
      * 获取业主单位列表
      */
     List<String> getOwnerNameList(@Param("contractOrgId") String contractOrgId);
-}
+}
\ No newline at end of file

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

@@ -8,10 +8,7 @@ import com.dsk.cscec.domain.bo.CbCheckProjectCodeExistBo;
 import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo;
 import com.dsk.cscec.domain.bo.ProjectDetailBo;
 import com.dsk.cscec.domain.bo.ProjectSearchBo;
-import com.dsk.cscec.domain.vo.CbProjectInfoVo;
-import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
-import com.dsk.cscec.domain.vo.ProjectDetailVo;
-import com.dsk.cscec.domain.vo.ProjectSearchVo;
+import com.dsk.cscec.domain.vo.*;
 
 import java.util.List;
 
@@ -53,7 +50,8 @@ public interface IDProjectService extends IService<DProject> {
      * @param projectDetailBo 查询实体
      * @return 项目详情
      */
-    ProjectDetailVo queryProjectDetail(ProjectDetailBo projectDetailBo);
+//    ProjectDetailVo queryProjectDetail(ProjectDetailBo projectDetailBo);
+    ProjectDetailNewVo queryProjectDetail(ProjectDetailBo projectDetailBo);
 
     /**
      * 校验项目编码是否存在

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

@@ -14,18 +14,12 @@ import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.StringUtils;
-import com.dsk.cscec.domain.AdvisoryBody;
-import com.dsk.cscec.domain.AdvisoryBodyProject;
-import com.dsk.cscec.domain.CbProjectRecord;
-import com.dsk.cscec.domain.DProject;
+import com.dsk.cscec.domain.*;
 import com.dsk.cscec.domain.bo.CbCheckProjectCodeExistBo;
 import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo;
 import com.dsk.cscec.domain.bo.ProjectDetailBo;
 import com.dsk.cscec.domain.bo.ProjectSearchBo;
-import com.dsk.cscec.domain.vo.CbProjectInfoVo;
-import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
-import com.dsk.cscec.domain.vo.ProjectDetailVo;
-import com.dsk.cscec.domain.vo.ProjectSearchVo;
+import com.dsk.cscec.domain.vo.*;
 import com.dsk.cscec.mapper.AdvisoryBodyMapper;
 import com.dsk.cscec.mapper.AdvisoryBodyProjectMapper;
 import com.dsk.cscec.mapper.CbProjectRecordMapper;
@@ -243,12 +237,13 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
      * @return 项目详情
      */
     @Override
-    public ProjectDetailVo queryProjectDetail(ProjectDetailBo projectDetailBo) {
+    public ProjectDetailNewVo queryProjectDetail(ProjectDetailBo projectDetailBo) {
         Long advisoryBodyCid = projectDetailBo.getAdvisoryBodyCid();
         //查询项目明细  这里要从d_project表切换到
-        DProject dProject = baseMapper.selectOne(new LambdaQueryWrapper<DProject>()
-                .eq(DProject::getProjectKey, projectDetailBo.getProjectKey()));
-        ProjectDetailVo projectDetailVo = BeanUtil.toBean(dProject, ProjectDetailVo.class);
+//        DProject dProject = baseMapper.selectOne(new LambdaQueryWrapper<DProject>()
+//                .eq(DProject::getProjectKey, projectDetailBo.getProjectKey()));
+        DContract dContract = baseMapper.getDContractMsgByContractKey(projectDetailBo.getProjectKey());
+        ProjectDetailNewVo projectDetailVo = BeanUtil.toBean(dContract, ProjectDetailNewVo.class);
 
         //查询咨询机构信息并填充
         projectDetailVo.setAdvisoryBody(advisoryBodyMapper.queryAdvisoryBodyByProjectKey(projectDetailBo.getProjectKey()));

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

@@ -4,6 +4,49 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsk.cscec.mapper.DProjectMapper">
 
+
+    <select id="getDContractMsgByContractKey" resultType="com.dsk.cscec.domain.DContract" parameterType="object">
+
+        SELECT
+        owner_name,
+        contractunit_name,
+        audit_level,
+        CONCAT_WS( "-", province, district ) addr,
+        contract_moneychange,
+        ifnull(CONCAT( project_days, '天' ),	'-'),
+        DATE_FORMAT(contract_sign_date,'%Y-%m-%d'),
+        project_days2,
+        project_name,
+        project_maintype,
+        project_type2,
+        construct_area,
+        contract_modify_money,
+        contract_orig_money,
+        contract_orig_selfmoney,
+        contract_valuation_mode,
+        iscontractdb,
+        steppay_type_new,
+        steppay_scale_new,
+        steppay_check_days,
+        steppay_pay_days,
+        endpay_rate,
+        repair_cost_rate,
+        surety_type,
+        prepay_surety_margin,
+        endpay_check,
+        proj_brokencontract_range,
+        ishaveupper,
+        upper_value
+        FROM
+        d_contract
+
+        WHERE
+        contract_key = #{contractKey}
+
+    </select>
+
+
+
     <select id="selectPageProjectList" resultType="com.dsk.cscec.domain.vo.ProjectSearchVo">
         select p.project_key,
                p.project_id,
@@ -53,4 +96,4 @@
         group BY owner_name
     </select>
 
-</mapper>
+</mapper>
\ No newline at end of file