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-admin/src/main/resources/application.yml

@@ -173,6 +173,14 @@ tenant:
     - biz_dict_data
     - push_monitor_rules
     - push_monitor_info
+    - d_customer_business_license
+    - d_customer_inspection_certificate
+    - d_customer_org_certificate
+    - d_customer_other_certificate
+    - d_customer_performance_certificate
+    - d_customer_qualification_certificate
+    - d_customer_safety_certificate
+    - d_customer_tax_certificate
 
 
 # MyBatisPlus配置

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

@@ -39,6 +39,11 @@ public class AddAdvisoryBodyBo {
      */
     @NotBlank(message = "经营范围不能为空")
     private String businessScope;
+    /**
+     * 合作时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date cooperatorDate;
     /**
      * 项目负责人
      */

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

 package com.dsk.cscec.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 供应商准入情况
@@ -31,6 +33,9 @@ public class CustomerApproveVo {
      * 注册资金
      */
     private Double registerCapital;
+    /**
+     * 证件选择
+     */
     /**
      * 统一社会信用代码
      */
@@ -63,6 +68,9 @@ public class CustomerApproveVo {
      * 纳税人税率
      */
     private String taxRate;
+    /**
+     * 享受优惠政策说明
+     */
     /**
      * 法人代表
      */
@@ -75,6 +83,9 @@ public class CustomerApproveVo {
      * 联系电话
      */
     private String contactPhone;
+    /**
+     * 主项资质
+     */
     /**
      * 业主性质
      */
@@ -166,6 +177,42 @@ public class CustomerApproveVo {
      * 授权委托书到期时间7
      */
     private String expireDate7;
+    /**
+     *营业执照url
+     */
+    private List<CertificateVo> businessLicenseList;
+    /**
+     * 组织机构代码证url
+     */
+    private List<CertificateVo> orgCertificateList;
+    /**
+     * 税务登记证url
+     */
+    private List<CertificateVo> taxCertificateList;
+    /**
+     * 资质证书url
+     */
+    private List<CertificateVo> qualificationCertificateList;
+    /**
+     * 安全生产url
+     */
+    private List<CertificateVo> safetyCertificateList;
+    /**
+     * 增值税一般纳税人资格证明url
+     */
+    private List<CertificateVo> ratepayerCertificateList;
+    /**
+     * 业绩报告url
+     */
+    private List<CertificateVo> performanceCertificateList;
+    /**
+     * 考察报告url
+     */
+    private List<CertificateVo> inspectionCertificateList;
+    /**
+     * 其他url
+     */
+    private List<CertificateVo> otherCertificateList;
     //审批意见
     /**
      * 是否同意准入/准入情况

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;
@@ -57,6 +58,11 @@ public class ProjectSearchVo {
      */
     private String projectType;
 
+    /**
+     * 项目与咨询机构关系
+     */
+    private AdvisoryBodyProject advisoryBodyProject;
+
     /**
      * 合同金额
      */

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

@@ -85,7 +85,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
                         item.setCompanyId(companyId);
                     }
                 }catch (Exception e){
-                    //
+                    log.error("CustomerInfoServiceImpl.queryPageList() error:" + e);
                 }
             });
         }
@@ -105,6 +105,27 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
         lqw.orderByDesc(DCustomer::getApproveDate2);
         lqw.last("limit 1");
         DCustomer dCustomer = baseMapper.selectOne(lqw);
+        if(ObjectUtil.isNotEmpty(dCustomer)){
+            //营业执照url
+            dCustomer.setBusinessLicenseList(baseMapper.selectBusinessLicense(dCustomer.getCustomerId()));
+            //组织机构代码证url
+            dCustomer.setOrgCertificateList(baseMapper.selectOrgCertificate(dCustomer.getCustomerId()));
+            //税务登记证url
+            dCustomer.setTaxCertificateList(baseMapper.selectTaxCertificate(dCustomer.getCustomerId()));
+            //资质证书url
+            dCustomer.setQualificationCertificateList(baseMapper.selectQualificationCertificate(dCustomer.getCustomerId()));
+            //安全生产url
+            dCustomer.setSafetyCertificateList(baseMapper.selectSafetyCertificate(dCustomer.getCustomerId()));
+            //增值税一般纳税人资格证明url
+//            dCustomer.setRatepayerCertificateList(baseMapper.selectRatepayerCertificate(dCustomer.getCustomerId()));
+            //业绩报告url
+            dCustomer.setPerformanceCertificateList(baseMapper.selectPerformanceCertificate(dCustomer.getCustomerId()));
+            //考察报告url
+            dCustomer.setInspectionCertificateList(baseMapper.selectInspectionCertificate(dCustomer.getCustomerId()));
+            //其他url
+            dCustomer.setOtherCertificateList(baseMapper.selectOtherCertificate(dCustomer.getCustomerId()));
+
+        }
         CustomerApproveVo vo = BeanUtil.toBean(dCustomer, CustomerApproveVo.class);
         return vo;
     }

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

@@ -85,6 +85,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
             //补充咨询机构信息
             projectSearchVo.setAdvisoryBody(this.getAdvisoryBodyByProjectKey(projectSearchVo.getProjectKey()));
 
+            //补充项目与咨询机构关联信息
+            projectSearchVo.setAdvisoryBodyProject(advisoryBodyProjectMapper.selectById(projectSearchVo.getProjectKey()));
+
             //关键字标红
             if (StringUtils.isNotBlank(projectSearchBo.getProjectName())) {
                 projectSearchVo.setProjectName(StringUtils.markInRed(projectSearchVo.getProjectName(), projectSearchBo.getProjectName()));

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/CompanyRelationTableV1Controller.java

@@ -71,7 +71,7 @@ public class CompanyRelationTableV1Controller {
      *@date: 2023/5/18 10:29
      */
     @PostMapping("/statistics")
-    public R statistics(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
+    public R statistics(@RequestBody JskCompanyRelationTableV1DetailPageDto dto) throws Exception{
         return relationTableV1Service.statistics(dto);
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/RegionalEconomicDataController.java

+package com.dsk.jsk.controller;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.jsk.domain.*;
+import com.dsk.jsk.domain.bo.*;
+import com.dsk.jsk.service.service.EconomicService;
+import com.dsk.jsk.util.IpUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+
+/**
+ * @ClassName RegionalEconomicDataController
+ * @Description 区域经济大全
+ * @Author Dgm
+ * @Date 2023/5/18 10:09
+ * @Version 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping(value ="/economic")
+public class RegionalEconomicDataController {
+
+    @Autowired
+    private EconomicService economicService;
+
+    /***
+     *@Description: 全国经济大全分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/national/nationalPage")
+    public AjaxResult nationalPage(@RequestBody @Valid OpRegionalEconomicDataV1PageDto dto) {
+        return economicService.nationalPage(dto);
+    }
+
+    /***
+     *@Description: 获取年份
+     *@Param:
+     *@return: com.dsk.acc.security.common.msg.RestResponse
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/years/list")
+    public AjaxResult yearsList(@RequestBody OpRegionalEconomicDataYearsListDto dto) {
+        return economicService.yearsList(dto);
+    }
+
+
+    /***
+     *@Description: 全国经济大全详情
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/details")
+    public AjaxResult details(@RequestBody @Valid OpRegionalEconomicDataDetailsDto detailsDto) {
+        return economicService.details(detailsDto);
+    }
+
+    /***
+     *@Description: 获取当前地区
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping(value = "location")
+    public AjaxResult location(@RequestBody OpRegionalLocalDto vo, HttpServletRequest request){
+        String ip = IpUtil.getIpAddr(request);
+        vo.setIp(ip);
+        return economicService.location(vo);
+    }
+
+
+    /***
+     *@Description: 地区经济-统计
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/statistics/regional")
+    public AjaxResult statisticsRegional(@RequestBody OpRegionalEconomicDataStatisticsRegionalDto dto) {
+        return economicService.statisticsRegional(dto);
+    }
+
+    /***
+     *@Description: 地区经济-主要指标列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/regional/list")
+    public AjaxResult regionalList(@RequestBody OpRegionalEconomicDataRegionalListDto dto) {
+        return economicService.regionalList(dto);
+    }
+
+    /***
+     *@Description: 地区经济
+     *@Param:
+     *@return: com.dsk.acc.security.common.msg.RestResponse
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/regional/compare")
+    public AjaxResult regionalCompare(@RequestBody OpRegionalEconomicDataStatisticsRegionalDto dto) {
+        return economicService.regionalCompare(dto);
+    }
+
+    /***
+     *@Description: 地区经济-对比
+     *@Param:
+     *@return: com.dsk.acc.security.common.msg.RestResponse
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/regional/multipleCompare")
+    public AjaxResult regionalMultipleCompare(@RequestBody OpRegionalEconomicRegionalCompareDto compareDto) {
+        return economicService.regionalMultipleCompare(compareDto);
+    }
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataDetailsDto.java

+package com.dsk.jsk.domain;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1Dto
+ * @Description  区域经济大全-详情
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataDetailsDto {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id 不能为空")
+    private Integer id;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataRegionalListDto.java

+package com.dsk.jsk.domain;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1Dto
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataRegionalListDto {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id 不能为空")
+    private Integer id;
+
+    /**
+     * 省Id
+     */
+    @NotNull(message = "provinceId 不能为空")
+    private Integer provinceId;
+
+    /**
+     * 市Id
+     */
+    private Integer cityId;
+
+    /**
+     * 区Id
+     */
+    private Integer areaId;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataStatisticsRegionalDto.java

+package com.dsk.jsk.domain;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1Dto
+ * @Description 地区经济
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataStatisticsRegionalDto {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id 不能为空")
+    private Integer id;
+
+    /**
+     * 年份
+     */
+    private Integer year;
+
+    /**
+     * 省Id
+     */
+    private Integer provinceId;
+
+    /**
+     * 市Id
+     */
+    private Integer cityId;
+
+    /**
+     * 区Id
+     */
+    private Integer areaId;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataV1Dto.java

+package com.dsk.jsk.domain;
+
+import lombok.Data;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1Dto
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataV1Dto {
+
+    /**
+     * id
+     */
+    private Integer id;
+
+    /**
+     * 年份
+     */
+    private Integer year;
+
+    /**
+     * 省Id
+     */
+    private Integer provinceId;
+
+    /**
+     * 市Id
+     */
+    private Integer cityId;
+
+    /**
+     * 区Id
+     */
+    private Integer areaId;
+
+    /**
+     * 城市类型 1：直辖市
+     */
+    private Integer cityType;
+
+    /**
+     * 城市类型 1：直辖市
+     */
+    private Integer provinceType;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataV1PageDto.java

+package com.dsk.jsk.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1PageDto
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataV1PageDto extends BasePage {
+
+    /**
+     * 年份
+     */
+    private Integer year;
+    /**
+     * 省
+     */
+    private List<Integer> provinceIds;
+    /**
+     * 市
+     */
+    private List<Integer> cityIds;
+    /**
+     * 区
+     */
+    private List<Integer> areaIds;
+
+    /**
+     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     */
+    private Integer type;
+
+    /**
+     * 排序字段 默认gdp
+     */
+    private String field = "gdp";
+    /**
+     * 排序 (降序desc 升序asc)
+     */
+    private String order = "desc";
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataYearsListDto.java

+package com.dsk.jsk.domain;
+
+import lombok.Data;
+
+/**
+ * @ClassName OpRegionalEconomicDataYearsListDto
+ * @Description 获取年份
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataYearsListDto {
+
+    private Integer year;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicRegionalCompareDto.java

+package com.dsk.jsk.domain;
+
+import cn.hutool.core.util.ObjectUtil;
+
+import java.util.List;
+
+/**
+ * @ClassName OpRegionalEconomicRegionalCompareDto
+ * @Description 地区经济-对比
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+public class OpRegionalEconomicRegionalCompareDto {
+
+    /**
+     * 年份
+     */
+    private Integer year;
+
+    private List<OpRegionalEconomicDataStatisticsRegionalDto> compareList;
+
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public List<OpRegionalEconomicDataStatisticsRegionalDto> getCompareList() {
+        if (ObjectUtil.isNotEmpty(compareList)) {
+            for (OpRegionalEconomicDataStatisticsRegionalDto dataStatisticsRegionalDto : compareList) {
+                dataStatisticsRegionalDto.setYear(year);
+            }
+        }
+        return compareList;
+    }
+
+    public void setCompareList(List<OpRegionalEconomicDataStatisticsRegionalDto> compareList) {
+        this.compareList = compareList;
+    }
+
+    @Override
+    public String toString() {
+        return "OpRegionalEconomicRegionalCompareDto{" +
+                "year=" + year +
+                ", compareList=" + compareList +
+                '}';
+    }
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/CompanyRelationTableV1Service.java

@@ -63,8 +63,13 @@ public class CompanyRelationTableV1Service {
      *@Author: Dgm
      *@date: 2023/5/18 10:29
      */
-    public R statistics(JskCompanyRelationTableV1Dto dto) throws Exception{
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/statistics", BeanUtil.beanToMap(dto, false, false));
+    public R statistics(JskCompanyRelationTableV1DetailPageDto dto) throws Exception{
+        Map<String, Object> map = null;
+        if (dto.getCompanyType().equals(3) || dto.getCompanyType().equals(4)) {
+            map = dskOpenApiUtil.requestBody("/operate/consultancy/combineDetail/statistics", BeanUtil.beanToMap(dto, false, false));
+        } else {
+            map = dskOpenApiUtil.requestBody("/operate/consultancy/statistics", BeanUtil.beanToMap(dto, false, false));
+        }
         return BeanUtil.toBean(map, R.class);
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/service/EconomicService.java

+package com.dsk.jsk.service.service;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.jsk.domain.*;
+import com.dsk.jsk.domain.bo.*;
+
+/**
+ * @ClassName EconomicService
+ * @Description 经济大全业务层
+ * @Author Dgm
+ * @Date 2023/5/18 10:17
+ * @Version 1.00
+ */
+public interface EconomicService {
+
+    /***
+     *@Description: 全国经济大全分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult nationalPage(OpRegionalEconomicDataV1PageDto dto);
+
+
+    /***
+     *@Description: 全国经济大全分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult yearsList(OpRegionalEconomicDataYearsListDto dataYearsListDto);
+
+
+    /***
+     *@Description: 全国经济大全详情
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult details(OpRegionalEconomicDataDetailsDto detailsDto);
+
+
+    /***
+     *@Description: 获取当前地区
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult location(OpRegionalLocalDto detailsDto);
+
+
+    /***
+     *@Description: 地区经济统计
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult statisticsRegional(OpRegionalEconomicDataStatisticsRegionalDto dto);
+
+    /***
+     *@Description: 地区经济-分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult regionalList(OpRegionalEconomicDataRegionalListDto dto);
+
+    /***
+     *@Description: 对比经济
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult regionalCompare(OpRegionalEconomicDataStatisticsRegionalDto dto);
+
+    /***
+     *@Description: 地区经济-对比
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult regionalMultipleCompare (OpRegionalEconomicRegionalCompareDto dto);
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/service/impl/EconomicServiceImpl.java

+package com.dsk.jsk.service.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.dsk.common.constant.CacheConstants;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.helper.LoginHelper;
+import com.dsk.common.utils.DateUtils;
+import com.dsk.jsk.domain.*;
+import com.dsk.system.utils.DskOpenApiUtil;
+import com.dsk.common.utils.JsonUtils;
+import com.dsk.jsk.domain.bo.*;
+import com.dsk.jsk.service.service.EconomicService;
+import com.dsk.jsk.util.RedisCache;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * @ClassName EconomicServiceImpl
+ * @Description 经济大全实现
+ * @Author Dgm
+ * @Date 2023/5/18 10:23
+ * @Version
+ */
+@Service
+public class EconomicServiceImpl implements EconomicService {
+
+    @Resource
+    private DskOpenApiUtil dskOpenApiUtil;
+
+    @Resource
+    private RedisCache redisCache;
+
+    /**
+     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     */
+    private static final Integer TYPE = 1;
+
+    /**
+     * 默认排序
+     */
+    private static final String FIELD = "gdp";
+    private static final String ORDER = "desc";
+
+
+
+
+    @Override
+    public AjaxResult nationalPage(OpRegionalEconomicDataV1PageDto dto) {
+        if (ObjectUtil.isEmpty(dto.getYear())) {
+            dto.setYear(DateUtils.getYear() - 1);
+        }
+
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (!code.equals(HttpStatus.OK.value())) {
+            throw new RuntimeException();
+        }
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult yearsList(OpRegionalEconomicDataYearsListDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/years/list",  BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult details(OpRegionalEconomicDataDetailsDto detailsDto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/details", BeanUtil.beanToMap(detailsDto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult location(OpRegionalLocalDto detailsDto) {
+        Long userId = LoginHelper.getUserId();
+        String redisKey = CacheConstants.PERSONAL_LOCATION + userId;
+        if (ObjectUtil.isEmpty(detailsDto.getProvinceId()) && ObjectUtil.isEmpty(detailsDto.getCityId()) && ObjectUtil.isEmpty(detailsDto.getAreaId())) {
+            if (ObjectUtil.isNotEmpty(redisKey)) {
+                Map<Object, Object> cacheMap = JsonUtils.parseObject(redisCache.getCacheObject(redisKey), Map.class);
+                if (MapUtils.isNotEmpty(cacheMap)) {
+                    return AjaxResult.success(cacheMap);
+                }
+            }
+        }
+
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/location", BeanUtil.beanToMap(detailsDto, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (!code.equals(HttpStatus.OK.value())) {
+            throw new RuntimeException();
+        }
+        Map data = MapUtils.getMap(map, "data", null);
+        if (ObjectUtil.isNotEmpty(detailsDto.getProvinceId()) || ObjectUtil.isNotEmpty(detailsDto.getCityId()) || ObjectUtil.isNotEmpty(detailsDto.getAreaId())) {
+            redisCache.setCacheObject(redisKey, JsonUtils.toJsonString(data));
+        }
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult statisticsRegional(OpRegionalEconomicDataStatisticsRegionalDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/statistics/regional",  BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult regionalList(OpRegionalEconomicDataRegionalListDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/regional/list",  BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult regionalCompare(OpRegionalEconomicDataStatisticsRegionalDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/regional/compare",  BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult regionalMultipleCompare(OpRegionalEconomicRegionalCompareDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/regional/multipleCompare",  BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+}

dsk-operate-ui/src/assets/styles/supplierlist.scss

@@ -152,9 +152,6 @@
       border-right: 1px solid #E6E9F0;
       border-bottom: 1px solid #E6E9F0;
       background: #fff;
-      &.bg{
-        background: #F9FCFF;
-      }
       .label {
         width: 10%;
         height: auto;
@@ -205,6 +202,33 @@
     }
 
   }
+  .table-box{
+    margin-top: 16px;
+    border: 1px solid #E6E9F0;
+    width: 100%;
+    border-top: 0;
+    thead{
+      background: #F0F3FA;
+    }
+    tr:nth-child(2n+1){
+      background: #F9FCFF;
+    }
+    tr:hover{
+      background: #dcebff;
+    }
+    td{
+      border-top: 1px solid #E6E9F0;
+      border-right: 1px solid #E6E9F0;
+      height: auto;
+      font-weight: 400;
+      font-size: 12px;
+      padding: 12px;
+    }
+    .blue{
+      color: #0081ff;
+      cursor: pointer;
+    }
+  }
 }
 .table-supplier .fixed-table .el-table__fixed-header-wrapper{
   top: -16px !important;

dsk-operate-ui/src/views/login.vue

@@ -22,7 +22,7 @@
           <!--<img class="img" slot="prefix" src="../assets/images/phone.png"/>-->
         <!--</el-input>-->
       <!--</el-form-item>-->
-      <!--<el-form-item prop="captchaCode" v-if="captchaEnabled">-->
+      <!--<el-form-item prop="captchaCode" v-if="captchaEnabled" class="el-item-with-code">-->
         <!--<el-input-->
           <!--v-model="dxform.captchaCode"-->
           <!--auto-complete="off"-->
@@ -35,7 +35,7 @@
           <!--<img :src="codeUrl" @click="getCode" class="login-code-img"/>-->
         <!--</div>-->
       <!--</el-form-item>-->
-      <!--<el-form-item prop="smsCode">-->
+      <!--<el-form-item prop="smsCode"  class="el-item-with-code">-->
         <!--<el-input-->
           <!--v-model="dxform.smsCode"-->
           <!--auto-complete="off"-->
@@ -71,7 +71,7 @@
           <!--<div @click="isDXlogin = true">快捷登录</div>-->
         <!--</div>-->
         <div class="loginname"><img src="../assets/images/login/ztlogo.png">中建一局集团第二建筑有限公司</div>
-        <el-form-item prop="username">
+        <el-form-item prop="username" >
           <el-input
             v-model="loginForm.username"
             type="text"
@@ -94,7 +94,7 @@
             <img class="img" slot="prefix" src="../assets/images/password.png"/>
           </el-input>
         </el-form-item>
-        <el-form-item prop="code" v-if="captchaEnabled">
+        <el-form-item prop="code" v-if="captchaEnabled" class="el-item-with-code">
           <el-input
             v-model="loginForm.code"
             auto-complete="off"
@@ -136,7 +136,7 @@
             <img class="img" slot="prefix" src="../assets/images/phone.png"/>
           </el-input>
         </el-form-item>
-        <el-form-item prop="captchaCode" v-if="captchaEnabled && showcode">
+        <el-form-item prop="captchaCode" v-if="captchaEnabled && showcode" class="el-item-with-code">
           <el-input
             v-model="dxform.captchaCode"
             @focus="getCode"
@@ -150,7 +150,7 @@
             <img :src="codeUrl" @click="getCode" class="login-code-img"/>
           </div>
         </el-form-item>
-        <el-form-item prop="smsCode">
+        <el-form-item prop="smsCode" class="el-item-with-code">
           <el-input
             v-model="dxform.smsCode"
             auto-complete="off"
@@ -697,4 +697,59 @@
     background: #566380;
   }
 }
+@media screen and (max-width : 750px){
+  .left {
+    display: none;
+  }
+  .login-form {
+    width: 90%;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%,-50%);
+    margin-top: 0px;
+    box-sizing: border-box;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+
+    .el-input {
+      width: 100%;
+
+      .el-input__inner::placeholder {
+        font-size: 12px !important;
+      }
+    }
+
+    .el-item-with-code {
+      .el-form-item__content {
+        display: flex;
+        line-height: 1;
+
+        .el-input {
+          float: unset !important;
+          width: 175px !important;
+          min-width: 175px;
+        }
+
+        .login-code {
+          height: 48px;
+          width: auto;
+          flex: 1;
+          float: unset !important;
+
+          &>img {
+            width: 100%;
+            height: 100%;
+          }
+
+          .hqyzm {
+            width: 100%;
+            font-size: 12px;
+            border: unset;
+            border-radius: unset;
+          }
+        }
+      }
+    }
+  }
+}
 </style>

dsk-operate-ui/src/views/supplier/supplierlist/access.vue

@@ -101,78 +101,152 @@
             </div>
             <div class="acc-title i">上传证书及其他信息</div>
             <skeleton v-if="fbsisSkeleton"></skeleton>
-            <div class="main3-box">
-              <p>
-                <label class="label tab">证书类型</label>
-                <label class="label tab">到期时间</label>
-                <label class="label tab">状态</label>
-                <label class="label tab">查看</label>
-                <label class="label tab">操作</label>
-              </p>
-              <p>
-                <span class="tab">营业执照</span>
-                <span class="tab">{{custmerInfo.expireDate1 || '--'}}</span>
-                <span class="tab">{{custmerInfo.status1}}</span>
-                <span class="tab blue"></span>
-                <span class="tab blue">下载</span>
-              </p>
-              <p class="bg">
-                <span class="tab">组织机构代码</span>
-                <span class="tab">{{custmerInfo.expireDate2 || '--'}}</span>
-                <span class="tab">{{custmerInfo.status2}}</span>
-                <span class="tab blue"></span>
-                <span class="tab blue">下载</span>
-              </p>
-              <p>
-                <span class="tab">税务登记证</span>
-                <span class="tab">{{custmerInfo.expireDate3 || '--'}}</span>
-                <span class="tab">{{custmerInfo.status3}}</span>
-                <span class="tab blue"></span>
-                <span class="tab blue">下载</span>
-              </p>
-              <p class="bg">
-                <span class="tab">资质证书</span>
-                <span class="tab">{{custmerInfo.expireDate4 || '--'}}</span>
-                <span class="tab">{{custmerInfo.status4}}</span>
-                <span class="tab blue"></span>
-                <span class="tab blue">下载</span>
-              </p>
-              <p>
-                <span class="tab">安全生产</span>
-                <span class="tab">{{custmerInfo.expireDate5 || '--'}}</span>
-                <span class="tab">{{custmerInfo.status5}}</span>
-                <span class="tab blue"></span>
-                <span class="tab blue">下载</span>
-              </p>
-              <p class="bg">
-                <span class="tab">增值税一般纳税人资格证明</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-              </p>
-              <p>
-                <span class="tab">业绩报告</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-              </p>
-              <p class="bg">
-                <span class="tab">考察报告</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-              </p>
-              <p>
-                <span class="tab">其他</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-                <span class="tab">--</span>
-              </p>
-            </div>
+            <table class="table-box" border="0" cellspacing="0" >
+              <thead>
+                <td width="30%">证书类型</td>
+                <td width="25%">到期时间</td>
+                <td width="10%">状态</td>
+                <td width="35%">查看</td>
+              </thead>
+              <template v-if="custmerInfo.businessLicenseList&&custmerInfo.businessLicenseList.length>0">
+                <tr v-for="(item,index) in custmerInfo.businessLicenseList">
+                  <td :rowspan="custmerInfo.businessLicenseList.length" v-if="index == 0">营业执照</td>
+                  <td>{{custmerInfo.expireDate1 || '--'}}</td>
+                  <td>{{custmerInfo.status1}}</td>
+                  <td class="blue">
+                    <el-link :href="`${item.docLink}`" :underline="false" target="_blank">
+                      <span class="blue"> {{item.docName}}</span>
+                    </el-link>
+                  </td>
+                </tr>
+              </template>
+              <template v-else>
+                <tr>
+                  <td>营业执照</td>
+                  <td>--</td>
+                  <td>--</td>
+                  <td>--</td>
+                </tr>
+              </template>
+              <template v-if="custmerInfo.orgCertificateList&&custmerInfo.orgCertificateList.length>0">
+                <tr v-for="(item,index) in custmerInfo.orgCertificateList">
+                  <td :rowspan="custmerInfo.orgCertificateList.length" v-if="index == 0">组织机构代码</td>
+                  <td>{{custmerInfo.expireDate2 || '--'}}</td>
+                  <td>{{custmerInfo.status2}}</td>
+                  <td class="blue">
+                    <el-link :href="`${item.docLink}`" :underline="false" target="_blank">
+                      <span class="blue"> {{item.docName}}</span>
+                    </el-link>
+                  </td>
+                </tr>
+              </template>
+              <template v-else>
+                <tr>
+                  <td>组织机构代码</td>
+                  <td>--</td>
+                  <td>--</td>
+                  <td>--</td>
+                </tr>
+              </template>
+              <template v-if="custmerInfo.taxCertificateList&&custmerInfo.taxCertificateList.length>0">
+                <tr v-for="(item,index) in custmerInfo.taxCertificateList">
+                  <td :rowspan="custmerInfo.taxCertificateList.length" v-if="index == 0">税务登记证</td>
+                  <td>{{custmerInfo.expireDate3 || '--'}}</td>
+                  <td>{{custmerInfo.status3}}</td>
+                  <td class="blue">
+                    <el-link :href="`${item.docLink}`" :underline="false" target="_blank">
+                      <span class="blue"> {{item.docName}}</span>
+                    </el-link>
+                  </td>
+                </tr>
+              </template>
+              <template v-else>
+                <tr>
+                  <td>税务登记证</td>
+                  <td>--</td>
+                  <td>--</td>
+                  <td>--</td>
+                </tr>
+              </template>
+              <template v-if="custmerInfo.qualificationCertificateList&&custmerInfo.qualificationCertificateList.length>0">
+                <tr v-for="(item,index) in custmerInfo.qualificationCertificateList">
+                  <td :rowspan="custmerInfo.qualificationCertificateList.length" v-if="index == 0">资质证书</td>
+                  <td>{{custmerInfo.expireDate4 || '--'}}</td>
+                  <td>{{custmerInfo.status4}}</td>
+                  <td class="blue">
+                    <el-link :href="`${item.docLink}`" :underline="false" target="_blank">
+                      <span class="blue"> {{item.docName}}</span>
+                    </el-link>
+                  </td>
+                </tr>
+              </template>
+              <template v-else>
+                <tr>
+                  <td>资质证书</td>
+                  <td>--</td>
+                  <td>--</td>
+                  <td>--</td>
+                </tr>
+              </template>
+              <template v-if="custmerInfo.safetyCertificateList&&custmerInfo.safetyCertificateList.length>0">
+                <tr v-for="(item,index) in custmerInfo.safetyCertificateList">
+                  <td :rowspan="custmerInfo.safetyCertificateList.length" v-if="index == 0">安全生产</td>
+                  <td>{{custmerInfo.expireDate5 || '--'}}</td>
+                  <td>{{custmerInfo.status5}}</td>
+                  <td class="blue">
+                    <el-link :href="`${item.docLink}`" :underline="false" target="_blank">
+                      <span class="blue"> {{item.docName}}</span>
+                    </el-link>
+                  </td>
+                </tr>
+              </template>
+              <template v-else>
+                <tr>
+                  <td>安全生产</td>
+                  <td>--</td>
+                  <td>--</td>
+                  <td>--</td>
+                </tr>
+              </template>
+              <template v-if="custmerInfo.ratepayerCertificateList&&custmerInfo.ratepayerCertificateList.length>0">
+                <tr v-for="(item,index) in custmerInfo.ratepayerCertificateList">
+                  <td :rowspan="custmerInfo.ratepayerCertificateList.length" v-if="index == 0">增值税一般纳税人资格证明</td>
+                  <td></td>
+                  <td></td>
+                  <td class="blue">
+                    <el-link :href="`${item.docLink}`" :underline="false" target="_blank">
+                      <span class="blue">{{item.docName}}</span>
+                    </el-link>
+                  </td>
+                </tr>
+              </template>
+              <template v-else>
+                <tr>
+                  <td>增值税一般纳税人资格证明</td>
+                  <td>--</td>
+                  <td>--</td>
+                  <td>--</td>
+                </tr>
+              </template>
+              <tr>
+                <td>业绩报告</td>
+                <td>--</td>
+                <td>--</td>
+                <td>--</td>
+              </tr>
+              <tr>
+                <td>考察报告</td>
+                <td>--</td>
+                <td>--</td>
+                <td>--</td>
+              </tr>
+              <tr>
+                <td>其他</td>
+                <td>--</td>
+                <td>--</td>
+                <td>--</td>
+              </tr>
+            </table>
             <div class="acc-title i">项目部意见</div>
             <div class="main3-box">
               <p>

dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue

@@ -225,7 +225,7 @@
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="creditLevel" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">