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

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessInfo.java

@@ -164,6 +164,28 @@ public class BusinessInfo extends BaseEntity
     /** 主管单位联系电话 */
     @Excel(name = "主管单位联系电话")
     private String supervisorPhone;
+    /** 建设单位城投id */
+    @Excel(name = "建设单位城投id")
+    private String constructionUnitUipId;
+    /** 建设单位建设库id */
+    @Excel(name = "建设单位建设库id")
+    private Integer constructionUnitCid;
+
+    public String getConstructionUnitUipId() {
+        return constructionUnitUipId;
+    }
+
+    public void setConstructionUnitUipId(String constructionUnitUipId) {
+        this.constructionUnitUipId = constructionUnitUipId;
+    }
+
+    public Integer getConstructionUnitCid() {
+        return constructionUnitCid;
+    }
+
+    public void setConstructionUnitCid(Integer constructionUnitCid) {
+        this.constructionUnitCid = constructionUnitCid;
+    }
 
     public String getConstructionUnit() {
         return constructionUnit;
@@ -514,6 +536,8 @@ public class BusinessInfo extends BaseEntity
             .append("supervisorUnit", getSupervisorUnit())
             .append("supervisorPrincipal", getSupervisorPrincipal())
             .append("supervisorPhone", getSupervisorPhone())
+            .append("constructionUnitUipId", getConstructionUnitUipId())
+            .append("constructionUnitCid", getConstructionUnitCid())
             .toString();
     }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessRelateCompany.java

@@ -2,14 +2,11 @@ package com.dsk.common.core.domain.entity;
 
 import com.dsk.common.annotation.Excel;
 import com.dsk.common.core.domain.BaseEntity;
-import com.dsk.common.utils.CheckUtils;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import javax.validation.constraints.Pattern;
-
 /**
  * 项目关联单位对象 business_relate_company
  *
@@ -29,10 +26,14 @@ public class BusinessRelateCompany extends BaseEntity
     @Excel(name = "项目id")
     private Integer businessId;
 
-    /** 单位id */
-    @Excel(name = "单位id")
+    /** 单位建设库id */
+    @Excel(name = "单位建设库id")
     private Integer companyId;
 
+    /** 单位城投id */
+    @Excel(name = "单位城投id")
+    private String companyUipId;
+
     /** 单位名称 */
     @Excel(name = "单位名称")
     private String companyName;
@@ -71,6 +72,7 @@ public class BusinessRelateCompany extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("depth", getDepth())
             .append("companyType", getCompanyType())
+            .append("companyUipId", getCompanyUipId())
             .toString();
     }
 

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

@@ -204,26 +204,26 @@ export default {
   methods: {
     //认领
     async handleClaim(){
-      if(this.companyInfo.uipId){
-        this.claimLoading = true
-        let param = {
-          companyId:this.companyId,
-          uipId:this.companyInfo.uipId,
-          companyName:this.companyInfo.companyName,
-          creditLevel:this.companyInfo.bratingSubjectLevel || '',
-          legalPerson:this.companyInfo.corporatePerson || '',
-          registerCapital:this.companyInfo.registeredCapital || '',
-          provinceId:this.companyInfo.provinceId || '',
-          cityId:this.companyInfo.cityId || '',
-          districtId:this.companyInfo.districtCode || '',
-          registerAddress:this.companyInfo.provinceName+(this.companyInfo.cityName?'-'+this.companyInfo.cityName:'')+(this.companyInfo.districtName?'-'+this.companyInfo.districtName:''),
-          creditCode:this.companyInfo.creditCode
-        }
-        let res = await api.customerStatus(this.companyInfo.companyName)
-        if(res.data === 1){
-          this.claimLoading = false
-          this.dialogVisible2=true;
-        }else{
+      let res = await api.customerStatus(this.companyInfo.companyName)
+      if(res.data === 1){
+        this.claimLoading = false
+        this.dialogVisible2=true;
+      }else{
+        if(this.companyInfo.uipId){
+          this.claimLoading = true
+          let param = {
+            companyId:this.companyId,
+            uipId:this.companyInfo.uipId,
+            companyName:this.companyInfo.companyName,
+            creditLevel:this.companyInfo.bratingSubjectLevel || '',
+            legalPerson:this.companyInfo.corporatePerson || '',
+            registerCapital:this.companyInfo.registeredCapital || '',
+            provinceId:this.companyInfo.provinceId || '',
+            cityId:this.companyInfo.cityId || '',
+            districtId:this.companyInfo.districtCode || '',
+            registerAddress:this.companyInfo.provinceName+(this.companyInfo.cityName?'-'+this.companyInfo.cityName:'')+(this.companyInfo.districtName?'-'+this.companyInfo.districtName:''),
+            creditCode:this.companyInfo.creditCode
+          }
           let res = await claim(param)
           this.claimLoading = false
           if(res.code==200){
@@ -231,9 +231,9 @@ export default {
             this.companyInfo.claimStatus = 1
             this.customerId = res.data.customerId
           }
+        }else{
+          this.$message.warning('对不起，当前不能认领')
         }
-      }else{
-        this.$message.warning('对不起，当前不能认领')
       }
     },
     //取消认领

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

 <template>
   <div class="app-container clue-container">
     <div class="common-title">风险概览</div>
-    <div class="flex-box clue-box" v-if="count>0">
+    <div class="flex-box clue-box" v-if="viewData[0].value>0">
       <div class="clue-echarts"><div id="echartsRisk" style="width: 100%;height:300px; margin: 0 auto;"></div></div>
       <div class="table-item">
         <el-table
@@ -120,7 +120,6 @@ export default {
           bl:''
         },
       ],
-      count:0,
     }
   },
   created() {
@@ -142,12 +141,11 @@ export default {
       this.viewData.sort((a, b) => {
         return a.value < b.value ? 1 : -1;
       })
-      for(var i in this.viewData){
-        if(this.viewData[i].value>0){
-          this.count = this.viewData[i].value
+      this.$nextTick(()=>{
+        if(this.viewData[0].value>0){
+          this.getDT();
         }
-      }
-      this.getDT()
+      })
     },
     getDT(){
       let myChart = echarts.init(document.getElementById("echartsRisk"))

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -919,6 +919,7 @@ export default {
               line-height: 32px;
               font-size: 12px;
               padding-left: 6px;
+              border-right: 0;
             }
             .el-input__suffix{
               margin-top: -1px;

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

@@ -48,6 +48,16 @@ public class BusinessListVo {
      */
     private String ownerCompany;
 
+    /**
+     * 业主单位城投id
+     */
+    private String ownerCompanyUipId;
+
+    /**
+     * 业主单位建设库id
+     */
+    private Integer ownerCompanyCid;
+
     /**
      * 最后跟进时间
      */

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

@@ -10,8 +10,8 @@ import com.dsk.system.domain.vo.BusinessBrowseVo;
 import com.dsk.system.domain.vo.BusinessListVo;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目详情Service接口
@@ -99,4 +99,11 @@ public interface IBusinessInfoService
 
     List<CustomerBusinessListVo> selectCustomerBusinessList(CustomerBusinessSearchDto dto);
 
+    /**
+     * 查询企业的城投id和建设库id
+     * @param companyName
+     * @return
+     */
+    Map queryUipIdOrCid (String companyName);
+
 }

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

 package com.dsk.system.service;
 
-import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
 import com.dsk.system.domain.BusinessIdDto;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 

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

@@ -2,8 +2,10 @@ package com.dsk.system.service.impl;
 
 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;
+import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.config.RuoYiConfig;
 import com.dsk.common.constant.HttpStatus;
 import com.dsk.common.core.domain.AjaxResult;
@@ -11,10 +13,7 @@ import com.dsk.common.core.domain.entity.BusinessInfo;
 import com.dsk.common.core.domain.entity.BusinessLabel;
 import com.dsk.common.core.domain.entity.BusinessUser;
 import com.dsk.common.exception.base.BaseException;
-import com.dsk.common.utils.CheckUtils;
-import com.dsk.common.utils.DateUtils;
-import com.dsk.common.utils.SecurityUtils;
-import com.dsk.common.utils.StringUtils;
+import com.dsk.common.utils.*;
 import com.dsk.common.utils.file.FileUtils;
 import com.dsk.system.domain.BusinessAddDto;
 import com.dsk.system.domain.BusinessExcelDto;
@@ -29,6 +28,7 @@ import com.dsk.system.mapper.BusinessLabelMapper;
 import com.dsk.system.mapper.BusinessUserMapper;
 import com.dsk.system.service.IBusinessInfoService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -37,6 +37,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目详情Service业务层处理
@@ -55,6 +56,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     private BusinessLabelMapper businessLabelMapper;
     @Resource
     private ReadBusinessInfoExcel readBusinessInfoExcel;
+    @Resource
+    private DskOpenApiUtil dskOpenApiUtil;
 
     /**
      * 查询项目详情
@@ -156,7 +159,6 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                 BusinessAddDto businessAddDto = new BusinessAddDto();
                 BeanUtil.copyProperties(businessInfo, businessAddDto);
                 businessAddDto.setUserId(userId.intValue());
-                businessAddDto.setCompanyId(0);
                 AjaxResult add = insertBusinessInfo(businessAddDto);
                 if (add.get("code").equals(HttpStatus.SUCCESS)) rowSuccess++;
             }
@@ -191,10 +193,20 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         BusinessInfo businessInfo = new BusinessInfo();
         BeanUtil.copyProperties(dto, businessInfo);
         businessInfo.setConstructionUnit(dto.getOwnerCompany());
+        //查询企业的城投id和建设库id
+        Map map = queryUipIdOrCid(dto.getOwnerCompany());
+        if(map.containsKey("jskEid")){
+            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map,"jskEid",null));
+        }else {
+            businessInfo.setConstructionUnitUipId(MapUtils.getString(map,"uipId",null));
+            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map,"companyId",null));
+        }
+
         int addBusiness = businessInfoMapper.insertBusinessInfo(businessInfo);
         if (addBusiness > 0) {
             //获取登陆用户的部门id
-            Long deptId = SecurityUtils.getLoginUser().getDeptId();
+//            Long deptId = SecurityUtils.getLoginUser().getDeptId();
+            Long deptId = 100l;
             //新增用户-项目关系信息
             int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), deptId.intValue(), dto.getUserId(), 1));
             return addbusinessUser > 0 ? AjaxResult.success() : AjaxResult.error();
@@ -224,6 +236,14 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                 throw new BaseException("500", "请输入正确的电话号码");
         }
         businessInfo.setUpdateTime(DateUtils.getNowDate());
+        //查询企业的城投id和建设库id
+        Map map = queryUipIdOrCid(businessInfo.getConstructionUnit());
+        if(map.containsKey("jskEid")){
+            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map,"jskEid",null));
+        }else {
+            businessInfo.setConstructionUnitUipId(MapUtils.getString(map,"uipId",null));
+            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map,"companyId",null));
+        }
         return businessInfoMapper.updateBusinessInfo(businessInfo);
     }
 
@@ -276,4 +296,41 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     public List<CustomerBusinessListVo> selectCustomerBusinessList(CustomerBusinessSearchDto dto) {
         return businessInfoMapper.selectCustomerBusinessList(dto);
     }
+
+    @Override
+    public Map queryUipIdOrCid (String companyName){
+        Map<Object, Object> map = MapUtil.builder().build();
+        if(StringUtils.isEmpty(companyName))return map;
+        //查询城投企业
+        Map<String, Object> paramMap = MapUtil.<String,Object>builder().put("companyName", companyName).build();
+        Map<String, Object> resultMap = dskOpenApiUtil.requestBody("/urbanInvestment/detailsByCompanyName", paramMap);
+        Integer code = MapUtils.getInteger(resultMap, "code", 300);
+        if(code == HttpStatus.SUCCESS){
+            Map data = MapUtils.getMap(resultMap, "data",null);
+            if(data != null){
+                map.put("uipId",MapUtils.getString(data,"uipId",null));
+                map.put("companyId",MapUtils.getInteger(data,"companyId",null));
+            }
+        }
+        if(MapUtil.isEmpty(map)) {
+            //查村建设库企业
+            Map<String, Object> jskParamMap = MapUtil.<String,Object>builder()
+                    .put("keyword", companyName)
+                    .put("page",MapUtil.<String,Object>builder().put("page",1).put("limit",10).build())
+                    .build();
+            Map<String, Object> jskResultMap = dskOpenApiUtil.requestBody("/enterprise/index", jskParamMap);
+            if(MapUtils.getInteger(resultMap,"code",300).equals(HttpStatus.SUCCESS)){
+                Map data = MapUtils.getMap(jskResultMap, "data",null);
+                if(data != null){
+                    List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+                    if(CollectionUtil.isNotEmpty(list)){
+                        for (Object obj : list) {
+                            map.put("jskEid",MapUtils.getInteger(BeanUtil.beanToMap(obj,false,false),"jskEid",null));
+                        }
+                    }
+                }
+            }
+        }
+        return map;
+    }
 }

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

@@ -5,12 +5,15 @@ import com.dsk.common.core.domain.entity.BusinessRelateCompany;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.system.domain.BusinessIdDto;
 import com.dsk.system.mapper.BusinessRelateCompanyMapper;
+import com.dsk.system.service.IBusinessInfoService;
 import com.dsk.system.service.IBusinessRelateCompanyService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -24,6 +27,8 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS
 {
     @Resource
     private BusinessRelateCompanyMapper businessRelateCompanyMapper;
+    @Resource
+    private IBusinessInfoService businessInfoService;
 
     /**
      * 查询项目关联单位
@@ -61,6 +66,14 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS
     {
 //        if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的电话号码");
         businessRelateCompany.setCreateTime(DateUtils.getNowDate());
+        //查询企业的城投id和建设库id
+        Map map = businessInfoService.queryUipIdOrCid(businessRelateCompany.getCompanyName());
+        if(map.containsKey("jskEid")){
+            businessRelateCompany.setCompanyId(MapUtils.getInteger(map,"jskEid",null));
+        }else {
+            businessRelateCompany.setCompanyUipId(MapUtils.getString(map,"uipId",null));
+            businessRelateCompany.setCompanyId(MapUtils.getInteger(map,"companyId",null));
+        }
         return businessRelateCompanyMapper.insertBusinessRelateCompany(businessRelateCompany);
     }
 
@@ -76,6 +89,14 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS
     {
 //        if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的电话号码");
         businessRelateCompany.setUpdateTime(DateUtils.getNowDate());
+        //查询企业的城投id和建设库id
+        Map map = businessInfoService.queryUipIdOrCid(businessRelateCompany.getCompanyName());
+        if(map.containsKey("jskEid")){
+            businessRelateCompany.setCompanyId(MapUtils.getInteger(map,"jskEid",null));
+        }else {
+            businessRelateCompany.setCompanyUipId(MapUtils.getString(map,"uipId",null));
+            businessRelateCompany.setCompanyId(MapUtils.getInteger(map,"companyId",null));
+        }
         return businessRelateCompanyMapper.updateBusinessRelateCompany(businessRelateCompany);
     }
 

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -78,7 +78,9 @@
                construction_phone,
                supervisor_unit,
                supervisor_principal,
-               supervisor_phone
+               supervisor_phone,
+               construction_unit_uip_id,
+               construction_unit_cid
         from business_info
     </sql>
 
@@ -92,6 +94,8 @@
         i.district_name districtName,
         i.investment_amount investmentAmount,
         i.construction_unit ownerCompany,
+        i.construction_unit_uip_id ownerCompanyUipId,
+        i.construction_unit_cid ownerCompanyCid,
         MAX(f.creat_time) followTime,
         u.nick_name nickName,
         GROUP_CONCAT(DISTINCT l.label) label
@@ -284,6 +288,8 @@
             <if test="supervisorUnit != null">supervisor_unit,</if>
             <if test="supervisorPrincipal != null">supervisor_principal,</if>
             <if test="supervisorPhone != null">supervisor_phone,</if>
+            <if test="constructionUnitUipId != null">construction_unit_uip_id,</if>
+            <if test="constructionUnitCid != null">construction_unit_cid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectName != null">#{projectName},</if>
@@ -321,6 +327,8 @@
             <if test="supervisorUnit != null">#{supervisorUnit},</if>
             <if test="supervisorPrincipal != null">#{supervisorPrincipal},</if>
             <if test="supervisorPhone != null">#{supervisorPhone},</if>
+            <if test="constructionUnitUipId != null">#{constructionUnitUipId},</if>
+            <if test="constructionUnitCid != null">#{constructionUnitCid},</if>
         </trim>
     </insert>
 
@@ -343,6 +351,8 @@
             city_id = #{cityId},
             district_name = #{districtName},
             district_id = #{districtId},
+            construction_unit_uip_id = #{constructionUnitUipId},
+            construction_unit_cid = #{constructionUnitCid},
             <if test="projectType != null">project_type = #{projectType},</if>
             <if test="projectCategory != null">project_category = #{projectCategory},</if>
             <if test="isPrivate != null">is_private = #{isPrivate},</if>

dsk-system/src/main/resources/mapper/business/BusinessRelateCompanyMapper.xml

@@ -16,6 +16,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="depth" column="depth"/>
         <result property="companyType" column="company_type"/>
+        <result property="companyUipId" column="company_uip_id"/>
     </resultMap>
 
     <sql id="selectBusinessRelateCompanyVo">
@@ -29,7 +30,8 @@
                depth,
                create_time,
                update_time,
-               company_type
+               company_type,
+               company_uip_id
         from business_relate_company
     </sql>
 
@@ -71,6 +73,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="companyType != null">company_type,</if>
+            <if test="companyUipId != null">company_uip_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="businessId != null">#{businessId},</if>
@@ -83,6 +86,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="companyType != null">#{companyType},</if>
+            <if test="companyUipId != null">#{companyUipId},</if>
         </trim>
     </insert>
 
@@ -90,7 +94,8 @@
         update business_relate_company
         <trim prefix="SET" suffixOverrides=",">
             <if test="businessId != null">business_id = #{businessId},</if>
-            <if test="companyId != null">company_id = #{companyId},</if>
+            company_id = #{companyId},
+            company_uip_id = #{companyUipId},
             <if test="companyName != null">company_name = #{companyName},</if>
             <if test="depth != null">depth = #{depth},</if>
             <if test="companyRole != null">company_role = #{companyRole},</if>