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

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

@@ -82,17 +82,18 @@ public class CustomerServiceImpl implements ICustomerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean add(Customer customer) {
-        dealWithcustomerData(customer);
-        customer.setUipId(enterpriseCommonService.getUipIdByCompanyNameOrCompanyId(customer.getCompanyName(), customer.getCompanyId()));
         Long userId = LoginHelper.getUserId();
-        customer.setCreateId(userId);
-        customer.setUpdateId(userId);
-        customer.setTenantId(LoginHelper.getTenantId());
         //查重
         Customer verifyCustomer = baseMapper.selectByCompanyNameAndUserId(customer.getCompanyName(), userId);
         if (!ObjectUtils.isEmpty(verifyCustomer)) {
             throw new ServiceException("当前客户信息已存在，请勿重复添加！");
         }
+        dealWithcustomerData(customer);
+        customer.setUipId(enterpriseCommonService.getUipIdByCompanyNameOrCompanyId(customer.getCompanyName(), customer.getCompanyId()));
+
+        customer.setCreateId(userId);
+        customer.setUpdateId(userId);
+        customer.setTenantId(LoginHelper.getTenantId());
 
         int i = baseMapper.insert(customer);
         if (i == 0) throw new ServiceException("客户信息添加错误！");

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

 package com.dsk.search.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
@@ -13,10 +14,12 @@ import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.jsk.domain.vo.ImportantProjectExportVo;
+import com.dsk.jsk.service.EnterpriseService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,6 +40,9 @@ public class BusinessOpportunityRadarService {
     @Autowired
     ICustomerService iCustomerService;
 
+    @Autowired
+    private EnterpriseService enterpriseService;
+
     public AjaxResult jskBidNewsPage(JSONObject object) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
@@ -111,14 +117,18 @@ public class BusinessOpportunityRadarService {
                 companyName = companyName.replace("<font color='#FF204E'>", "");
                 companyName = companyName.replace("</font>", "");
             }
-            companyMap.put("claimStatus", 0);
+            companyMap.put("claimStatus", null);
             for (CustomerStatusListVo vo : claimStatusList) {
                 if (companyName.equals(vo.getCompanyName())) {
                     companyMap.put("claimStatus", vo.getStatus());
                 }
             }
+
+            Integer jskEid = MapUtils.getInteger(companyMap, "jskEid");
+            companyMap.put("uipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(companyName, jskEid));
         }
 
+
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

dsk-operate-ui/src/views/enterpriseData/components/searchTheOwner/index.vue

@@ -100,11 +100,15 @@
         </div>
 
       </div>
-      <div class="table-item-jf table-item-jf1" v-if="tableData.length==0&& !isSkeleton">
+      <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 class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+        <div class="depth-search-box" v-if="onlySearchEname">
+          <div class="depth-search" @click="$router.push({path : `/enterpriseData/SearchEnterprise?keyword=${keys}`})">深度搜索企业</div>
+        </div>
       </div>
+
       <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0" @mouseleave="showClaim = false">
@@ -126,13 +130,9 @@
                 <!-- 优质甲方tag标签 -->
                 <div class="high-quality-enterprise" v-if="scope.row.other">{{scope.row.other}}</div>
                 <div class="renling-btn" @click="claimbtn(scope.row)">
-                  <p v-if="scope.row.claimStatus==1" class="renling-img-true">
-
-                  </p>
-                  <p v-else class="renling-img-false">
-
-                  </p>
-                  <span v-if="scope.row.claimStatus==1" @click.stop="cancelClaim(scope.row.name,scope.$index)" class="renling-hui">
+                  <p v-if="scope.row.claimStatus==0" class="renling-img-true"></p>
+                  <p v-else class="renling-img-false"></p>
+                  <span v-if="scope.row.claimStatus==0" @click.stop="cancelClaim(scope.row.name,scope.$index)" class="renling-hui">
                     已认领
                   </span>
                   <span v-else class="renling-hei">
@@ -299,7 +299,7 @@ export default {
       // 业主标签
       ownerLabels: [],
       // 当前选中的业主标签
-      currentOwnerLabels: ["5.1.1."],
+      currentOwnerLabels: [],
       // 业主全选状态
       checkOwnerLabel: false,
       // 选中两个及两个以上业主标签 添加选中条件 or任意均可 and同时具备
@@ -355,7 +355,32 @@ export default {
     };
   },
   computed: {
-
+    // 仅搜索企业名
+    onlySearchEname() {
+      let that = this;
+      const keys = {
+        ename: that.keys,
+        tagCode: that.currentOwnerLabels,
+        ...that.jskBidQueryDto
+      };
+      const temp = [];
+      for (const key in keys) {
+        const type = Object.prototype.toString.call(keys[key]);
+        if (keys[key]) {
+          switch (type) {
+            case "[object String]":
+              temp.push(key);
+              break;
+            case "[object Array]":
+              keys[key].length > 0 ? temp.push(key) : null;
+              break;
+            default:
+              break;
+          }
+        }
+      }
+      return temp.length == 1 && temp.includes("ename") ? true : false;
+    }
   },
   created() {
     this.init();
@@ -520,7 +545,7 @@ export default {
         this.checkOwnerLabel = false;
       } else if (val.length == 0) {
         this.checkOwnerLabel = true;
-        this.currentOwnerLabels = [this.ownerLabels[0].dictValue];
+        this.currentOwnerLabels = [];
       }
       if (val.length >= 2) {
         this.tagCodeQueryType = "or";
@@ -607,7 +632,7 @@ export default {
       api.cancelClaim(this.companyName).then(res => {
         if (res.code == 200) {
           this.dialogVisible1 = false;
-          this.tableData[this.cancelIndex].claimStatus = 0;
+          this.tableData[this.cancelIndex].claimStatus = 1;
         } else {
           this.$message.error(res.msg);
         }
@@ -653,7 +678,7 @@ export default {
 
       // 搜索关键词处理
       if (this.keys) {
-        params.aptitudeQueryDto['ename'] = this.keys.split(' ');
+        params.aptitudeQueryDto['ename'] = this.keys;
       }
 
       // 处理地区选择
@@ -668,7 +693,7 @@ export default {
       }
 
       // 业主标签选中处理
-      if (this.ownerLabels.length > 0) {
+      if (this.currentOwnerLabels.length > 0) {
         params.aptitudeQueryDto["tagCode"] = this.currentOwnerLabels.join(",");
       }
 
@@ -1014,6 +1039,40 @@ export default {
   }
 
   ::v-deep .table-item-jf {
+    &.empty-table {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-direction: column;
+      padding: 48px 0px;
+      .item-jf-text {
+        padding: 0px;
+      }
+      .item-jf-img {
+        margin: 0;
+        width: 108px;
+        height: 109px;
+        margin-bottom: 24px;
+      }
+
+      .depth-search-box {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-top: 24px;
+      }
+      .depth-search {
+        width: 116px;
+        height: 36px;
+        line-height: 36px;
+        text-align: center;
+        cursor: pointer;
+        color: #fff;
+        background: #0081ff;
+        border-radius: 4px;
+        font-size: 14px;
+      }
+    }
     .el-table {
       th,
       td {
@@ -1094,6 +1153,10 @@ export default {
           font-size: 13px;
           font-weight: 400;
           color: #3d3d3d;
+
+          &:hover {
+            color: #0081ff;
+          }
         }
       }