Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-common/src/main/java/com/dsk/common/utils/StringUtils.java

@@ -612,4 +612,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         }
         return sb.toString();
     }
+
+    //字符串标红
+    public static String markInRed(String oldStr, String str) {
+        return oldStr.replace(str, "<font color='#FF204E'>" + str + "</font>");
+    }
 }

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

 <template>
-  <div class="app-container detail-container">
+  <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+  <div class="app-container detail-container" v-else>
     <head-form
       title="分支机构"
       :form-data="formData"
@@ -68,6 +69,7 @@ export default {
   },
   methods: {
     async handleQuery(params) {
+      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       if(param.hasBid=='noLimit'){
@@ -76,6 +78,7 @@ export default {
       let res = await affiliates(param)
       this.tableLoading = false
       if(res.code==200){
+        this.isSkeleton = false;
         this.tableData = res.rows
       }
       this.tableDataTotal = res.total

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

 <template xmlns="http://www.w3.org/1999/html">
-  <div class="app-container detail-container">
+  <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+  <div class="app-container detail-container" v-else>
     <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
       <el-tab-pane label="工商信息" name="first"></el-tab-pane>
       <el-tab-pane label="工商变更" :disabled="tableDataTotal>0" name="second"></el-tab-pane>
@@ -104,11 +105,13 @@ export default {
       this.handleQuery()
     },
     async handleQuery() {
+      this.isSkeleton = true;
       this.tableLoading = true
       let param = this.baseParams;
       let res = await icInfo(param);
       this.tableLoading = false
       if(res.code==200){
+        this.isSkeleton = false;
         this.forInfo = res.data
       }
     },

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

 <template>
-  <div class="app-container detail-container">
+  <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+  <div class="app-container detail-container" v-else>
     <head-form
       title="高管信息"
       :form-data="formData"
@@ -66,11 +67,13 @@ export default {
   },
   methods: {
     async handleQuery(params) {
+      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await keymembers(param)
       this.tableLoading = false
       if(res.code==200){
+        this.isSkeleton = false;
         let tempRows = []
         if(res.rows&&res.rows.length>0){
           let arrLength = res.rows.length%2==0?(res.rows.length/2):(Math.floor(res.rows.length/2)+1)

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

 <template>
-  <div class="app-container detail-container">
+<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+  <div class="app-container detail-container" v-else>
     <head-form
       title=""
       :form-data="formData"
@@ -78,12 +79,14 @@ export default {
       this.handleQuery()
     },
     async handleQuery(params) {
+      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       param.isHistory = this.activeName == 'first' ? 0 : 1
       let res = await bestStockPage(param)
       this.tableLoading = false
       if(res.code==200){
+        this.isSkeleton = false;
         this.tableData = res.rows
       }
       this.tableDataTotal = res.total

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

 <template>
-  <div class="app-container detail-container">
+  <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+  <div class="app-container detail-container" v-else>
     <head-form
       title="对外投资"
       :form-data="formData"
@@ -97,11 +98,13 @@ export default {
   },
   methods: {
     async handleQuery(params) {
+      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await investment(param)
       this.tableLoading = false
       if(res.code==200){
+        this.isSkeleton = false;
         this.tableData = res.rows
       }
       this.tableDataTotal = res.total

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

@@ -94,10 +94,17 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         dto.setUserId(user.getUserId());
-        if(user.getIsExperience() == 1){
+        if (user.getIsExperience() == 1) {
             dto.setIsPrivate(1);
         }
-        return businessInfoMapper.selectBusinessInfoList(dto);
+        List<BusinessListVo> businessListVos = businessInfoMapper.selectBusinessInfoList(dto);
+        if (!CollectionUtils.isEmpty(businessListVos) && ObjectUtil.isNotEmpty(dto.getProjectName())) {
+            for (BusinessListVo vo : businessListVos) {
+                vo.setProjectName(StringUtils.markInRed(vo.getProjectName(),dto.getProjectName()));
+                vo.setOwnerCompany(StringUtils.markInRed(vo.getOwnerCompany(),dto.getProjectName()));
+            }
+        }
+        return businessListVos;
     }
 
     @Override
@@ -139,7 +146,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                 if (!CollectionUtils.isEmpty(list)) {
                     for (Map<String, Object> map : list) {
                         BusinessLikeProjectNameListVo vo = new BusinessLikeProjectNameListVo();
-                        vo.setProjectName(MapUtil.getStr(map, "projectName").replace(dto.getProjectName(), "<font color='#FF204E'>" + dto.getProjectName() + "</font>"));
+                        vo.setProjectName(StringUtils.markInRed(MapUtil.getStr(map, "projectName"),dto.getProjectName()));
                         vo.setCompanyName(MapUtil.getStr(map, "tenderee"));
                         vo.setInvestmentAmount(Double.parseDouble(MapUtil.getStr(map, "projectContractAmount")));
                         vo.setProjectType(MapUtil.getStr(map, "projectType"));
@@ -148,7 +155,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                     }
                 }
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             log.error("模糊查询项目名称调用失败！");
         }
 
@@ -414,7 +421,6 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         return map;
     }
 
-
     private BusinessRelateCompany dealwithCustomer(BusinessInfo bean) {
         BusinessRelateCompany relateCompany = new BusinessRelateCompany();
         relateCompany.setBusinessId(bean.getId());

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

@@ -26,6 +26,7 @@ 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.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
@@ -59,7 +60,13 @@ public class CustomerServiceImpl implements ICustomerService {
     public List<CustomerListVo> selectList(CustomerSearchDto dto) {
         dto.setUserId(SecurityUtils.getUserId());
         dto.setStatus(ObjectUtils.isEmpty(dto.getStatus()) ? 0 : dto.getStatus());
-        return baseMapper.selectList(dto);
+        List<CustomerListVo> customerListVos = baseMapper.selectList(dto);
+        if (!CollectionUtils.isEmpty(customerListVos) && ObjectUtil.isNotEmpty(dto.getCompanyName())) {
+            for (CustomerListVo vo : customerListVos) {
+                vo.setCompanyName(StringUtils.markInRed(vo.getCompanyName(), dto.getCompanyName()));
+            }
+        }
+        return customerListVos;
     }
 
     @Override
@@ -78,14 +85,14 @@ public class CustomerServiceImpl implements ICustomerService {
         dealWithcustomerData(customer);
         if (ObjectUtils.isEmpty(customer.getUipId())) {
             try {
-                List<Integer> list=new ArrayList<>();
+                List<Integer> list = new ArrayList<>();
                 list.add(customer.getCompanyId());
                 R res = enterpriseService.getUipIdByCid(list);
-                if (!ObjectUtils.isEmpty(res.getData())){
-                    List<Map<String,Object>> data = (List<Map<String, Object>>) res.getData();
+                if (!ObjectUtils.isEmpty(res.getData())) {
+                    List<Map<String, Object>> data = (List<Map<String, Object>>) res.getData();
                     customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(data.get((0))), "uipId"));
                 }
-                if(ObjectUtils.isEmpty(customer.getUipId())){
+                if (ObjectUtils.isEmpty(customer.getUipId())) {
                     res = enterpriseService.getUipId(customer.getCompanyName());
                     if (!ObjectUtils.isEmpty(res.getData())) {
                         customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(res.getData()), "uipId"));
@@ -199,7 +206,7 @@ public class CustomerServiceImpl implements ICustomerService {
             if (!ObjectUtils.isEmpty(map.get("data"))) {
                 Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
                 Integer companyId = MapUtil.getInt(data, "jskEid");
-                if(ObjectUtil.isNotEmpty(customer.getCompanyId()) && !customer.getCompanyId().equals(companyId)) {
+                if (ObjectUtil.isNotEmpty(customer.getCompanyId()) && !customer.getCompanyId().equals(companyId)) {
                     return;
                 }
                 customer.setCompanyId(companyId);
@@ -219,9 +226,9 @@ public class CustomerServiceImpl implements ICustomerService {
                     customer.setDistrictId(MapUtil.getInt(data, "countyId"));
                 }
                 if (ObjectUtils.isEmpty(customer.getRegisterAddress())) {
-                    if(ObjectUtil.isNotEmpty(MapUtil.getStr(data, "domicile"))){
+                    if (ObjectUtil.isNotEmpty(MapUtil.getStr(data, "domicile"))) {
                         customer.setRegisterAddress(MapUtil.getStr(data, "domicile"));
-                    }else {
+                    } else {
                         String address = null;
                         if (ObjectUtils.isEmpty(MapUtil.getStr(data, "province"))) {
                             address = MapUtil.getStr(data, "province");