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/pom.xml

@@ -51,7 +51,11 @@
             <artifactId>dsk-acc-open-sdk-java</artifactId>
             <version>2.1.0</version>
         </dependency>
-
+        <dependency>
+            <groupId>co.elastic.clients</groupId>
+            <artifactId>elasticsearch-java</artifactId>
+            <version>8.7.0</version>
+        </dependency>
 
         <!--        <dependency>-->
 <!--            <groupId>com.tencentcloudapi</groupId>-->

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/constant/QueryConstants.java

+package com.dsk.cscec.constant;
+
+/**
+ * 搜索常量信息
+ *
+ * @author sxk
+ * @date 2023.12.11
+ * @time 14:22
+ */
+public interface QueryConstants {
+    /**
+     * 筛选数据一级公司名称
+     */
+    String LEVEL1_COMPANY_NAME = "中建一局集团第二建筑有限公司";
+
+    /**
+     * 筛选数据一级公司ID
+     */
+    String LEVEL1_COMPANY_ID = "F17305B4EA4444CBAB12892C7B99E475";
+    /**
+     * 筛选数据二级公司名称
+     * 备用,需要时请填入内容
+     */
+    String LEVEL2_COMPANY_NAME = "";
+
+    /**
+     * 筛选数据二级公司ID
+     * 备用,需要时请填入内容
+     */
+    String LEVEL2_COMPANY_ID = "";
+
+}

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

+package com.dsk.cscec.controller;
+
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.cscec.domain.DCustomer;
+import com.dsk.cscec.domain.bo.DCustomerSearchBo;
+import com.dsk.cscec.service.IDCustomerService;
+import com.dsk.system.domain.SysDept;
+import com.dsk.system.domain.vo.SysDeptVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织维表(DCustomer)表控制层
+ *
+ * @author lcl
+ * @since 2023-12-08 14:57:22
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/customer")
+public class DCustomerController extends BaseController {
+    /**
+     * 服务对象
+     */
+    private final IDCustomerService baseService;
+
+    /**
+     * 供应商总台账筛选
+     */
+    @GetMapping("/all/searchList")
+    public TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query) {
+        return baseService.allSearchList(bo,query);
+    }
+
+  
+}
+

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

+package com.dsk.cscec.controller;
+
+
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.cscec.service.IDProjectService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目维表(DProject)表控制层
+ *
+ * @author makejava
+ * @since 2023-12-10 15:34:46
+ */
+@RestController
+@RequestMapping("dProject")
+public class DProjectController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private IDProjectService IDProjectService;
+
+    ///**
+    // * 分页查询所有数据
+    // *
+    // * @param page 分页对象
+    // * @param dProject 查询实体
+    // * @return 所有数据
+    // */
+    //@GetMapping
+    //public R selectAll(Page<DProject> page, DProject dProject) {
+    //    return success(this.dProjectService.page(page, new QueryWrapper<>(dProject)));
+    //}
+    //
+    ///**
+    // * 通过主键查询单条数据
+    // *
+    // * @param id 主键
+    // * @return 单条数据
+    // */
+    //@GetMapping("{id}")
+    //public R selectOne(@PathVariable Serializable id) {
+    //    return success(this.dProjectService.getById(id));
+    //}
+    //
+    ///**
+    // * 新增数据
+    // *
+    // * @param dProject 实体对象
+    // * @return 新增结果
+    // */
+    //@PostMapping
+    //public R insert(@RequestBody DProject dProject) {
+    //    return success(this.dProjectService.save(dProject));
+    //}
+    //
+    ///**
+    // * 修改数据
+    // *
+    // * @param dProject 实体对象
+    // * @return 修改结果
+    // */
+    //@PutMapping
+    //public R update(@RequestBody DProject dProject) {
+    //    return success(this.dProjectService.updateById(dProject));
+    //}
+    //
+    ///**
+    // * 删除数据
+    // *
+    // * @param idList 主键结合
+    // * @return 删除结果
+    // */
+    //@DeleteMapping
+    //public R delete(@RequestParam("idList") List<Long> idList) {
+    //    return success(this.dProjectService.removeByIds(idList));
+    //}
+}
+

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

+package com.dsk.cscec.domain;
+
+import java.util.Date;
+import java.io.Serializable;
+
+import lombok.Data;
+
+/**
+ * 组织维表(DCustomer)表实体类
+ *
+ * @author lcl
+ * @since 2023-12-08 14:57:25
+ */
+@Data
+public class DCustomer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客商主键
+     */
+    private Long customerKey;
+    /**
+     * ipm供应商id
+     */
+    private String customerId;
+    /**
+     * ipm供应商名称
+     */
+    private String cusomerName;
+    /**
+     * 财务客商编码
+     */
+    private String finCustomerCode;
+    /**
+     * 财务客商名称
+     */
+    private String finCustomerName;
+    /**
+     * 税号
+     */
+    private String taxNumber;
+    /**
+     * 是否有效 Y 有效 N 无效
+     */
+    private String isvalid;
+    /**
+     * 供应商编号
+     */
+    private String customerCode;
+    /**
+     * 供应商名称
+     */
+    private String customerName;
+    /**
+     * 供应商状态
+     */
+    private String customerState;
+    /**
+     * 推荐公司ID
+     */
+    private String recommendOrgId;
+    /**
+     * 推荐公司
+     */
+    private String recommendOrg;
+    /**
+     * 准入时间
+     */
+    private Date approveDate2;
+    /**
+     * 版本
+     */
+    private Long version;
+    /**
+     * 供应商id
+     */
+    private String supplierId;
+    /**
+     * 供应商类别编码
+     */
+    private String customerCategoryCode;
+    /**
+     * 法人代表
+     */
+    private String representative;
+    /**
+     * 工商注册号
+     */
+    private String registerNo;
+    /**
+     * 统一社会信用代码
+     */
+    private String unifySocialCode;
+    /**
+     * 税务登记号
+     */
+    private String businessLicense;
+    /**
+     * 组织机构代码号
+     */
+    private String orgnizationCode;
+    /**
+     * 注册资金
+     */
+    private Double registerCapital;
+    /**
+     * 主营业务
+     */
+    private String primaryBusiness;
+    /**
+     * 资质等级
+     */
+    private String credential;
+    /**
+     * 品牌
+     */
+    private String brand;
+    /**
+     * 地址
+     */
+    private String address;
+    /**
+     * 城市id
+     */
+    private String registerCityId;
+    /**
+     * 注册地区域
+     */
+    private String registerRegion;
+    /**
+     * 省份
+     */
+    private String registerProvince;
+    /**
+     * 城市
+     */
+    private String registerCity;
+    /**
+     * 开户行
+     */
+    private String openBank;
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+    /**
+     * 联系人
+     */
+    private String contactPerson;
+    /**
+     * 电话
+     */
+    private String contactPhone;
+    /**
+     * 手机
+     */
+    private String mobile;
+    /**
+     * 邮编
+     */
+    private String zipcode;
+    /**
+     * email
+     */
+    private String email;
+    /**
+     * 网址
+     */
+    private String website;
+    /**
+     * 备注说明
+     */
+    private String remark;
+    /**
+     * 地区编号
+     */
+    private String areaCode;
+    /**
+     * 货币种类
+     */
+    private String currency;
+    /**
+     * 所属组织机构id
+     */
+    private String orgnizationId;
+    /**
+     * 类型
+     */
+    private String customerType;
+    /**
+     * 企业信用情况
+     */
+    private String creditSituation;
+    /**
+     * 创建者id
+     */
+    private String employeeId;
+    /**
+     * 成立日期
+     */
+    private String establishDate;
+    /**
+     * 区号
+     */
+    private String phoneCode;
+    /**
+     * 企业性质
+     */
+    private String customerProperty;
+    /**
+     * 职务
+     */
+    private String sectorPosition;
+    /**
+     * 鉴别字段
+     */
+    private String scope;
+    /**
+     * 传真
+     */
+    private String fax;
+    /**
+     * 供应商类别
+     */
+    private String customerClass;
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    /**
+     * 附属子公司名称
+     */
+    private String subCompany;
+    /**
+     * 联营公司名称
+     */
+    private String alliedCompany;
+    /**
+     * 营业额
+     */
+    private Double turnOver;
+    /**
+     * 主要客户
+     */
+    private String mainCustomer;
+    /**
+     * 主要货源
+     */
+    private String mainResource;
+    /**
+     * 主要经营区域
+     */
+    private String mainRegion;
+    /**
+     * 原材料供应情况
+     */
+    private String rawMaterial;
+    /**
+     * 生产线及产能情况
+     */
+    private String productline;
+    /**
+     * 客商类型
+     */
+    private String customerCategoryType;
+    /**
+     * 所属母公司名称
+     */
+    private String customerFirm;
+    /**
+     * 客商类型id
+     */
+    private String customertypeId;
+    /**
+     * 供应商类别id
+     */
+    private String customerCategoryTypeId;
+    /**
+     * 企业注册地
+     */
+    private String registerAddress;
+    /**
+     * 工厂仓库所在地
+     */
+    private String warehouseAddress;
+    /**
+     * 合作产品
+     */
+    private String teamworkProduct;
+    /**
+     * 供方类型
+     */
+    private String isfactoryorfranchise;
+    /**
+     * 营业执照到期时间1
+     */
+    private Date expireDate1;
+    /**
+     * 组织机构代码证到期时间2
+     */
+    private Date expireDate2;
+    /**
+     * 税务登记证到期时间3
+     */
+    private Date expireDate3;
+    /**
+     * 资质证书到期时间4
+     */
+    private Date expireDate4;
+    /**
+     * 安全生产许可证到期时间5
+     */
+    private Date expireDate5;
+    /**
+     * 队长名称
+     */
+    private String leaderName;
+    /**
+     * 专业类别id
+     */
+    private String groupSpecialtyId;
+    /**
+     * 集团专业类别
+     */
+    private String groupSpecialty;
+    /**
+     * 经营管理能力
+     */
+    private String manageAbility;
+    /**
+     * 产品质量保证能力
+     */
+    private String productQualityAbility;
+    /**
+     * 施工承包范围
+     */
+    private String constructJobScope;
+    /**
+     * 经办人
+     */
+    private String responsiblePerson;
+    /**
+     * 签字时间
+     */
+    private Date approveDate1;
+    /**
+     * 是否同意准入
+     */
+    private String isagree;
+    /**
+     * 商务经理
+     */
+    private String businessManager;
+    /**
+     * 项目经理
+     */
+    private String projectManager;
+    /**
+     * 采购部门负责人
+     */
+    private String purchasePrincipal;
+    /**
+     * 上级公司代码
+     */
+    private String upperCompanyCode;
+    /**
+     * 劳务队伍标志
+     */
+    private String serviceTeamLogo;
+    /**
+     * 劳务队长身份证号
+     */
+    private String laborCaptainIdcard;
+    /**
+     * 劳务队长联系电话
+     */
+    private String laborCaptainPhone;
+    /**
+     * 队伍规模人数
+     */
+    private Double serviceTeamPersonnum;
+    /**
+     * 专业特长
+     */
+    private String serviceTeamSpeciality;
+    /**
+     * 二级市场企业编码
+     */
+    private String secondaryCode;
+    /**
+     * 商务经理签字时间
+     */
+    private Date approveDate3;
+    /**
+     * 项目经理签字时间
+     */
+    private Date approveDate4;
+    /**
+     * 业务流程状态
+     */
+    private String flowState;
+    /**
+     * 是否为进京劳务企业
+     */
+    private String isenterbjlaborcomany;
+    /**
+     * 施工队长资格证到期时间6
+     */
+    private String expireDate6;
+    /**
+     * 授权委托书到期时间7
+     */
+    private String expireDate7;
+    /**
+     * 考评等级
+     */
+    private String creditLevel;
+    /**
+     * 数据标志
+     */
+    private String baseLogo;
+    /**
+     * 推荐项目
+     */
+    private String recommendProject;
+    /**
+     * 推荐项目ID
+     */
+    private String recommendProjectId;
+    /**
+     * 客商推荐时间
+     */
+    private Date recommendDate;
+    /**
+     * 资质证书号
+     */
+    private String aptitudeCard;
+    /**
+     * 安全生产许可证号
+     */
+    private String workSafetyLicense;
+    /**
+     * 主表
+     */
+    private String masterId;
+    /**
+     * 纳税人身份
+     */
+    private String paytaxType;
+    /**
+     * 纳税人税率
+     */
+    private String taxRate;
+    /**
+     * 身份信息选择
+     */
+    private String cardType;
+    /**
+     * 客商分数
+     */
+    private Double customerScore;
+    /**
+     * 客商名称2
+     */
+    private String customerName2;
+    /**
+     * 客商名称3
+     */
+    private String customerName3;
+    /**
+     * 客商名称4
+     */
+    private String customerName4;
+    /**
+     * 国家
+     */
+    private String country;
+    /**
+     * 一体化客商类型
+     */
+    private String finCustomerType;
+    /**
+     * 公司编码
+     */
+    private String companyCode;
+    /**
+     * 业主性质
+     */
+    private String ownerKind;
+    /**
+     * 客商性质
+     */
+    private String customerKind;
+    /**
+     * 数据来源
+     */
+    private String dataSource;
+    /**
+     * 是否业主
+     */
+    private String isowner;
+    /**
+     * 是否供应商
+     */
+    private String iscustomer;
+    /**
+     * 地址1
+     */
+    private String abbrName1;
+    /**
+     * 地址2
+     */
+    private String abbrName2;
+    /**
+     * 税率类型
+     */
+    private String taxType;
+    /**
+     * 是否冻结
+     */
+    private String isfreeze;
+    /**
+     * 数据变化时间
+     */
+    private String updateDate;
+    /**
+     * 数据更新时间
+     */
+    private Date loadTime;
+}
+

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

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @Author lcl
+ * @Data 2023/12/8 16:07
+ */
+@Data
+public class DCustomerSearchBo {
+    /**
+     * 供应商名称
+     */
+    private String customerName;
+    /**
+     * 区域
+     */
+    private String[] region;
+    /**
+     * 省
+     */
+    private String[] province;
+    /**
+     * 市
+     */
+    private String[] city;
+    /**
+     * 供应商类别
+     */
+    private String[] customerClass;
+    /**
+     * 供应商状态
+     */
+    private String[] customerState;
+    /**
+     * 评价等级
+     */
+    private String[] creditLevel;
+    /**
+     * 资质等级
+     */
+    private String[] credential;
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DCustomerMapper.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.DCustomer;
+import com.dsk.cscec.domain.bo.DCustomerSearchBo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 组织维表(DCustomer)表数据库访问层
+ *
+ * @author lcl
+ * @since 2023-12-08 14:57:27
+ */
+public interface DCustomerMapper extends BaseMapper<DCustomer> {
+
+    Page<DCustomer> allSearchList(IPage<DCustomerSearchBo> build, @Param("bo") DCustomerSearchBo bo);
+
+}
+

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.DProject;
+
+/**
+ * 项目维表(DProject)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-12-10 15:34:46
+ */
+public interface DProjectMapper extends BaseMapper<DProject> {
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDCustomerService.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.DCustomer;
+import com.dsk.cscec.domain.bo.DCustomerSearchBo;
+
+/**
+ * 组织维表(DCustomer)表服务接口
+ *
+ * @author lcl
+ * @since 2023-12-08 14:57:26
+ */
+public interface IDCustomerService extends IService<DCustomer> {
+
+    TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query);
+
+}
+

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.DProject;
+
+/**
+ * 项目维表(DProject)表服务接口
+ *
+ * @author makejava
+ * @since 2023-12-10 15:34:51
+ */
+public interface IDProjectService extends IService<DProject> {
+
+}
+

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

+package com.dsk.cscec.service.impl;
+
+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.bo.DCustomerSearchBo;
+import com.dsk.cscec.mapper.DCustomerMapper;
+import com.dsk.cscec.domain.DCustomer;
+import com.dsk.cscec.service.IDCustomerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 组织维表(DCustomer)表服务实现类
+ *
+ * @author lcl
+ * @since 2023-12-08 14:57:26
+ */
+@Service
+public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer> implements IDCustomerService {
+
+    @Override
+    public TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query) {
+        return TableDataInfo.build(baseMapper.allSearchList(query.build(),bo));
+    }
+}
+

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

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.mapper.DProjectMapper;
+import com.dsk.cscec.domain.DProject;
+import com.dsk.cscec.service.IDProjectService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目维表(DProject)表服务实现类
+ *
+ * @author makejava
+ * @since 2023-12-10 15:34:51
+ */
+@Service("dProjectService")
+public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject> implements IDProjectService {
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/CompanySearchController.java

@@ -62,4 +62,25 @@ public class CompanySearchController {
     public AjaxResult bossCompany(@RequestBody JSONObject object) {
         return opportunityRadarService.bossCompany(object);
     }
+
+
+    //---------------------------------------中建一局-------------------------------------------
+
+    /*
+     * 查资质
+     */
+    @RequestMapping("/zjyjAptitude")
+    public AjaxResult zjyjAptitude(@RequestBody JSONObject object) {
+        return opportunityRadarService.zjyjAptitude(object);
+    }
+
+    /*
+     * 查资质   不满足
+     */
+    @RequestMapping("/zjyjAptitude/contrary")
+    public AjaxResult zjyjAptitudeContrary(@RequestBody JSONObject object) {
+        return opportunityRadarService.zjyjAptitudeContrary(object);
+    }
+
+
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/ExportController.java

+package com.dsk.search.controller;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.jsk.domain.bo.ComposeQueryDto;
+import com.dsk.search.service.BusinessOpportunityRadarService;
+import com.dsk.search.service.ExportService;
+import com.dsk.system.domain.vo.AptitudeVo;
+import com.dsk.system.domain.vo.SysUserImportVo;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 查企业
+ * @author lc
+ * @ClassName ExportController
+ * @Date 2023/12/06 16:40
+ */
+@RequestMapping("/export")
+@RestController
+public class ExportController {
+
+
+    @Resource
+    private ExportService exportService;
+
+    /**
+     * 获取导入模板
+     */
+    @PostMapping("/aptitude/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        List<Object> list = new ArrayList<>();
+        AptitudeVo aptitudeVo = new AptitudeVo();
+        aptitudeVo.setCompanyName("重庆市轨道交通（集团）有限公司");
+        list.add(aptitudeVo);
+        ExcelUtil.exportTemplate(list, "企业数据", "excel/userImportTemplate.xlsx", response);
+    }
+
+    /*
+     * 批量资质导出
+     */
+    @RequestMapping("/aptitude/file")
+    public AjaxResult aptitudeFile(@RequestPart("file") MultipartFile file) throws Exception {
+        return exportService.aptitudeFile(file);
+    }
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java

@@ -217,4 +217,14 @@ public class BusinessOpportunityRadarService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/subscription/yqBxproPage", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    public AjaxResult zjyjAptitude(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/zjyj/aptitude", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult zjyjAptitudeContrary(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/zjyj/aptitude/contrary", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java

+package com.dsk.search.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.constant.Constants;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.excel.ExcelUtils;
+import com.dsk.common.exception.ServiceException;
+import com.dsk.jsk.domain.bo.ComposeQueryDto;
+import com.dsk.jsk.service.EnterpriseService;
+import com.dsk.system.domain.SysUserFileRecord;
+import com.dsk.system.domain.vo.AptitudeVo;
+import com.dsk.system.service.ISysUserFileRecordService;
+import com.dsk.system.utils.DskOpenApiUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author lc
+ * @ClassName ExportService
+ * @Date 2023/12/06 16:40
+ **/
+@Service
+public class ExportService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+    @Autowired
+    private ISysUserFileRecordService sysUserFileRecordService;
+    @Value("${dsk.exportBackUrl}")
+    private String EXPORT_BACK_URL;
+
+    public AjaxResult aptitudeFile(MultipartFile file) throws Exception {
+        ComposeQueryDto composeQueryDto = new ComposeQueryDto();
+        //识别Excel内容
+        List<AptitudeVo> companyNameList = new ExcelUtils<>(AptitudeVo.class).importExcel(file.getInputStream(), 2);
+        if (companyNameList.isEmpty()) {
+            throw new ServiceException("表格中不存在待导入数据!");
+        }
+        List<String> list = new ArrayList<>();
+        for (int i = 0; i < companyNameList.size(); i++) {
+            if (i>499){
+                break;
+            }
+            list.add(companyNameList.get(i).getCompanyName());
+        }
+        composeQueryDto.setKeyword(String.join(",",list));
+        SysUserFileRecord fileRecord = new SysUserFileRecord();
+        fileRecord.setFileName("批量导出".concat(Constants.SUFFIX_XLSX));
+        fileRecord.setType(1);
+        //生成中
+        fileRecord.setStatus(2);
+        fileRecord.setRemark("资质批量导出");
+        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
+        composeQueryDto.setExportUniqueCode(fileId.toString());
+        //回调函数
+        composeQueryDto.setExportBackUrl(EXPORT_BACK_URL);
+        composeQueryDto.setExportExeclName("资质批量导出.xlsx");
+        dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/areaGroupByProvince", BeanUtil.beanToMap(composeQueryDto,false,false));
+        return AjaxResult.success();
+    }
+
+}

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DCustomerMapper.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.DCustomerMapper">
+
+    <select id="allSearchList" resultType="com.dsk.cscec.domain.DCustomer">
+        select
+            customer_code, customer_name, recommend_org, register_region, register_province, register_city, customer_class, primary_business, paytax_type, tax_rate,
+            customer_state, leader_name, labor_captain_phone, labor_captain_idcard, service_team_personnum, service_team_speciality, construct_job_scope, credential,
+            register_capital, contact_person, contact_phone, approve_date2, credit_level
+        from d_customer
+        where recommend_org_id = 'F17305B4EA4444CBAB12892C7B99E475'
+        <if test="bo.customerName != null and bo.customerName != '' "> and customer_name like concat('%',#{bo.customerName},'%')</if>
+         order by approve_date2 desc
+    </select>
+
+</mapper>
\ No newline at end of file

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DProjectMapper.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.DProjectMapper">
+
+
+
+</mapper>
\ No newline at end of file

dsk-operate-ui/src/assets/icons/svg/monitor.svg

-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543827393750" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4695" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: rbicon; src: url("chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2") format("woff2"); font-weight: normal; font-style: normal; }
-</style></defs><path d="M64 64V640H896V64H64zM0 0h960v704H0V0z" p-id="4696"></path><path d="M192 896H768v64H192zM448 640H512v256h-64z" p-id="4697"></path><path d="M479.232 561.604267l309.9904-348.330667-47.803733-42.5472-259.566934 291.669333L303.957333 240.008533 163.208533 438.6048l52.224 37.009067 91.6224-129.28z" p-id="4698"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_233_92225/11_04949"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_233_92225/11_04949)"><g><path d="M6.5,14L6.5,11Q6.5,10.9507543,6.509607,10.9024549Q6.519215,10.854155,6.53806,10.808658Q6.556906,10.763161,6.584265,10.722215Q6.611625,10.681269,6.646447,10.646447Q6.681269,10.611625,6.722215,10.584265Q6.763161,10.556906,6.808658,10.53806Q6.854155,10.519214999999999,6.9024549,10.509607Q6.9507543,10.5,7,10.5L9,10.5Q9.04925,10.5,9.09754,10.509607Q9.14584,10.519214999999999,9.19134,10.53806Q9.23684,10.556906,9.27778,10.584265Q9.31873,10.611625,9.35355,10.646447Q9.38838,10.681269,9.41573,10.722215Q9.44309,10.763161,9.46194,10.808658Q9.48078,10.854155,9.49039,10.9024549Q9.5,10.9507543,9.5,11L9.5,14Q9.5,14.04925,9.49039,14.09754Q9.48078,14.14584,9.46194,14.19134Q9.44309,14.23684,9.41573,14.27778Q9.38838,14.31873,9.35355,14.35355Q9.31873,14.38837,9.27779,14.41573Q9.23684,14.44309,9.19134,14.46194Q9.14584,14.48078,9.09754,14.49039Q9.04925,14.5,9,14.5L7,14.5Q6.9507543,14.5,6.9024549,14.49039Q6.854155,14.48078,6.808658,14.46194Q6.763161,14.44309,6.722215,14.41573Q6.681269,14.38837,6.646447,14.35355Q6.611625,14.31873,6.584265,14.27778Q6.556906,14.23684,6.53806,14.19134Q6.519215,14.14584,6.509607,14.09754Q6.5,14.04925,6.5,14ZM7.5,11.5L7.5,13.5L8.5,13.5L8.5,11.5L7.5,11.5Z" fill="#FFFFFF" fill-opacity="1"/></g><g><rect x="2" y="3" width="12" height="8" rx="1" fill-opacity="0" stroke-opacity="1" stroke="#FFFFFF" fill="none" stroke-width="1"/></g><g transform="matrix(1,0.0000922808758332394,-0.00009228093404090032,1,0.0012919330765726045,-0.0003691235033329576)"><path d="M4,14.5L12.00001,14.5Q12.04926,14.5,12.09756,14.490393Q12.14586,14.480785000000001,12.19135,14.46194Q12.23685,14.443094,12.2778,14.415735Q12.31874,14.388375,12.35357,14.353553Q12.38839,14.318731,12.41575,14.277785Q12.44311,14.236839,12.46195,14.191342Q12.4808,14.145845,12.49041,14.0975451Q12.50001,14.0492457,12.50001,14Q12.50001,13.9507543,12.49041,13.9024549Q12.4808,13.854155,12.46195,13.808658Q12.44311,13.763161,12.41575,13.722215Q12.38839,13.681269,12.35357,13.646447Q12.31874,13.611625,12.2778,13.584265Q12.23685,13.556906,12.19135,13.53806Q12.14586,13.519214999999999,12.09756,13.509607Q12.04926,13.5,12.00001,13.5L4,13.5Q3.9507543,13.5,3.9024549,13.509607Q3.854155,13.519214999999999,3.808658,13.53806Q3.763161,13.556906,3.722215,13.584265Q3.681269,13.611625,3.646447,13.646447Q3.611625,13.681269,3.584265,13.722215Q3.556906,13.763161,3.5380599999999998,13.808658Q3.519215,13.854155,3.509607,13.9024549Q3.5,13.9507543,3.5,14Q3.5,14.0492457,3.509607,14.0975451Q3.519215,14.145845,3.5380599999999998,14.191342Q3.556906,14.236839,3.584265,14.277785Q3.611625,14.318731,3.646447,14.353553Q3.681269,14.388375,3.722215,14.415735Q3.763161,14.443094,3.808658,14.46194Q3.854155,14.480785000000001,3.9024549,14.490393Q3.9507543,14.5,4,14.5Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M11.85355,5.353553Q11.92388,5.283227,11.96194,5.191342Q12,5.0994562,12,5Q12,4.9507543,11.99039,4.9024549Q11.98078,4.854155,11.96194,4.808658Q11.94309,4.763161,11.91573,4.722215Q11.88837,4.681269,11.85355,4.646447Q11.81873,4.611625,11.77778,4.584265Q11.73684,4.556906,11.69134,4.53806Q11.64584,4.519215,11.59754,4.509607Q11.54925,4.5,11.5,4.5Q11.40054,4.5,11.30866,4.53806Q11.21677,4.57612,11.14645,4.646447L11.14626,4.646634L8.5,7.29289L7.35355,6.14645Q7.31873,6.11162,7.27778,6.08427Q7.23684,6.05691,7.19134,6.03806Q7.14584,6.01921,7.09754,6.00961Q7.04925,6,7,6Q6.95075,6,6.90245,6.00961Q6.85416,6.01921,6.80866,6.03806Q6.76316,6.05691,6.7222100000000005,6.08427Q6.68127,6.11162,6.64645,6.14645L4.646634,8.14626L4.646447,8.14645Q4.57612,8.21677,4.53806,8.30866Q4.5,8.40054,4.5,8.5Q4.5,8.54925,4.509607,8.59754Q4.519215,8.64584,4.53806,8.69134Q4.556906,8.73684,4.584265,8.77778Q4.611625,8.81873,4.646447,8.85355Q4.681269,8.88838,4.722215,8.91573Q4.763161,8.94309,4.808658,8.96194Q4.854155,8.98078,4.9024549,8.99039Q4.9507543,9,5,9Q5.0994562,9,5.191342,8.96194Q5.283227,8.92388,5.353553,8.85355L5.353741,8.85337L7,7.20711L8.14645,8.35355Q8.21677,8.42388,8.30866,8.46194Q8.40054,8.5,8.5,8.5Q8.59946,8.5,8.69134,8.46194Q8.78323,8.42388,8.85355,8.35355L11.85337,5.353741L11.85355,5.353553L11.85355,5.353553Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>
\ No newline at end of file

dsk-operate-ui/src/assets/icons/svg/monitorTag.svg

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="14" height="14" viewBox="0 0 14 14"><defs><clipPath id="master_svg0_264_80210"><rect x="0" y="0" width="14" height="14" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_264_80210)"><g><path d="M5.625,12.25L5.625,9.625Q5.625,9.5757543,5.634607,9.5274549Q5.644215,9.479155,5.66306,9.433658Q5.681906,9.388161,5.709265,9.347215Q5.736625,9.306269,5.771447,9.271447Q5.806269,9.236625,5.847215,9.209265Q5.888161,9.181906,5.933658,9.16306Q5.979155,9.144214999999999,6.0274549,9.134607Q6.0757543,9.125,6.125,9.125L7.875,9.125Q7.92425,9.125,7.97254,9.134607Q8.02084,9.144214999999999,8.06634,9.16306Q8.11184,9.181906,8.15278,9.209265Q8.19373,9.236625,8.22855,9.271447Q8.26337,9.306269,8.29073,9.347215Q8.31809,9.388161,8.33694,9.433658Q8.35578,9.479155,8.36539,9.5274549Q8.375,9.5757543,8.375,9.625L8.375,12.25Q8.375,12.29925,8.36539,12.34755Q8.35578,12.39584,8.33694,12.44134Q8.31809,12.48684,8.29073,12.52778Q8.26337,12.56873,8.22855,12.60355Q8.19373,12.63838,8.15278,12.66573Q8.11184,12.69309,8.06634,12.71194Q8.02084,12.73078,7.97254,12.74039Q7.92425,12.75,7.875,12.75L6.125,12.75Q6.0757543,12.75,6.0274549,12.74039Q5.979155,12.73078,5.933658,12.71194Q5.888161,12.69309,5.847215,12.66573Q5.806269,12.63838,5.771447,12.60355Q5.736625,12.56873,5.709265,12.52778Q5.681906,12.48684,5.66306,12.44134Q5.644215,12.39584,5.634607,12.34755Q5.625,12.29925,5.625,12.25ZM6.625,10.125L6.625,11.75L7.375,11.75L7.375,10.125L6.625,10.125Z" fill="#86909C" fill-opacity="1"/></g><g><rect x="1.75" y="2.625" width="10.5" height="7" rx="1" fill-opacity="0" stroke-opacity="1" stroke="#86909C" fill="none" stroke-width="1"/></g><g transform="matrix(1,0.0000922808758332394,-0.00009228093404090032,1,0.001130441442001029,-0.0003229830654163379)"><path d="M3.5,12.75L10.50001,12.75Q10.54926,12.75,10.59756,12.740393Q10.645859999999999,12.730785000000001,10.69135,12.71194Q10.73685,12.693094,10.7778,12.665735Q10.81874,12.638375,10.85356,12.603553Q10.888390000000001,12.568731,10.91575,12.527785Q10.943100000000001,12.486839,10.96195,12.441342Q10.9808,12.395845,10.990400000000001,12.3475451Q11.00001,12.2992457,11.00001,12.25Q11.00001,12.2007543,10.990400000000001,12.1524549Q10.9808,12.104155,10.96195,12.058658Q10.943100000000001,12.013161,10.91575,11.972215Q10.888390000000001,11.931269,10.85356,11.896447Q10.81874,11.861625,10.7778,11.834265Q10.73685,11.806906,10.69135,11.78806Q10.645859999999999,11.769214999999999,10.59756,11.759607Q10.54926,11.75,10.50001,11.75L3.5,11.75Q3.4507543,11.75,3.4024549,11.759607Q3.354155,11.769214999999999,3.308658,11.78806Q3.263161,11.806906,3.222215,11.834265Q3.181269,11.861625,3.146447,11.896447Q3.111625,11.931269,3.084265,11.972215Q3.056906,12.013161,3.0380599999999998,12.058658Q3.019215,12.104155,3.009607,12.1524549Q3,12.2007543,3,12.25Q3,12.2992457,3.009607,12.3475451Q3.019215,12.395845,3.0380599999999998,12.441342Q3.056906,12.486839,3.084265,12.527785Q3.111625,12.568731,3.146447,12.603553Q3.181269,12.638375,3.222215,12.665735Q3.263161,12.693094,3.308658,12.71194Q3.354155,12.730785000000001,3.4024549,12.740393Q3.4507543,12.75,3.5,12.75Z" fill-rule="evenodd" fill="#86909C" fill-opacity="1"/></g><g><path d="M10.41605,4.728553Q10.48638,4.658227,10.52444,4.566342Q10.5625,4.4744562,10.5625,4.375Q10.5625,4.3257543,10.55289,4.2774549Q10.54328,4.229155,10.52444,4.183658Q10.50559,4.138161,10.47823,4.097215Q10.45087,4.056269,10.41605,4.021447Q10.38123,3.986625,10.34028,3.959265Q10.29934,3.931906,10.25384,3.9130599999999998Q10.20834,3.894215,10.16004,3.884607Q10.11175,3.875,10.0625,3.875Q9.96304,3.875,9.87116,3.9130599999999998Q9.77927,3.95112,9.70895,4.021447L9.70876,4.021634L7.4375,6.29289L6.47855,5.333947Q6.44373,5.299124,6.40278,5.271765Q6.36184,5.244406,6.31634,5.22556Q6.27084,5.206715,6.22254,5.197107Q6.17425,5.1875,6.125,5.1875Q6.07575,5.1875,6.02745,5.197107Q5.97916,5.206715,5.93366,5.22556Q5.88816,5.244406,5.8472100000000005,5.271765Q5.80627,5.299124,5.77145,5.333947L4.021634,7.08376L4.021447,7.08395Q3.95112,7.15427,3.9130599999999998,7.24616Q3.875,7.3380399999999995,3.875,7.4375Q3.875,7.48675,3.884607,7.53504Q3.894215,7.58334,3.9130599999999998,7.62884Q3.931906,7.67434,3.959265,7.71528Q3.986625,7.75623,4.021447,7.79105Q4.056269,7.82588,4.097215,7.85323Q4.138161,7.88059,4.183658,7.89944Q4.229155,7.91829,4.2774549,7.92789Q4.3257543,7.9375,4.375,7.9375Q4.4744562,7.9375,4.566342,7.89944Q4.658227,7.8613800000000005,4.728553,7.79105L4.728741,7.79087L6.125,6.39461L7.08395,7.35355Q7.15427,7.4238800000000005,7.24616,7.46194Q7.3380399999999995,7.5,7.4375,7.5Q7.5369600000000005,7.5,7.62884,7.46194Q7.72073,7.4238800000000005,7.79105,7.35355L10.41587,4.728741L10.41605,4.728553L10.41605,4.728553Z" fill-rule="evenodd" fill="#86909C" fill-opacity="1"/></g></g></svg>
\ No newline at end of file

dsk-operate-ui/src/assets/icons/svg/monitorTags.svg

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="14" height="14" viewBox="0 0 14 14"><defs><clipPath id="master_svg0_264_80210"><rect x="0" y="0" width="14" height="14" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_264_80210)"><g><path d="M5.625,12.25L5.625,9.625Q5.625,9.5757543,5.634607,9.5274549Q5.644215,9.479155,5.66306,9.433658Q5.681906,9.388161,5.709265,9.347215Q5.736625,9.306269,5.771447,9.271447Q5.806269,9.236625,5.847215,9.209265Q5.888161,9.181906,5.933658,9.16306Q5.979155,9.144214999999999,6.0274549,9.134607Q6.0757543,9.125,6.125,9.125L7.875,9.125Q7.92425,9.125,7.97254,9.134607Q8.02084,9.144214999999999,8.06634,9.16306Q8.11184,9.181906,8.15278,9.209265Q8.19373,9.236625,8.22855,9.271447Q8.26337,9.306269,8.29073,9.347215Q8.31809,9.388161,8.33694,9.433658Q8.35578,9.479155,8.36539,9.5274549Q8.375,9.5757543,8.375,9.625L8.375,12.25Q8.375,12.29925,8.36539,12.34755Q8.35578,12.39584,8.33694,12.44134Q8.31809,12.48684,8.29073,12.52778Q8.26337,12.56873,8.22855,12.60355Q8.19373,12.63838,8.15278,12.66573Q8.11184,12.69309,8.06634,12.71194Q8.02084,12.73078,7.97254,12.74039Q7.92425,12.75,7.875,12.75L6.125,12.75Q6.0757543,12.75,6.0274549,12.74039Q5.979155,12.73078,5.933658,12.71194Q5.888161,12.69309,5.847215,12.66573Q5.806269,12.63838,5.771447,12.60355Q5.736625,12.56873,5.709265,12.52778Q5.681906,12.48684,5.66306,12.44134Q5.644215,12.39584,5.634607,12.34755Q5.625,12.29925,5.625,12.25ZM6.625,10.125L6.625,11.75L7.375,11.75L7.375,10.125L6.625,10.125Z" fill="#86909C" fill-opacity="1"/></g><g><rect x="1.75" y="2.625" width="10.5" height="7" rx="1" fill-opacity="0" stroke-opacity="1" stroke="#86909C" fill="none" stroke-width="1"/></g><g transform="matrix(1,0.0000922808758332394,-0.00009228093404090032,1,0.001130441442001029,-0.0003229830654163379)"><path d="M3.5,12.75L10.50001,12.75Q10.54926,12.75,10.59756,12.740393Q10.645859999999999,12.730785000000001,10.69135,12.71194Q10.73685,12.693094,10.7778,12.665735Q10.81874,12.638375,10.85356,12.603553Q10.888390000000001,12.568731,10.91575,12.527785Q10.943100000000001,12.486839,10.96195,12.441342Q10.9808,12.395845,10.990400000000001,12.3475451Q11.00001,12.2992457,11.00001,12.25Q11.00001,12.2007543,10.990400000000001,12.1524549Q10.9808,12.104155,10.96195,12.058658Q10.943100000000001,12.013161,10.91575,11.972215Q10.888390000000001,11.931269,10.85356,11.896447Q10.81874,11.861625,10.7778,11.834265Q10.73685,11.806906,10.69135,11.78806Q10.645859999999999,11.769214999999999,10.59756,11.759607Q10.54926,11.75,10.50001,11.75L3.5,11.75Q3.4507543,11.75,3.4024549,11.759607Q3.354155,11.769214999999999,3.308658,11.78806Q3.263161,11.806906,3.222215,11.834265Q3.181269,11.861625,3.146447,11.896447Q3.111625,11.931269,3.084265,11.972215Q3.056906,12.013161,3.0380599999999998,12.058658Q3.019215,12.104155,3.009607,12.1524549Q3,12.2007543,3,12.25Q3,12.2992457,3.009607,12.3475451Q3.019215,12.395845,3.0380599999999998,12.441342Q3.056906,12.486839,3.084265,12.527785Q3.111625,12.568731,3.146447,12.603553Q3.181269,12.638375,3.222215,12.665735Q3.263161,12.693094,3.308658,12.71194Q3.354155,12.730785000000001,3.4024549,12.740393Q3.4507543,12.75,3.5,12.75Z" fill-rule="evenodd" fill="#86909C" fill-opacity="1"/></g><g><path d="M10.41605,4.728553Q10.48638,4.658227,10.52444,4.566342Q10.5625,4.4744562,10.5625,4.375Q10.5625,4.3257543,10.55289,4.2774549Q10.54328,4.229155,10.52444,4.183658Q10.50559,4.138161,10.47823,4.097215Q10.45087,4.056269,10.41605,4.021447Q10.38123,3.986625,10.34028,3.959265Q10.29934,3.931906,10.25384,3.9130599999999998Q10.20834,3.894215,10.16004,3.884607Q10.11175,3.875,10.0625,3.875Q9.96304,3.875,9.87116,3.9130599999999998Q9.77927,3.95112,9.70895,4.021447L9.70876,4.021634L7.4375,6.29289L6.47855,5.333947Q6.44373,5.299124,6.40278,5.271765Q6.36184,5.244406,6.31634,5.22556Q6.27084,5.206715,6.22254,5.197107Q6.17425,5.1875,6.125,5.1875Q6.07575,5.1875,6.02745,5.197107Q5.97916,5.206715,5.93366,5.22556Q5.88816,5.244406,5.8472100000000005,5.271765Q5.80627,5.299124,5.77145,5.333947L4.021634,7.08376L4.021447,7.08395Q3.95112,7.15427,3.9130599999999998,7.24616Q3.875,7.3380399999999995,3.875,7.4375Q3.875,7.48675,3.884607,7.53504Q3.894215,7.58334,3.9130599999999998,7.62884Q3.931906,7.67434,3.959265,7.71528Q3.986625,7.75623,4.021447,7.79105Q4.056269,7.82588,4.097215,7.85323Q4.138161,7.88059,4.183658,7.89944Q4.229155,7.91829,4.2774549,7.92789Q4.3257543,7.9375,4.375,7.9375Q4.4744562,7.9375,4.566342,7.89944Q4.658227,7.8613800000000005,4.728553,7.79105L4.728741,7.79087L6.125,6.39461L7.08395,7.35355Q7.15427,7.4238800000000005,7.24616,7.46194Q7.3380399999999995,7.5,7.4375,7.5Q7.5369600000000005,7.5,7.62884,7.46194Q7.72073,7.4238800000000005,7.79105,7.35355L10.41587,4.728741L10.41605,4.728553L10.41605,4.728553Z" fill-rule="evenodd" fill="#86909C" fill-opacity="1"/></g></g></svg>
\ No newline at end of file

dsk-operate-ui/src/assets/icons/svg/monitors.svg

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_233_92225/11_04949"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_233_92225/11_04949)"><g><path d="M6.5,14L6.5,11Q6.5,10.9507543,6.509607,10.9024549Q6.519215,10.854155,6.53806,10.808658Q6.556906,10.763161,6.584265,10.722215Q6.611625,10.681269,6.646447,10.646447Q6.681269,10.611625,6.722215,10.584265Q6.763161,10.556906,6.808658,10.53806Q6.854155,10.519214999999999,6.9024549,10.509607Q6.9507543,10.5,7,10.5L9,10.5Q9.04925,10.5,9.09754,10.509607Q9.14584,10.519214999999999,9.19134,10.53806Q9.23684,10.556906,9.27778,10.584265Q9.31873,10.611625,9.35355,10.646447Q9.38838,10.681269,9.41573,10.722215Q9.44309,10.763161,9.46194,10.808658Q9.48078,10.854155,9.49039,10.9024549Q9.5,10.9507543,9.5,11L9.5,14Q9.5,14.04925,9.49039,14.09754Q9.48078,14.14584,9.46194,14.19134Q9.44309,14.23684,9.41573,14.27778Q9.38838,14.31873,9.35355,14.35355Q9.31873,14.38837,9.27779,14.41573Q9.23684,14.44309,9.19134,14.46194Q9.14584,14.48078,9.09754,14.49039Q9.04925,14.5,9,14.5L7,14.5Q6.9507543,14.5,6.9024549,14.49039Q6.854155,14.48078,6.808658,14.46194Q6.763161,14.44309,6.722215,14.41573Q6.681269,14.38837,6.646447,14.35355Q6.611625,14.31873,6.584265,14.27778Q6.556906,14.23684,6.53806,14.19134Q6.519215,14.14584,6.509607,14.09754Q6.5,14.04925,6.5,14ZM7.5,11.5L7.5,13.5L8.5,13.5L8.5,11.5L7.5,11.5Z" fill="#FFFFFF" fill-opacity="1"/></g><g><rect x="2" y="3" width="12" height="8" rx="1" fill-opacity="0" stroke-opacity="1" stroke="#FFFFFF" fill="none" stroke-width="1"/></g><g transform="matrix(1,0.0000922808758332394,-0.00009228093404090032,1,0.0012919330765726045,-0.0003691235033329576)"><path d="M4,14.5L12.00001,14.5Q12.04926,14.5,12.09756,14.490393Q12.14586,14.480785000000001,12.19135,14.46194Q12.23685,14.443094,12.2778,14.415735Q12.31874,14.388375,12.35357,14.353553Q12.38839,14.318731,12.41575,14.277785Q12.44311,14.236839,12.46195,14.191342Q12.4808,14.145845,12.49041,14.0975451Q12.50001,14.0492457,12.50001,14Q12.50001,13.9507543,12.49041,13.9024549Q12.4808,13.854155,12.46195,13.808658Q12.44311,13.763161,12.41575,13.722215Q12.38839,13.681269,12.35357,13.646447Q12.31874,13.611625,12.2778,13.584265Q12.23685,13.556906,12.19135,13.53806Q12.14586,13.519214999999999,12.09756,13.509607Q12.04926,13.5,12.00001,13.5L4,13.5Q3.9507543,13.5,3.9024549,13.509607Q3.854155,13.519214999999999,3.808658,13.53806Q3.763161,13.556906,3.722215,13.584265Q3.681269,13.611625,3.646447,13.646447Q3.611625,13.681269,3.584265,13.722215Q3.556906,13.763161,3.5380599999999998,13.808658Q3.519215,13.854155,3.509607,13.9024549Q3.5,13.9507543,3.5,14Q3.5,14.0492457,3.509607,14.0975451Q3.519215,14.145845,3.5380599999999998,14.191342Q3.556906,14.236839,3.584265,14.277785Q3.611625,14.318731,3.646447,14.353553Q3.681269,14.388375,3.722215,14.415735Q3.763161,14.443094,3.808658,14.46194Q3.854155,14.480785000000001,3.9024549,14.490393Q3.9507543,14.5,4,14.5Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M11.85355,5.353553Q11.92388,5.283227,11.96194,5.191342Q12,5.0994562,12,5Q12,4.9507543,11.99039,4.9024549Q11.98078,4.854155,11.96194,4.808658Q11.94309,4.763161,11.91573,4.722215Q11.88837,4.681269,11.85355,4.646447Q11.81873,4.611625,11.77778,4.584265Q11.73684,4.556906,11.69134,4.53806Q11.64584,4.519215,11.59754,4.509607Q11.54925,4.5,11.5,4.5Q11.40054,4.5,11.30866,4.53806Q11.21677,4.57612,11.14645,4.646447L11.14626,4.646634L8.5,7.29289L7.35355,6.14645Q7.31873,6.11162,7.27778,6.08427Q7.23684,6.05691,7.19134,6.03806Q7.14584,6.01921,7.09754,6.00961Q7.04925,6,7,6Q6.95075,6,6.90245,6.00961Q6.85416,6.01921,6.80866,6.03806Q6.76316,6.05691,6.7222100000000005,6.08427Q6.68127,6.11162,6.64645,6.14645L4.646634,8.14626L4.646447,8.14645Q4.57612,8.21677,4.53806,8.30866Q4.5,8.40054,4.5,8.5Q4.5,8.54925,4.509607,8.59754Q4.519215,8.64584,4.53806,8.69134Q4.556906,8.73684,4.584265,8.77778Q4.611625,8.81873,4.646447,8.85355Q4.681269,8.88838,4.722215,8.91573Q4.763161,8.94309,4.808658,8.96194Q4.854155,8.98078,4.9024549,8.99039Q4.9507543,9,5,9Q5.0994562,9,5.191342,8.96194Q5.283227,8.92388,5.353553,8.85355L5.353741,8.85337L7,7.20711L8.14645,8.35355Q8.21677,8.42388,8.30866,8.46194Q8.40054,8.5,8.5,8.5Q8.59946,8.5,8.69134,8.46194Q8.78323,8.42388,8.85355,8.35355L11.85337,5.353741L11.85355,5.353553L11.85355,5.353553Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>
\ No newline at end of file

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

@@ -121,12 +121,6 @@ aside {
   }
 }
 
-//main-container全局样式
-.app-container {
-  //padding: 16px;
-  //margin-top: 56px;
-}
-
 .components-container {
   margin: 30px 50px;
   position: relative;
@@ -226,18 +220,14 @@ li {
   margin: 0;
 }
 
-.app-main {
-  position: relative;
-  background-color: #f5f5f5;
-  >div{
-    width: calc(100% - 48px);
-  }
-}
 .app-container {
-  margin: 16px 24px;
+  position: absolute;
+  width: 100%;
+  height: 100%;
   background-color: #f5f5f5;
+  padding: 16px 24px;
   box-sizing: border-box;
-  //width: 100%;
+  overflow: auto;
   .el-input__inner {
     border-color: #d9d9d9;
     color: #232323;

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

@@ -215,7 +215,7 @@
 
   .hideSidebar {
     .sidebar-container {
-      width: 48px !important;
+      width: $hideSideBarWidth !important;
 
       .sidebar-logo-container {
         padding: 0px;
@@ -235,8 +235,8 @@
     }
 
     .main-container {
-      margin-left: 48px;
-      width: calc(100% - 48px);
+      margin-left: $hideSideBarWidth;
+      width: calc(100% - #{$hideSideBarWidth});
     }
 
     .submenu-title-noDropdown {

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

@@ -5,7 +5,7 @@
   padding: 16px 24px;
   width: 100%;
   height: 100%;
-
+  overflow: auto;
 }
 .search-supplier {
   -webkit-box-sizing: border-box;
@@ -55,6 +55,9 @@
   padding: 16px;
   margin-top: 16px;
   border-radius: 0px 0px 4px 4px;
+  &.i{
+    margin-top: -20px;
+  }
   .total-title{
     height: 24px;
     line-height: 24px;
@@ -89,6 +92,7 @@
   .pagination{
     text-align: right;
     margin-right: -10px;
+    margin-top: 16px;
   }
   .table-item .el-table .is-scrolling-left + .el-table__fixed, .table-item .el-table .is-scrolling-middle + .el-table__fixed, .table-item .el-table .is-scrolling-right + .el-table__fixed{
     bottom: 10px !important;

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

@@ -52,6 +52,7 @@ $subMenuHover:#001528;
 
 $base-sidebar-width: 220px;
 $sideBarWidth: 220px;
+$hideSideBarWidth : 48px;
 
 //系统默认颜色
 $systemColor:#0081FF;

dsk-operate-ui/src/layout/components/AppMain.vue

@@ -10,16 +10,16 @@
 </template>
 
 <script>
-import iframeToggle from "./IframeToggle/index"
+import iframeToggle from "./IframeToggle/index";
 export default {
   name: 'AppMain',
   components: { iframeToggle },
   computed: {
     cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+      return this.$store.state.tagsView.cachedViews;
     },
     key() {
-      return this.$route.fullPath
+      return this.$route.fullPath;
     }
   }
 }
@@ -27,12 +27,11 @@ export default {
 
 <style lang="scss" scoped>
 .app-main {
-  /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
-  width: 100%;
   position: relative;
-  overflow: hidden;
-  display: flex;
+  height: calc(100% - 56px);
+  width: 100%;
+  background: #f5f5f5;
+  overflow: auto;
 }
 
 .fixed-header + .app-main {
@@ -41,20 +40,17 @@ export default {
 
 .hasTagsView {
   .app-main {
-    /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 56px);
-	min-width:1240px;
-    background: #F5F5F5;
-    overflow: initial;
+    height: calc(100% - 56px);
+    min-width: 1240px;
   }
 
   .fixed-header + .app-main {
     padding-top: 84px;
   }
 }
-.EnterpriseData{
+.EnterpriseData {
   .app-main {
-    overflow: initial;
+    overflow: hidden;
   }
 }
 </style>

dsk-operate-ui/src/views/monitoring/MonitorSettings.vue

+<template>
+  <!--监控维度设置-->
+    <div class="app-container MonitorSettings">
+      <div class="content">
+        <div class="m-title">监控维度设置</div>
+        <div class="m-main">
+          <div class="main-item">
+            <div class="label">风险类型</div>
+            <div class="main-right">
+              <div class="checkbox">
+                <div class="checkbox-content-qx">
+                  <el-checkbox v-model="checkFx" @change="checkFxBtn">全部</el-checkbox>
+                </div>
+                <el-checkbox-group v-model="queryParams.fxType" class="keyword_checkbox" @change="checkFx1Btn">
+                  <el-checkbox v-for="item in fxlx" :label="item.value" :key="item.label">{{item.label}}</el-checkbox>
+                </el-checkbox-group>
+              </div>
+            </div>
+          </div>
+          <div class="main-item">
+            <div class="label">监控维度</div>
+            <div class="main-right">
+              <div class="checkbox">
+                <div class="checkbox-content-qx">
+                  <el-checkbox v-model="checkJkwd" @change="checkJkwdBtn">全部</el-checkbox>
+                </div>
+                <el-checkbox-group v-model="queryParams.jkwdType" class="keyword_checkbox" @change="checkJkwd1Btn">
+                  <el-checkbox v-for="item in jkwd" :label="item.value" :key="item.label">{{item.label}}</el-checkbox>
+                </el-checkbox-group>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="m-title">监控推送时间设置</div>
+        <div class="m-main">
+          <div class="main-item">
+            <div class="label">推送频率</div>
+            <el-radio v-model="queryParams.radio" label="1">每天</el-radio>
+            <el-radio v-model="queryParams.radio" label="2">工作日（排除节假日）</el-radio>
+          </div>
+          <div class="main-item" style="line-height: 32px;">
+            <div class="label">推送时段</div>
+            <el-time-picker
+              is-range
+              class="timePicker"
+              v-model="queryParams.time"
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              placeholder="选择时间范围">
+            </el-time-picker>
+          </div>
+        </div>
+        <div class="m-title">监控接收方式</div>
+        <div class="m-main">
+          <div class="main-item">
+            <div class="label">接收方式</div>
+            <el-radio v-model="queryParams.radio" label="1">全部</el-radio>
+            <el-radio v-model="queryParams.radio" label="2">手机短信</el-radio>
+            <el-radio v-model="queryParams.radio" label="3">PC</el-radio>
+          </div>
+          <div class="main-item" style="line-height: 32px;">
+            <div class="label">手机号码</div>
+            <el-input class="phone" v-model="queryParams.phone" placeholder="请输入手机号"></el-input>
+          </div>
+        </div>
+        <div class="search">
+          <span class="btn1">保存</span>
+          <span class="btn2">重置</span>
+        </div>
+      </div>
+
+    </div>
+</template>
+
+<script>
+  export default {
+    name: 'MonitorSettings',
+    data() {
+      return {
+        fxlx:[
+          {
+            value:'1',
+            label:'工商风险'
+          },
+          {
+            value:'2',
+            label:'司法风险'
+          },
+        ],
+        jkwd:[
+          {
+            value:'1',
+            label:'法院公告'
+          },
+          {
+            value:'2',
+            label:'裁判文书'
+          },
+          {
+            value:'3',
+            label:'开庭公告'
+          },
+          {
+            value:'3',
+            label:'股权冻结'
+          },
+        ],
+        checkFx: true,
+        checkJkwd: true,
+        queryParams:{
+          fxType:[],
+          jkwdType:[],
+          time:[new Date(2016, 9, 10, 8, 40), new Date(2016, 9, 10, 9, 40)],
+          radio:'1',
+          phone:''
+        }
+      }
+    },
+    created() {
+
+    },
+    methods: {
+      checkFxBtn(val) {
+        this.queryParams.fxType = [];
+        this.checkFx = true;
+      },
+      checkFx1Btn(val){
+        if (val.length > 0) {
+          this.checkFx = false;
+        } else if (val.length == 0) {
+          this.checkFx = true;
+        }
+      },
+      checkJkwdBtn(val) {
+        this.queryParams.jkwdType = [];
+        this.checkJkwd = true;
+      },
+      checkJkwd1Btn(val){
+        console.log(val)
+        if (val.length > 0) {
+          this.checkJkwd = false;
+        } else if (val.length == 0) {
+          this.checkJkwd = true;
+        }
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .MonitorSettings{
+    .content{
+      background: #ffffff;
+      padding: 16px;
+    }
+    .m-title{
+      border-left: 2px solid rgba(35,35,35,0.8);;
+      padding-left: 8px;
+      font-size: 16px;
+      height: 16px;
+      line-height: 16px;
+      font-weight: 700;
+      color: #232323;
+      margin-bottom: 16px;
+    }
+    .m-main{
+      border-bottom: 1px solid #EEEEEE;
+      margin-bottom: 16px;
+    }
+    .main-item {
+      margin-bottom: 16px;
+      display: -webkit-box;
+      align-items: flex-start;
+      .label {
+        width: 88px;
+        font-size: 14px;
+        font-weight: 400;
+        color: rgba(35, 35, 35, 0.8);
+      }
+      .main-right {
+        width: calc(100% - 112px);
+        .checkbox{
+          display: flex;
+          align-items: flex-start;
+          .checkbox-content-qx{
+            margin-right: 24px;
+          }
+        }
+      }
+      ::v-deep .timePicker{
+        width: 228px;
+        height: 32px;
+        .el-range__icon{
+          line-height: 27px;
+        }
+        .el-range__close-icon{
+          line-height: 27px;
+        }
+      }
+      ::v-deep .phone{
+        width: 228px;
+        height: 32px;
+        border-radius: 2px 2px 2px 2px;
+      }
+    }
+    .search{
+      margin: 24px 0 0 88px;
+      span{
+        width: 60px;
+        height: 32px;
+        line-height: 32px;
+        border-radius: 4px 4px 4px 4px;
+        cursor: pointer;
+        display: inline-block;
+        text-align: center;
+        font-size: 14px;
+      }
+      .btn1{
+        background: #0081FF;
+        border: 1px solid #0081FF;
+        color: #FFFFFF;
+        margin-right: 12px;
+      }
+      .btn2{
+        border: 1px solid #DCDFE6;
+        background: #ffffff;
+        color: rgba(35,35,35,0.8);
+      }
+    }
+  }
+</style>

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

@@ -103,7 +103,7 @@
 
             <div class="table-item-jf table-item" style="margin-top: 16px" v-if="!fbsisSkeleton&&tableData.length>0">
               <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
-                        v-sticky-header.always="{offsetTop : '56px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row>
+                        v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row>
                 <el-table-column label="证书类型" :resizable="false">
                   <template slot-scope="scope">
                     <span>{{scope.row.legalPerson||'--'}}</span>

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

+<template>
+  <!--供应商考评-->
+  <div class="supplier">
+    <div class="search-supplier">
+      <div class="title_wrap i">
+        <div class="enterprise_title">
+          供应商考评
+        </div>
+      </div>
+    </div>
+    <div class="table-supplier i">
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="!tableData.length && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
+      <skeleton v-if="isSkeleton"></skeleton>
+
+      <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+        <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
+                  :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                  ref="theOwnerListTable">
+
+          <el-table-column type="index" label="序号" width="60" :resizable="false">
+            <template slot-scope="scope">
+              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="年度" width="120" :resizable="false">
+          </el-table-column>
+          <el-table-column label="使用公司" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="使用项目" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="项目考评" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="公司考评分" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="汇总分" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pagination clearfix" v-show="total>0">
+        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { encodeStr } from "@/assets/js/common.js";
+  import "@/assets/styles/public.scss";
+  import "@/assets/styles/supplierlist.scss";
+  import skeleton from '@/views/project/projectList/component/skeleton';
+  export default {
+    name: 'assessment',
+    components:{skeleton},
+    data(){
+      return{
+        encodeStr,
+        tableData:[
+          {name:'测试',legalPerson:'AAAA'}
+        ],
+        isSkeleton:false,
+        total:100,
+        pageSize:50,
+        pageNum:1,
+      }
+    },
+    methods: {
+      handleCurrentChange() {
+
+      },
+      setHeaderRow() {
+        return "owner-table-list-header";
+      },
+      setCellClass({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 1) {
+          return "enterprise-name-column";
+        }
+      },
+      setRowClass({ row, rowIndex }) {
+        return "enterprise-name-row";
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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

+<template>
+  <!--供应商考评-->
+  <div class="supplier">
+    <div class="search-supplier">
+      <div class="title_wrap i">
+        <div class="enterprise_title">
+          供应商考评
+        </div>
+      </div>
+    </div>
+    <div class="table-supplier i">
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="!tableData.length && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
+      <skeleton v-if="isSkeleton"></skeleton>
+
+      <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+        <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
+                  :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                  ref="theOwnerListTable">
+
+          <el-table-column type="index" label="序号" width="60" :fixed="tableColumnFixed" :resizable="false">
+            <template slot-scope="scope">
+              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="使用项目" width="320" :fixed="tableColumnFixed"  :resizable="false">
+          </el-table-column>
+          <el-table-column label="使用单位" :min-width="200" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="公司名称" :min-width="200" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="处置时间" :min-width="180" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="年度" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="处置前状态" :min-width="200" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="处置后状态" :min-width="200" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="处置前等级" :min-width="200" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="处置后等级" :min-width="200" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="预警原因" :min-width="200" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="不合格原因" :min-width="200" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson||"--"}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pagination clearfix" v-show="total>0">
+        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { encodeStr } from "@/assets/js/common.js";
+  import "@/assets/styles/public.scss";
+  import "@/assets/styles/supplierlist.scss";
+  import skeleton from '@/views/project/projectList/component/skeleton';
+  export default {
+    name: 'disposal',
+    components:{skeleton},
+    data(){
+      return{
+        encodeStr,
+        tableData:[
+          {name:'测试',legalPerson:'AAAA'}
+        ],
+        isSkeleton:false,
+        total:100,
+        pageSize:50,
+        pageNum:1,
+        // table列是否悬浮
+        tableColumnFixed: true,
+      }
+    },
+    methods: {
+      handleCurrentChange() {
+
+      },
+      setHeaderRow() {
+        return "owner-table-list-header";
+      },
+      setCellClass({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 1) {
+          return "enterprise-name-column";
+        }
+      },
+      setRowClass({ row, rowIndex }) {
+        return "enterprise-name-row";
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -21,7 +21,8 @@
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.user"
-                :options="options"></el-cascader>
+                :options="addressList" :collapse-tags="true"
+                :props="provienceprops"></el-cascader>
             </el-form-item>
           </el-row>
           <el-row>
@@ -88,7 +89,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
-                  v-sticky-header.always="{offsetTop : '56px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
                   :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
                   ref="theOwnerListTable">
 
@@ -236,8 +237,8 @@
           <el-table-column label="链接" min-width="160" :resizable="false">
             <template slot-scope="scope">
               <span class="wordprimary tabs" @click="goAccess(scope.row)">准入</span>
-              <span class="wordprimary tabs">考评</span>
-              <span class="wordprimary tabs">处置</span>
+              <span class="wordprimary tabs" @click="goAssessment(scope.row)">考评</span>
+              <span class="wordprimary tabs" @click="goDisposal(scope.row)">处置</span>
             </template>
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
@@ -258,7 +259,7 @@
       <skeleton v-if="fbsisSkeleton"></skeleton>
       <div class="table-item-jf table-item" v-if="!fbsisSkeleton&&tableData.length>0">
         <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
-                  v-sticky-header.always="{offsetTop : '56px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row>
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row>
 
           <el-table-column type="index" label="序号" width="60" :resizable="false">
             <template slot-scope="scope">
@@ -302,12 +303,19 @@
   import "@/assets/styles/supplierlist.scss";
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
+  import dataRegion from '@/assets/json/provinceTree'
   export default {
     name: 'ledger',
     components:{skeleton},
     data(){
       return{
         encodeStr,
+        addressList:[],
+        provienceprops:{
+          checkStrictly:true,
+          multiple:true,
+          value:'id',
+        },
         formdata:{},
         options: [
           {
@@ -507,10 +515,31 @@
         }
         ],
         tableData:[
-          {name:'测试',legalPerson:'AAAA'}
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
+          {name:'测试',legalPerson:'AAAA'},
         ],
         isSkeleton:false,
-        total:0,
+        total:100,
         pageSize:50,
         pageNum:1,
         // table列是否悬浮
@@ -520,8 +549,23 @@
       }
     },
     created() {
+      this.dataRegion()
     },
     methods:{
+      //地区
+      async dataRegion() {
+        let addrs = JSON.parse(JSON.stringify(dataRegion))
+        addrs.forEach(item=>{
+          if (item.children) {
+            (item.children).forEach(i => {
+              if (i.children) {
+                delete i.children
+              }
+            })
+          }
+        })
+        this.addressList = addrs;
+      },
       handleCurrentChange(){
 
       },
@@ -545,6 +589,14 @@
       goAccess(row){
         this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
       },
+      //点击考评
+      goAssessment(row){
+        this.$tab.openPage('测试一下-供应商考评', '/supplier/supplierlist/assessment')
+      },
+      //点击处置
+      goDisposal(row){
+        this.$tab.openPage('测试一下-供应商处置', '/supplier/supplierlist/disposal')
+      },
     }
   }
 </script>

dsk-operate-ui/vue.config.js

@@ -35,7 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://47.104.91.229:9099/prod-api`,//测试
+        // target: `http://47.104.91.229:9099/prod-api`,//测试
+        target: `http://111.204.34.146:9099/prod-api`,//测试
         // target: `https://szhapi.jiansheku.com`,//线上
         // target: `http://122.9.160.122:9011`,  //线上
         // target: `http://192.168.0.165:9098`,//施-无线

dsk-system/src/main/java/com/dsk/system/domain/vo/AptitudeVo.java

+package com.dsk.system.domain.vo;
+
+import com.dsk.common.annotation.Excel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 用户对象导入VO
+ *
+ * @author Lion Li
+ */
+
+@Data
+@NoArgsConstructor
+// @Accessors(chain = true) // 导入不允许使用 会找不到set方法
+public class AptitudeVo implements Serializable {
+
+    //如需修改以下字段,需同步修改
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @Excel(name = "序号")
+    private Integer no;
+
+    /**
+     * 企业名称
+     */
+    @Excel(name = "企业名称")
+    private String companyName;
+
+    /**
+     * 资质名称
+     */
+    @Excel(name = "资质名称")
+    private String certName;
+
+    /**
+     * 资质编号
+     */
+    @Excel(name = "资质编号")
+    private String certNo;
+
+    /**
+     * 承包工程范围
+     */
+    @Excel(name = "承包工程范围")
+    private String contractScope;
+
+    /**
+     * 发证日期
+     */
+    @Excel(name = "发证日期")
+    private String issueDate;
+
+    /**
+     * 有效期
+     */
+    @Excel(name = "有效期")
+    private String validityDate;
+
+    /**
+     * 发证机关
+     */
+    @Excel(name = "发证机关")
+    private String authority;
+
+    /**
+     * 经营范围
+     */
+    @Excel(name = "经营范围")
+    private String businessScope;
+
+}