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

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

 package com.dsk.common.utils;
 
+import java.math.BigDecimal;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -51,7 +52,8 @@ public class CheckUtils {
      * @return
      */
     public static int checkIntegerPlaces(Double number) {
-        String strNumber = Double.toString(Math.abs(number));
+        BigDecimal bigDecimal = new BigDecimal(number);
+        String strNumber = bigDecimal.toString();
         int integerPlaces = strNumber.indexOf('.');
         if (integerPlaces == -1) {
             return strNumber.length();
@@ -66,7 +68,8 @@ public class CheckUtils {
      * @return
      */
     public static int checkDecimalPlaces(Double number) {
-        String strNumber = Double.toString(Math.abs(number));
+        BigDecimal bigDecimal = new BigDecimal(number);
+        String strNumber = bigDecimal.toString();
         int decimalPlaces = 0;
         int index = strNumber.indexOf('.');
         if (index != -1) {

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

@@ -1008,7 +1008,7 @@
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 3;
+  z-index: 10;
   .upload{
     width: 528px;
     height: 430px;

dsk-operate-ui/src/views/project/projectList/component/addProject.vue

@@ -12,12 +12,12 @@
     </div>
     <el-form class="popform j" :model="queryParam" :rules="rules" ref="ruleForm" label-width="130px">
       <el-form-item label="项目名称：" class="row"  prop="projectName">
-        <el-input type="text" placeholder="请输入" v-model="queryParam.projectName" @input="getProject"></el-input>
+        <el-input type="text" placeholder="请输入" v-model="queryParam.projectName" @input="getProject" :οnkeyup="queryParam.projectName=queryParam.projectName.replace(/^\s+|\s+$/g,'')"></el-input>
         <div class="resultlist" v-if="proList.length>0" id="box1">
           <div v-for="(item,index) in proList" @click="selProject(item)"><span  v-html="item.projectName"></span></div>
         </div>
       </el-form-item>
-      <el-form-item label="业主单位：" class="row"  prop="ownerCompany">
+      <el-form-item label="招采单位：" class="row"  prop="ownerCompany">
         <el-input type="text" placeholder="请输入" v-model="queryParam.ownerCompany" @input="getCompany" :οnkeyup="queryParam.ownerCompany=queryParam.ownerCompany.replace(/^\s+|\s+$/g,'')"></el-input>
         <div class="resultlist" v-if="showlist" id="box">
           <div v-for="(item,index) in companData" @click="selCompany(item)"><span  v-html="item.name"></span></div>
@@ -78,7 +78,7 @@
           userId:'',//用户id
           projectName:'',//	项目名称
           companyId:'',//企业id
-          ownerCompany:'',//业主单位
+          ownerCompany:'',//招采单位
           projectStage:null,//项目阶段
           projectType:null,//项目类型
           projectCategory:null,//项目类别
@@ -205,7 +205,7 @@
         this.queryParam = {
           projectName:'',//	项目名称
           companyId:'',//企业id
-          ownerCompany:'',//业主单位
+          ownerCompany:'',//招采单位
           projectStage:null,//项目阶段
           projectType:null,//项目类型
           projectCategory:null,//项目类别

dsk-operate-ui/src/views/project/projectList/component/xgqy.vue

@@ -61,11 +61,11 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="responsiblePerson"
+            prop="phone"
             label="负责人联系方式"
             width="">
             <template slot-scope="scope">
-              {{scope.row.responsiblePerson || '--'}}
+              {{scope.row.phone || '--'}}
             </template>
           </el-table-column>
           <el-table-column

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

@@ -35,6 +35,7 @@ import com.dsk.system.mapper.BusinessUserMapper;
 import com.dsk.system.service.IBusinessInfoService;
 import com.dsk.system.service.ICustomerService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -141,7 +142,13 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
 
     @Override
     public List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto) {
-        return businessInfoMapper.selectProjectName(dto);
+        List<BusinessLikeProjectNameListVo> vos = businessInfoMapper.selectProjectName(dto);
+        if (!CollectionUtils.isEmpty(vos)) {
+            for (BusinessLikeProjectNameListVo vo : vos) {
+                vo.setProjectName(vo.getProjectName().replace(dto.getProjectName(), "<font color='#FF204E'>" + dto.getProjectName() + "</font>"));
+            }
+        }
+        return vos;
     }
 
     @Override

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

@@ -3,10 +3,12 @@ package com.dsk.system.service.impl;
 import cn.hutool.core.bean.BeanException;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.SecurityUtils;
+import com.dsk.common.utils.StringUtils;
 import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.CustomerUser;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
@@ -179,36 +181,53 @@ public class CustomerServiceImpl implements ICustomerService {
 
     private void dealWithcustomerData(Customer customer) {
         if (ObjectUtils.isEmpty(customer.getCompanyName())) throw new BeanException("企业名称不能为空");
-        if (ObjectUtils.isEmpty(customer.getCompanyId())) {
-            try {
-                Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
-                if (!ObjectUtils.isEmpty(map.get("data"))) {
-                    customer.setCompanyId(MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid"));
-                    if (ObjectUtils.isEmpty(customer.getLegalPerson())) {
-                        customer.setLegalPerson(MapUtil.getStr(map, "legalPerson"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getRegisterCapital())) {
-                        customer.setRegisterCapital(MapUtil.getStr(map, "registeredCapitalStr"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getProvinceId())) {
-                        customer.setProvinceId(MapUtil.getInt(map, "provinceId"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getCityId())) {
-                        customer.setCityId(MapUtil.getInt(map, "cityId"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getDistrictId())) {
-                        customer.setDistrictId(MapUtil.getInt(map, "countyId"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getRegisterAddress())) {
-                        customer.setRegisterAddress(MapUtil.getStr(map, "domicile"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getCreditCode())) {
-                        customer.setCreditCode(MapUtil.getStr(map, "creditCode"));
+        try {
+            Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
+            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)) {
+                    return;
+                }
+                customer.setCompanyId(companyId);
+                if (ObjectUtils.isEmpty(customer.getLegalPerson())) {
+                    customer.setLegalPerson(MapUtil.getStr(data, "legalPerson"));
+                }
+                if (ObjectUtils.isEmpty(customer.getRegisterCapital())) {
+                    customer.setRegisterCapital(MapUtil.getStr(data, "registeredCapitalStr"));
+                }
+                if (ObjectUtils.isEmpty(customer.getProvinceId())) {
+                    customer.setProvinceId(MapUtil.getInt(data, "provinceId"));
+                }
+                if (ObjectUtils.isEmpty(customer.getCityId())) {
+                    customer.setCityId(MapUtil.getInt(data, "cityId"));
+                }
+                if (ObjectUtils.isEmpty(customer.getDistrictId())) {
+                    customer.setDistrictId(MapUtil.getInt(data, "countyId"));
+                }
+                if (ObjectUtils.isEmpty(customer.getRegisterAddress())) {
+                    if(ObjectUtil.isNotEmpty(MapUtil.getStr(data, "domicile"))){
+                        customer.setRegisterAddress(MapUtil.getStr(data, "domicile"));
+                    }else {
+                        String address = null;
+                        if (ObjectUtils.isEmpty(MapUtil.getStr(data, "province"))) {
+                            address = MapUtil.getStr(data, "province");
+                            if (ObjectUtils.isEmpty(MapUtil.getStr(data, "city"))) {
+                                address = address.concat("-").concat(MapUtil.getStr(data, "city"));
+                                if (ObjectUtils.isEmpty(MapUtil.getStr(data, "county"))) {
+                                    address = address.concat("-").concat(MapUtil.getStr(data, "county"));
+                                }
+                            }
+                        }
+                        customer.setRegisterAddress(address);
                     }
                 }
-            } catch (Exception e) {
-                log.debug("获取企业id错误！error：{}", e.getMessage());
+                if (ObjectUtils.isEmpty(customer.getCreditCode())) {
+                    customer.setCreditCode(MapUtil.getStr(data, "creditCode"));
+                }
             }
+        } catch (Exception e) {
+            log.debug("获取企业id错误！error：{}", e.getMessage());
         }
     }