Merge remote-tracking branch 'origin/master'

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

 package com.dsk.web.controller.customer;
 
+import com.dsk.common.annotation.Log;
 import com.dsk.common.annotation.RepeatSubmit;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.domain.entity.SysRole;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.dto.CustomerSearchDto;
 import com.dsk.system.service.ICustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * 客户相关
@@ -30,7 +38,7 @@ public class CustomerController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('customer:list')")
     @GetMapping("/list")
-    public TableDataInfo selectPageList(CustomerSearchDto dto){
+    public TableDataInfo selectPageList(CustomerSearchDto dto) {
         startPage();
         return getDataTable(baseService.selectList(dto));
     }
@@ -40,7 +48,7 @@ public class CustomerController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('customer:info')")
     @GetMapping("/{customerId}")
-    public AjaxResult info(@PathVariable("customerId") String customerId){
+    public AjaxResult info(@PathVariable("customerId") String customerId) {
         return AjaxResult.success(baseService.info(customerId));
     }
 
@@ -50,7 +58,7 @@ public class CustomerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('customer:add')")
     @PostMapping()
     @RepeatSubmit
-    public AjaxResult add(@RequestBody Customer customer){
+    public AjaxResult add(@RequestBody Customer customer) {
         return AjaxResult.success(baseService.add(customer));
     }
 
@@ -60,7 +68,7 @@ public class CustomerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('customer:edit')")
     @PutMapping()
     @RepeatSubmit
-    public AjaxResult edit(@RequestBody Customer customer){
+    public AjaxResult edit(@RequestBody Customer customer) {
         return AjaxResult.success(baseService.edit(customer));
     }
 
@@ -68,7 +76,7 @@ public class CustomerController extends BaseController {
      * 获取个人客户列表
      */
     @GetMapping("/user/list")
-    public AjaxResult userList(){
+    public AjaxResult userList() {
         return AjaxResult.success(baseService.selectUserList());
     }
 
@@ -77,9 +85,15 @@ public class CustomerController extends BaseController {
      */
 //    @PreAuthorize("@ss.hasPermi('customer:business:list')")
     @GetMapping("/business/list")
-    public TableDataInfo businessList(CustomerBusinessSearchDto dto){
+    public TableDataInfo businessList(CustomerBusinessSearchDto dto) {
         startPage();
         return getDataTable(baseService.selectBusinessList(dto));
     }
 
+    @Log(title = "客户数据导入", businessType = BusinessType.IMPORT)
+    //@PreAuthorize("@ss.hasPermi('customer:importData')")
+    @PostMapping("/importData")
+    public AjaxResult importData(@RequestPart("file") MultipartFile file) throws Exception {
+        return AjaxResult.success(baseService.importData(new ExcelUtil<>(Customer.class).importExcel(file.getInputStream(), 3)));
+    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/BusinessOpportunityRadarController.java

+package com.dsk.web.controller.search.controller;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 商机雷达 查询接口
+ * @author Administrator
+ *
+ */
+@RequestMapping("/radar")
+@RestController
+public class BusinessOpportunityRadarController {
+
+
+    @Resource
+    BusinessOpportunityRadarService opportunityRadarService;
+
+    /*
+     * 土地交易
+     */
+    @RequestMapping("/landMarketPage")
+    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.landMarketPage(compose);
+    }
+
+    /*
+     * 拟建项目
+     */
+    @RequestMapping("/establishmentPage")
+    public AjaxResult establishmentPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.establishmentPage(compose);
+    }
+
+    /*
+     * 开标记录
+     */
+    @RequestMapping("/jskBidTenderPage")
+    public AjaxResult jskBidTenderPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidTenderPage(compose);
+    }
+
+
+    /*
+     * 标讯pro
+     */
+    @RequestMapping("/jskBidNewsPage")
+    public AjaxResult jskBidNewsPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidNewsPage(compose);
+    }
+
+
+    /*
+     * 专项债查询
+     */
+    @RequestMapping("/bondProjectPage")
+    public AjaxResult bondProjectPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.bondProjectPage(compose);
+    }
+
+    /*
+     * 投标计划查询
+     */
+    @RequestMapping("/jskBidPlanPage")
+    public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidPlanPage(compose);
+    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java

+package com.dsk.web.controller.search.controller;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 查企业
+ * @author Administrator
+ *
+ */
+@RequestMapping("/enterprise")
+@RestController
+public class CompanySearchController {
+
+
+    @Resource
+    BusinessOpportunityRadarService opportunityRadarService;
+
+    /*
+     * 模糊查询企业名称
+     */
+    @RequestMapping("/index")
+    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.enterprisePage(compose);
+    }
+
+    /*
+     * 完全匹配企业名称
+     */
+    @GetMapping("/findByName/{keyword}")
+    public AjaxResult findByName(@PathVariable String keyword) {
+        return opportunityRadarService.enterpriseByName(keyword);
+    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/MarketAnalysisController.java → dsk-admin/src/main/java/com/dsk/web/controller/search/controller/MarketAnalysisController.java

-package com.dsk.web.controller.search;
+package com.dsk.web.controller.search.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.MarketAnalysisService;
@@ -51,6 +52,32 @@ public class MarketAnalysisController {
         return marketAnalysisService.certGroupByMajorProvinceLevel();
     }
 
+
+
+    /*
+     * 产业结构-按年份选择  各个项目类型项目总数
+     */
+    @RequestMapping("/bidGroupCountByProjectType")
+    public AjaxResult bidGroupCountByProjectType(@RequestBody JSONObject object) {
+        return marketAnalysisService.bidGroupCountByProjectType(object);
+    }
+    /*
+     * 产业结构-近两年各个项目类型项目总数及金额占比
+     */
+    @RequestMapping("/bidMoneyGroupByProjectType")
+    public AjaxResult bidMoneyGroupByProjectType(@RequestBody JSONObject object) {
+        return marketAnalysisService.bidMoneyGroupByProjectType(object);
+    }
+
+
+
+
+
+
+
+
+
+
     /*
      * 中标数量按省份分组
      */

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

+package com.dsk.web.controller.search.service;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisService
+ * @Date 2023/5/15 16:39
+ **/
+public interface BusinessOpportunityRadarService {
+
+
+    AjaxResult jskBidNewsPage(ComposeQueryDto compose);
+    AjaxResult jskBidTenderPage(ComposeQueryDto compose);
+
+    AjaxResult landMarketPage(ComposeQueryDto compose);
+    AjaxResult establishmentPage(ComposeQueryDto compose);
+
+    AjaxResult enterprisePage(ComposeQueryDto compose);
+
+    AjaxResult enterpriseByName(String keyword);
+
+    AjaxResult bondProjectPage(ComposeQueryDto compose);
+
+    AjaxResult jskBidPlanPage(ComposeQueryDto compose);
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/service/MarketAnalysisService.java

 package com.dsk.web.controller.search.service;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 
@@ -19,4 +20,8 @@ public interface MarketAnalysisService {
     AjaxResult countGroupByProvince(ComposeQueryDto compose);
 
     AjaxResult countGroupByMonth(ComposeQueryDto compose);
+
+    AjaxResult bidMoneyGroupByProjectType(JSONObject object);
+
+    AjaxResult bidGroupCountByProjectType(JSONObject object);
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

+package com.dsk.web.controller.search.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisServiceImpl
+ * @Date 2023/5/15 16:40
+ **/
+@Service
+public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityRadarService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+
+    @Override
+    public AjaxResult jskBidNewsPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBid/news/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
+    @Override
+    public AjaxResult jskBidTenderPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBidTender/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult establishmentPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/establishment/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult landMarketPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/landMarket/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult enterprisePage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult enterpriseByName(String keyword){
+        Map<String,Object> params = new HashMap<>();
+        params.put("keyword",keyword);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", params);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult bondProjectPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/bondProject/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult jskBidPlanPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBidPlan/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/MarketAnalysisServiceImpl.java

 package com.dsk.web.controller.search.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.dtos.ComposeQueryDto;
@@ -24,33 +25,45 @@ public class MarketAnalysisServiceImpl implements MarketAnalysisService {
     private DskOpenApiUtil dskOpenApiUtil;
     @Override
     public AjaxResult areaGroupByProvince() {
-
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/areaGroupByProvince", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/areaGroupByProvince", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult certGroupByMajorAndLevel() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorAndLevel", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/certGroupByMajorAndLevel", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
 
     @Override
     public AjaxResult certGroupByMajorProvinceLevel()  {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
+    @Override
+    public AjaxResult bidMoneyGroupByProjectType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/bidMoneyGroupByProjectType", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult bidGroupCountByProjectType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/bidGroupCountByProjectType", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult countGroupByProvince(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult countGroupByMonth(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-common/src/main/java/com/dsk/common/dtos/ComposeQueryDto.java

@@ -58,6 +58,10 @@ public class ComposeQueryDto {
 	JskBidCandidateDto jskBidCandidateDto;
 	//中标公示
 	JskBidWinListDto jskBidWinListDto;
+	//专项债项目
+	SpecialBondProjectDto specialBondProjectDto;
+	//投标计划
+	JskBidPlanDto jskBidPlanDto;
 
 	String achievementQueryType;
 

dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class JskBidPlanDto {
+
+
+	String id;
+
+	String uuid;
+
+	String title;
+
+	String projectName;
+
+	String projectNumber;
+	//招标人
+	String tenderee;
+
+	String tendereeId;
+
+	String projectScale;
+
+	String province;
+
+	String city;
+
+	String area;
+
+	String domicile;
+	//标的物类型
+	String objectType;
+	//项目类型
+	String projectType;
+	//招标方式
+	String tenderWay;
+	//合同预估金额
+	Double planTenderAmount;
+	Double startPlanTenderAmount;
+	Double endPlanTenderAmount;
+	//资金来源
+	String projecetCapitalSource;
+	//发布时间
+	String issueTime;
+	//来源网站
+	String sourceName;
+
+	/**
+	 * 修改时间
+	 */
+	String updateTime;
+}

dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondProjectDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class SpecialBondProjectDto {
+
+
+	Long id;
+
+	String uuid;
+
+	String projectName;
+
+	String projectType;
+	//项目总投资
+	String projectTotalInvestment;
+	//项目资本金
+	String projectCapital;
+	//专项债金额
+	String specialCapital;
+	//项目主体
+	String projectEntity;
+	//项目主体id
+	Long projectEntityId;
+	//主管部门
+	String chargeDepartment;
+	//实施单位
+	String piu;
+
+	Long piuId;
+
+	String domicile;
+
+	String province;
+
+	String city;
+
+	String area;
+
+}

dsk-operate-ui/package.json

@@ -40,7 +40,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
-    "echarts": "5.4.0",
+    "echarts": "^5.4.0",
     "element-resize-detector": "^1.2.4",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",

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

+
+.app-container{
+  padding: 0;
+}
 //小导航
 .miantitle{
   color: #232323;
@@ -791,3 +795,23 @@
 .p10{
   padding: 0 10px;
 }
+
+.tips{
+  display: inline-block;
+  padding: 4px 8px;
+  border-radius: 2px;
+  font-size: 12px;
+  margin-right: 8px;
+  &.tip1{
+    background-color: #E4F3FD;
+    color: #41A1FD;
+  }
+  &.tip2{
+    background-color: #F3F3FF;
+    color: #8491E8;
+  }
+  &.tip3{
+    background-color: #DEF6F0;
+    color: #0BAE8D;
+  }
+}

dsk-operate-ui/src/assets/styles/public.css

+* {
+	padding: 0;
+	margin: 0;
+}
+
+
+
+
+div,
+dl,
+dt,
+dd,
+form,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+img,
+ol,
+ul,
+li,
+table,
+th,
+td,
+p,
+span,
+a {
+	border: 0;
+}
+
+img,
+input {
+	border: none;
+	vertical-align: middle;
+	background: none;
+	outline: none;
+}
+html {
+  height: 100%;
+  box-sizing: border-box;
+}
+
+body {
+  height: 100%;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+
+ul,
+ol {
+	list-style-type: none;
+}
+
+th,
+td,
+input {
+	font-size: 12px;
+}
+
+h3 {
+	font-size: 14px;
+}
+
+s,
+i,
+em {
+	font-style: normal;
+	text-decoration: none;
+}
+
+button {
+	border: none;
+	cursor: pointer;
+	font-size: 12px;
+	background-color: transparent;
+}
+
+select {
+	border-width: 1px;
+	_zoom: 1;
+	border-style: solid;
+	padding-top: 2px;
+	font-size: 12px;
+}
+
+.clear {
+	clear: both;
+	font-size: 1px;
+	height: 0;
+	visibility: hidden;
+	line-height: 0;
+}
+
+.clearfix:after {
+	content: "";
+	display: block;
+	clear: both;
+}
+
+.clearfix {
+	zoom: 1;
+}
+
+.float_left {
+	float: left;
+}
+
+.float_right {
+	float: right;
+}
+.el-input {
+	width: 100%;
+}
+
+.el-input .el-input__inner {
+	width: 100%;
+	height: 34px;
+	line-height: 34px;
+	background: #ffffff;
+	border: 1px solid #e0e0e0;
+	border-radius: 2px;
+	box-sizing: border-box;
+}
+
+.el-input__icon {
+	line-height: 34px;
+}
+
+.el-dropdown-link .el-input {
+	width: 100%;
+}
+
+.el-dropdown-link .el-input__inner {
+	width: 100%;
+}
+
+.el-input--suffix .el-input__inner {
+	padding-right: 15px;
+}
+.el-select .el-input.is-focus .el-input__inner,
+.el-input.is-active .el-input__inner,
+.el-input__inner:focus,
+.el-select .el-input__inner:focus,
+.el-range-editor.is-active:focus-within {
+	border-color: #3181fa;
+}
+.el-popper[x-placement^=top] {
+    margin-bottom: 12px;
+}
+.el-select-dropdown .popper__arrow {
+	display: none;
+}
+
+.el-popper .popper__arrow {
+	display: none;
+}
+.select-popper {
+	text-align: center;
+	display: inline-block;
+	position: relative;
+	color: #333333;
+	font-size: 14px;
+	cursor: pointer;
+	margin-right: 24px;
+}
+
+.select-popper .select-popper-img {
+	width: 24px;
+	height: 12px;
+	position: absolute;
+	top: -10px;
+	right: 2px;
+}
+
+
+.select-popper .el-select__tags,
+.select-popper .el-cascader__tags,
+.select-popper .el-input__suffix {
+	display: none;
+}
+
+
+.select-popper:hover {
+	color: #0381fa;
+}
+
+.select-popper-active {
+	color: #0381fa;
+}
+
+.select-popper-title {
+	padding: 4px 6px;
+}
+
+.select-popper-title .colorhover {
+	color: #0381fa;
+}
+
+.select-popper::-webkit-scrollbar-thumb {
+	background-color: #a1a3a9;
+	border-radius: 6px;
+}
+
+.select-popper::-webkit-scrollbar {
+	width: 6px;
+	height: 6px;
+}
+
+.select-popper::-webkit-scrollbar-track {
+	background: #fff;
+}
+
+.select-popper::-webkit-scrollbar-corner {
+	background: #fff;
+}
+.select-popper .el-select {
+	width: 100%;
+}
+
+.cascader-region {
+	position: absolute;
+	left: 0;
+	top: 0px;
+	opacity: 0;
+	line-height: 16px;
+}
+
+.cascader-region .el-input {
+	width: 100%;
+	line-height: 16px;
+}
+
+.cascader-region .el-input .el-input__inner {
+	width: 100%;
+	height: 16px !important;
+}
+
+
+.content_item .select-caret {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 14px;
+	line-height: 16px;
+	font-weight: 400;
+	color: #333333;
+	cursor: pointer;
+	position: relative;
+}
+
+.content_item .select-popper:hover .select-caret {
+	color: #0074E5;
+}
+.content_item .select-caret:focus {
+	border: none;
+	outline: none;
+}
+.content_item  .geduan{
+	width: 100%;
+	height: 0px;
+	opacity: 1;
+	border: 1px solid #EFEFEF;
+	margin: 16px 0px;
+}
+
+.content_item .search-new {
+	width: 100%;
+	padding-bottom: 16px;
+}
+
+.content_item .search-new span:last-child {
+	display: inline-block;
+	width: 80px;
+	text-align: center;
+	color: #5B5B5B;
+	line-height: 32px;
+	cursor: pointer;
+	border-radius: 2px 2px 2px 2px;
+	border: 1px solid #D4D4D4;
+	opacity: 1;
+}
+
+.content_item .search-new span:first-child {
+	margin-right: 12px;
+	display: inline-block;
+	width: 80px;
+	text-align: center;
+	cursor: pointer;
+	background: #0089ff;
+	color: #fff;
+	line-height: 34px;
+	border-radius: 2px 2px 2px 2px;
+	opacity: 1;
+}
+
+.content_item .search-new span:first-child:hover {
+	background: #0080FF;
+}
+
+.content_item .search-new span:last-child:hover {
+	background: #f5faff;
+	color: #0081FF;
+	border-color: #0081FF;
+}

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

-* {
-	padding: 0;
-	margin: 0;
-}
-
-
-
-
-div,
-dl,
-dt,
-dd,
-form,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-img,
-ol,
-ul,
-li,
-table,
-th,
-td,
-p,
-span,
-a {
-	border: 0;
-}
-
-img,
-input {
-	border: none;
-	vertical-align: middle;
-	background: none;
-	outline: none;
-}
-html {
-  height: 100%;
-  box-sizing: border-box;
-}
-
-body {
-  height: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
-}
-
-ul,
-ol {
-	list-style-type: none;
-}
-
-th,
-td,
-input {
-	font-size: 12px;
-}
-
-h3 {
-	font-size: 14px;
-}
-
-s,
-i,
-em {
-	font-style: normal;
-	text-decoration: none;
-}
-
-button {
-	border: none;
-	cursor: pointer;
-	font-size: 12px;
-	background-color: transparent;
-}
-
-select {
-	border-width: 1px;
-	_zoom: 1;
-	border-style: solid;
-	padding-top: 2px;
-	font-size: 12px;
-}
-
-.clear {
-	clear: both;
-	font-size: 1px;
-	height: 0;
-	visibility: hidden;
-	line-height: 0;
-}
-
-.clearfix:after {
-	content: "";
-	display: block;
-	clear: both;
-}
-
-.clearfix {
-	zoom: 1;
-}
-
-.float_left {
-	float: left;
-}
-
-.float_right {
-	float: right;
-}

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -228,7 +228,6 @@ export default {
 
 <style lang="scss" scoped>
   .app-container{
-    padding: 0;
     height: calc(100vh - 134px)
   }
 .box-card{

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -37,12 +37,12 @@ export default {
       searchText: '',
       sideRoute: [
         {title: '企业概要', pathName: '', children: [
-          {title: '企业速览', pathName: ''},
-          {title: '工商信息', pathName: ''},
-          {title: '股东信息', pathName: ''},
-          {title: '高管信息', pathName: ''},
-          {title: '对外投资', pathName: ''},
-          {title: '分支机构', pathName: ''}
+          {title: '企业速览', pathName: 'overview'},
+          {title: '工商信息', pathName: 'businfo'},
+          {title: '股东信息', pathName: 'holderinfo'},
+          {title: '高管信息', pathName: 'execuinfo'},
+          {title: '对外投资', pathName: 'overseas'},
+          {title: '分支机构', pathName: 'branch'}
         ]},
         {title: '财务简析', pathName: 'financial'},
         {title: '项目商机', pathName: '', children: [
@@ -112,62 +112,66 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .detail-container{
-    width: 144px;
-    min-height: calc(100vh - 170px);
-    padding-bottom: 20px;
-    background: #FFFFFF;
-    .side-input{
-      width: 128px;
-      margin-top: 16px;
-      margin-left: 8px;
-      border: 0;
-      ::v-deep .el-input__inner{
-        height: 32px;
-        background: #F3F3F4;
-        border-radius: 20px;
+  #app{
+    .detail-container{
+      width: 144px;
+      min-height: calc(100vh - 170px);
+      padding-bottom: 20px;
+      background: #FFFFFF;
+      .side-input{
+        width: 128px;
+        margin-top: 16px;
+        margin-left: 8px;
         border: 0;
-        &::placeholder {
-          color: #3D3D3D;
+        ::v-deep .el-input__inner{
+          height: 32px;
+          background: #F3F3F4;
+          border-radius: 20px;
+          border: 0;
+          &::placeholder {
+            color: #3D3D3D;
+          }
         }
-      }
-      .el-icon-search{
-        color: #0081FF;
-        cursor: pointer;
-      }
-    }
-    .detail-menu{
-      margin-top: 20px;
-      border-right: 0;
-      ::v-deep .el-menu-item, ::v-deep .el-submenu__title{
-        height: 30px;
-        line-height: 30px;
-        font-size: 14px;
-        color: #232323;
-        &:hover, &:focus{
-          background: linear-gradient(91deg, rgba(0,129,255,0.1) 0%, rgba(0,129,255,0) 100%);;
+        .el-icon-search{
+          color: #0081FF;
+          cursor: pointer;
         }
-        .el-submenu__icon-arrow{
+      }
+      .detail-menu{
+        margin-top: 20px;
+        border-right: 0;
+        ::v-deep .el-menu-item, ::v-deep .el-submenu__title{
+          height: 30px;
+          line-height: 30px;
+          font-size: 14px;
           color: #232323;
-          right: 48px;
-          margin-top: -5px;
+          padding: 0 0 0 16px !important;
+          text-align: initial !important;
+          &:hover, &:focus, &.is-active{
+            background: linear-gradient(91deg, rgba(0,129,255,0.1) 0%, rgba(0,129,255,0) 100%);;
+          }
+          .el-submenu__icon-arrow{
+            color: #232323;
+            right: 48px;
+            margin-top: -5px;
+          }
         }
-      }
-      ::v-deep .el-submenu .el-menu-item{
-        font-size: 12px;
-        color: rgba(35,35,35,0.8);
-        padding: 0 0 0 27px !important;
-        min-width: 144px !important;
-        position: relative;
-        &:before {
-          content: "";
-          position: absolute;
-          top: 14px;
-          left: 21px;
-          width: 2px;
-          height: 2px;
-          background: rgba(35,35,35,0.8);
-          border-radius: 50%;
+        ::v-deep .el-submenu .el-menu-item{
+          font-size: 12px;
+          color: rgba(35,35,35,0.8);
+          padding: 0 0 0 27px !important;
+          min-width: 144px !important;
+          position: relative;
+          &:before {
+            content: "";
+            position: absolute;
+            top: 14px;
+            left: 21px;
+            width: 2px;
+            height: 2px;
+            background: rgba(35,35,35,0.8);
+            border-radius: 50%;
+          }
         }
       }
     }

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -7,6 +7,12 @@
       </div>
       <div class="part-right">
         <div id="partBox">
+          <Overview v-if="currentPath.pathName=='overview'" />
+          <Businfo v-if="currentPath.pathName=='businfo'" />
+          <Holderinfo v-if="currentPath.pathName=='holderinfo'" />
+          <Execuinfo v-if="currentPath.pathName=='execuinfo'" />
+          <Overseas v-if="currentPath.pathName=='overseas'" />
+          <Branch v-if="currentPath.pathName=='branch'" />
           <Financial v-if="currentPath.pathName=='financial'" />
           <Business v-if="currentPath.pathName=='business'" />
         </div>
@@ -19,20 +25,32 @@
 import elementResizeDetectorMaker from "element-resize-detector"
 import Header from "./component/Header"
 import SideBar from "./component/Sidebar"
-import Financial from "./financial"
-import Business from "./business"
+import Overview from "./overview/overview"  //企业概览-企业速览
+import Businfo from "./overview/businfo"   //企业概览-工商信息
+import Holderinfo from "./overview/holderinfo"   //企业概览-股东信息
+import Execuinfo from "./overview/execuinfo"   //企业概览-高管信息
+import Overseas from "./overview/overseas"   //企业概览-对外投资
+import Branch from "./overview/branch"   //企业概览-分支机构
+import Financial from "./financial" //财务简析
+import Business from "./business" //商务信息
 export default {
   name: 'PartyA',
   components: {
     Header,
     SideBar,
+    Overview,
+    Businfo,
+    Holderinfo,
+    Execuinfo,
+    Overseas,
+    Branch,
     Financial,
     Business
   },
   data() {
     return {
       currentPath: {
-        pathName: 'financial'  //默认展示页
+        pathName: 'overview'  //默认展示页
       },
       partBoxHeight: null
     }

dsk-operate-ui/src/views/detail/party-a/overview/branch.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Overview',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Overview',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/component/operations.vue

+<template>
+  <div class="app-container operations-container">
+    <div class="common-title">公司经营</div>
+    <div class="part-swiper">
+      <div class="swiper-containers">
+        <ul class="swiper-wrapper">
+          <li class="swiper-slide" v-for="(item, index) in operList" :key="index">
+            <div class="swiper-div">
+              <div class="operations-title">{{item.range}}-<span>{{item.year}}</span></div>
+              <div class="flex-box text-cl1 operations-info">
+                {{item.name}}
+                <span><img src="@/assets/images/detail/overview/oper_source.png">{{item.name}}</span>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </div>
+      <div class="swiper-button-prev" slot="button-prev" style="left: 0;"><i class="el-icon-arrow-left"></i></div>
+      <div class="swiper-button-next" slot="button-next" style="right: 0"><i class="el-icon-arrow-right"></i></div>
+    </div>
+    <div class="flex-box operations-list">
+      <div class="list-item" v-for="(item, index) in gsjyList" :key="index">
+        <div class="flex-box list-item-all"><img :src="item.ico">{{item.name}}</div>
+        <div class="list-item-amount">{{item.amount}}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+var Swiper = require('@/assets/lib/swiper/swiper-bundle.min.js')
+import "@/assets/lib/swiper/swiper-bundle.css"
+export default {
+  name: 'Overview',
+  data() {
+    return {
+      operList: [
+        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
+        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
+        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
+        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
+        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'}
+      ],
+      gsjyList: [
+        { name: '总资产', ico: require('@/assets/images/detail/overview/gsjy_ico1.png'), amount: '1699.7'},
+        { name: '净资产', ico: require('@/assets/images/detail/overview/gsjy_ico2.png'), amount: '1699.7'},
+        { name: '授信余额', ico: require('@/assets/images/detail/overview/gsjy_ico3.png'), amount: '1699.7'},
+        { name: '营业收入', ico: require('@/assets/images/detail/overview/gsjy_ico4.png'), amount: '1699.7'},
+        { name: '总负债', ico: require('@/assets/images/detail/overview/gsjy_ico5.png'), amount: '1699.7'}
+      ],
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.companySwiper()
+  },
+  methods: {
+    companySwiper(){
+      new Swiper('.swiper-containers', {
+        slidesPerView: 4,
+        // 设置点击箭头
+        navigation: {
+          nextEl: '.swiper-button-next',
+          prevEl: '.swiper-button-prev',
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .operations-container{
+    margin: 0;
+    padding: 24px 16px;
+    background: #FFFFFF;
+    .part-swiper{
+      position: relative;
+      margin-top: 16px;
+      .swiper-containers{
+        width: calc(100% - 38px);
+        height: 96px;
+        margin-top: 8px;
+        margin-left: 25px;
+        overflow: hidden;
+        .swiper-slide{
+          .swiper-div{
+            width: calc(100% - 12px);
+            height: 96px;
+            background: url("~@/assets/images/detail/overview/swiper_bg.png") no-repeat;
+            background-size: 100% 100%;
+            .operations-title{
+              margin-right: 22px;
+              font-weight: bold;
+              font-size: 20px;
+              color: #0081FF;
+              padding: 24px 16px 0 16px;
+              span{
+                font-size: 16px;
+              }
+            }
+            .operations-info{
+              padding: 14px 16px 10px 16px;
+              justify-content: space-between;
+              font-size: 14px;
+              color: #416587;
+              span{
+                font-size: 12px;
+                img{
+                  width: 10px;
+                  height: 10px;
+                  margin-right: 3px;
+                }
+              }
+            }
+          }
+        }
+      }
+      .swiper-button-prev, .swiper-button-next{
+        width: 16px;
+        height: 96px;
+        background: #F0F5FC;
+        top: 0;
+        margin-top: 0;
+        &.swiper-button-disabled{
+          opacity: 1;
+          color:#AAAAAA;
+          background: #F5F5F5;
+        }
+        i{
+          color: #AAAAAA;
+        }
+        &:hover i{
+          color:#667199;
+        }
+        &:after{
+          content: "";
+        }
+      }
+    }
+    .operations-list{
+      flex-wrap: wrap;
+      justify-content: space-between;
+      .list-item{
+        width: calc(20% - 12px);
+        height: 88px;
+        padding: 18px;
+        margin-top: 14px;
+        font-size: 14px;
+        color: #232323;
+        border: 1px solid #E2E7EE;
+        text-align: center;
+        .list-item-all{
+          justify-content: center;
+          img{
+            width: 24px;
+            height: 24px;
+            margin-right: 4px;
+          }
+        }
+        .list-item-amount{
+          padding-top: 6px;
+          font-weight: bold;
+        }
+      }
+    }
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/execuinfo.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Overview',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/holderinfo.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Overview',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/overseas.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Overview',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/overview.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+    <div class="gsjy">
+      <Operations />
+    </div>
+  </div>
+</template>
+
+<script>
+import Operations from "./component/operations";
+export default {
+  name: 'Overview',
+  components: {
+    Operations
+  },
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+    .gsjy{
+      margin-top: 12px;
+    }
+  }
+</style>

dsk-operate-ui/src/views/project/projectList/detail.vue

@@ -132,9 +132,6 @@
 </script>
 
 <style lang="scss" scoped>
-  .app-container{
-    padding: 0;
-  }
   .head{
     .titles{
       line-height: 31px;

dsk-operate-ui/src/views/project/projectList/index.vue

@@ -331,10 +331,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .app-container{
-    padding: 0;
-  }
-
   .noborder{
     position: relative;
   }
@@ -484,21 +480,6 @@ export default {
       }
       .det-tips{
         padding: 8px 0 ;
-        .tips{
-          display: inline-block;
-          padding: 4px 8px;
-          border-radius: 2px;
-          font-size: 12px;
-          margin-right: 8px;
-          &.tip1{
-            background-color: #E4F3FD;
-            color: #41A1FD;
-          }
-          &.tip2{
-            background-color: #F3F3FF;
-            color: #8491E8;
-          }
-        }
       }
       .det-contets{
         padding: 4px 0 16px;

dsk-operate-ui/src/views/radar/index.vue

@@ -20,6 +20,7 @@
 </template>
 <script>
 	import debtProject from "./components/debtProject/index.vue";
+	import "@/assets/styles/public.css";
 	export default {
 		name: 'radar',
 		components: { debtProject },
@@ -87,7 +88,7 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "~@/assets/styles/public.scss";
+	
 	.app-container {
 		margin: 12px 24px;
 		padding: 0;
@@ -116,7 +117,7 @@
 
 	.app-container .combined-title .title-right {
 		display: flex;
-		width: 1044px;
+		width: 100%;
 		position: relative;
 		height: 40px;
 	}
@@ -150,7 +151,7 @@
 		height: 1px;
 		background-color: #EEEEEE;
 		position: absolute;
-		bottom: 0px;
+		bottom: -1px;
 		left: 0;
 		z-index: 1;
 	}
@@ -168,7 +169,7 @@
 	.tab div {
 		cursor: pointer;
 		color: #666666;
-		font-size: 14px;
+		font-size: 16px;
 		text-align: center;
 		margin-right: 32px;
 		line-height: 40px;

dsk-system/src/main/java/com/dsk/system/domain/customer/Customer.java

 package com.dsk.system.domain.customer;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.dsk.common.annotation.Excel;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.springframework.context.annotation.Import;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -30,6 +32,7 @@ public class Customer implements Serializable {
     /**
      * 客户名称（企业名称）
      */
+    @Excel(name = "企业名称")
     private String companyName;
     /**
      * 法定代表人

dsk-system/src/main/java/com/dsk/system/service/ICustomerService.java

@@ -29,4 +29,6 @@ public interface ICustomerService {
 
     List<CustomerBusinessListVo> selectBusinessList(CustomerBusinessSearchDto dto);
 
+    List<String> importData(List<Customer> customerList);
+
 }

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanException;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsk.common.exception.ServiceException;
+import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.SecurityUtils;
 import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.CustomerUser;
@@ -16,12 +17,14 @@ import com.dsk.system.mapper.CustomerMapper;
 import com.dsk.system.mapper.CustomerUserMapper;
 import com.dsk.system.service.IBusinessInfoService;
 import com.dsk.system.service.ICustomerService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,6 +33,7 @@ import java.util.List;
  * @author makejava
  * @since 2023-05-16 09:27:57
  */
+@Slf4j
 @Service
 public class CustomerServiceImpl implements ICustomerService {
 
@@ -39,6 +43,8 @@ public class CustomerServiceImpl implements ICustomerService {
     private CustomerUserMapper customerUserMapper;
     @Autowired
     private IBusinessInfoService businessInfoService;
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
 
     @Override
     public List<CustomerListVo> selectList(CustomerSearchDto dto) {
@@ -108,4 +114,22 @@ public class CustomerServiceImpl implements ICustomerService {
         dto.setUserId(SecurityUtils.getUserId());
         return businessInfoService.selectCustomerBusinessList(dto);
     }
+
+    @Override
+    public List<String> importData(List<Customer> customerList) {
+        List<String> resultList = new ArrayList<>();
+        for (Customer customer : customerList) {
+            if (ObjectUtils.isEmpty(customer.getCompanyName())) {
+                continue;
+            }
+            try {
+                //TODO 名称查询企业信息
+
+                this.add(customer);
+            } catch (Exception e) {
+                resultList.add(customer.getCompanyName().concat(e.getMessage()));
+            }
+        }
+        return resultList;
+    }
 }