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

dsk-common/src/main/java/com/dsk/common/constant/CacheConstants.java

@@ -58,5 +58,11 @@ public class CacheConstants
     public static final String DATA_FINANCIAL = "data:financial";
 
 
+    /**
+     * 全国经济大全-默认
+     */
+    public static final String DATA_ECONOMIC = "data:economic";
+
+
 
 }

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

@@ -46,7 +46,7 @@
               width="316">
             <template slot-scope="scope">
               <div class="ps1">
-                <div class="wordprimary ps2" @click="toDetail(scope.row,'')">{{scope.row.companyName}}</div>
+                <div class="wordprimary ps2" @click="toDetail(scope.row,'')" v-html="scope.row.companyName"></div>
                 <div class="ps3">
                   <el-tooltip class="item" effect="dark" content="写跟进" placement="top">
                     <div  @click="toDetail(scope.row,'gjjl')"><img class="i" src="@/assets/images/project/edit_1.png"><img class="o" src="@/assets/images/project/edit_11.png"></div>

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

@@ -28,7 +28,7 @@
             @handle-current-change="handleCurrentChange"
           >
             <template slot="projectName" slot-scope="scope">
-              <span class="link-type" @click="clickDetail(scope.row.id)">
+              <span class="link-type" @click="clickDetail(scope.row.id)" >
                 {{ scope.row.projectName }}
               </span>
             </template>
@@ -324,7 +324,7 @@ export default {
       }
     },
     selCompany1(item){
-      this.addParam.projectName = item
+      this.addParam.projectName = item.replace(/<[^>]+>/g, '')
       this.showlist1 = false
     },
     //获取业主单位

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

@@ -742,7 +742,7 @@ export default {
     },
     cancelClaim(companyName){
       this.dialogVisible1 = true;
-      this.companyName = companyName;
+      this.companyName = companyName.replace(/<[^>]+>/g, '');
     },
     confirm(){
       api.cancelClaim(this.companyName).then(res=>{
@@ -762,7 +762,7 @@ export default {
     },
     handleClick(item){
       this.companyId=item.companyId;
-      this.companyName=item.companyName;
+      this.companyName=item.companyName.replace(/<[^>]+>/g, '');
       infoHeader({companyId:this.companyId}).then(res => {
         if(res.code === 200){
           let registerAddress=res.data.provinceName
@@ -774,7 +774,7 @@ export default {
           }
           let params={
             uipId:item.uipId,
-            companyName:item.companyName,
+            companyName:item.companyName.replace(/<[^>]+>/g, ''),
             companyId:item.companyId,
             creditLevel:item.bratingSubjectLevel,
             legalPerson:res.data.corporatePerson,
@@ -785,7 +785,7 @@ export default {
             registerAddress:registerAddress,
             creditCode:res.data.creditCode,
           }
-          customerStatus(item.companyName).then(res => {
+          customerStatus(item.companyName.replace(/<[^>]+>/g, '')).then(res => {
             if(res.data === 1){
               this.claimVisible1=true;
             }else {

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

@@ -177,6 +177,7 @@
         this.queryParam.projectType = item.projectType
         this.queryParam.projectCategory = item.projectCategory
         this.queryParam.status = item.status
+        this.queryParam.ownerCompany = item.companyName
         this.queryParam.projectName = item.projectName.replace(/<[^>]+>/g, '')
         this.proList = []
       },

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

@@ -140,6 +140,7 @@
         this.value = ""
       },
       add(){
+
         // if(this.queryParam.task == '' || this.queryParam.dueTime == '')
         if(this.queryParam.task == '')
           return this.$message.warning('时间和内容需填写完整！')

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

@@ -159,7 +159,7 @@
             <el-input type="text" v-model="queryParam.responsiblePerson" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="联系方式：" class="row">
-            <el-input type="text" v-model="queryParam.phonenumber" placeholder="请输入"></el-input>
+            <el-input type="text" oninput="value=value.replace(/[^\d]/g,'')" v-model="queryParam.phone" maxlength="11" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="备注说明：" class="row">
             <el-input
@@ -210,7 +210,7 @@
         rules:{
           companyRole:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
           companyName:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
-          phonenumber: [
+          phone: [
             {
               pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
               message: "请输入正确的手机号码",
@@ -301,6 +301,12 @@
         })
       },
       addqy(){
+        if(this.queryParam.companyName === ''){
+          return this.$message.warning('企业名称需填写完整！')
+        }
+        if(this.queryParam.companyRole === ''){
+          return this.$message.warning('企业角色称需填写完整！')
+        }
         addXGQY(this.queryParam).then(res=>{
           this.hzhbVisible=false
           if(res.code == 200){
@@ -310,6 +316,7 @@
             this.$message.error(res.msg)
           }
         })
+
       },
       saveqy(){
         saveXGQY(this.queryParam).then(res=>{

dsk-system/src/main/java/com/dsk/system/domain/business/vo/BusinessLikeProjectNameListVo.java

@@ -12,6 +12,8 @@ public class BusinessLikeProjectNameListVo {
 
     private String projectName;
 
+    private String companyName;
+
     /** 总投金额(万元) */
     private Double investmentAmount;
 

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -71,17 +71,10 @@ public class EnterpriseService {
         Map uipData = MapUtils.getMap(uipMap, "data", new HashMap<>());
         String uipId = MapUtils.getString(uipData, "uipId", null);
         companyData.put("uipId", uipId);
-        if (!ObjectUtil.isEmpty(uipId)) {
-            ArrayList<String> uipIds = new ArrayList<>();
-            uipIds.add(uipId);
-            companyData.put("claimStatus", CollectionUtils.isEmpty(iCustomerService.selectStatusList(uipIds)) ? 0 : 1);
-        } else {
-            Integer status = iCustomerService.status(companyName);
-            if (ObjectUtil.isNotEmpty(status)) {
-                companyData.put("claimStatus", status.equals(0) ? 1 : 0);
-            }
+        Integer status = iCustomerService.status(companyName);
+        if (ObjectUtil.isNotEmpty(status)) {
+            companyData.put("claimStatus", status.equals(0) ? 1 : 0);
         }
-
         Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", map);
         Integer bondCreditRatingCode = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
         if (200 != bondCreditRatingCode) return R.ok(companyData);
@@ -249,29 +242,34 @@ public class EnterpriseService {
             return new TableDataInfo(list, 0);
         }
 
-        ArrayList<String> uipIds = new ArrayList<>();
+        ArrayList<String> companyNames = new ArrayList<>();
+        ArrayList<Long> cIds = new ArrayList<>();
         for (Object dataMap : list) {
-            uipIds.add(MapUtils.getString(CommonUtils.assertAsMap(dataMap), "uipId"));
+            companyNames.add(MapUtils.getString(CommonUtils.assertAsMap(dataMap), "companyName"));
+            cIds.add(MapUtils.getLong(CommonUtils.assertAsMap(dataMap), "companyId"));
         }
 
-        List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
+        List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusListByCompanyName(companyNames);
+
+        Map<String, Object> bondCreditRatingBatchMap = new HashMap<>(1);
+        bondCreditRatingBatchMap.put("cIds", cIds);
+        Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRatingBatch", bondCreditRatingBatchMap);
+        Integer codeRating = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
+        ArrayList<Map<String, Object>> objArrayList = new ArrayList(1);
+        if (codeRating.equals(HttpStatus.OK.value())) {
+            Object object = bondCreditRatingMap.get("data");
+            if (ObjectUtil.isNotEmpty(object)) {
+                objArrayList = (ArrayList)object;
+            }
+        }
 
         //按照城投企业id合并两个list
         for (Object companyObj : list) {
             Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
-            companyMap.put("cid", MapUtils.getString(companyMap, "companyId"));
             companyMap.put("bratingSubjectLevel", null);
-            Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", companyMap);
-            Integer codeRating = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
-            if (codeRating.equals(HttpStatus.OK.value())) {
-                Object object = bondCreditRatingMap.get("data");
-                if (ObjectUtil.isNotEmpty(object)) {
-                    ArrayList obj = (ArrayList)object;
-                    Map<String, Object> bondCreditRating = (Map<String, Object>)obj.get(0);
-                    companyMap.put("bratingSubjectLevel", bondCreditRating.get("bratingSubjectLevel"));
-                }
-            }
             String uipId = MapUtils.getString(companyMap, "uipId");
+            String companyName = MapUtils.getString(companyMap, "companyName", "");
+            Long companyId = MapUtils.getLong(companyMap, "companyId");
             companyMap.put("bondBalance",MapUtils.getDouble(companyMap, "bondBalance")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "bondBalance")));
             companyMap.put("totalAssets",MapUtils.getDouble(companyMap, "totalAssets")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "totalAssets")));
             companyMap.put("belongNetAssets",MapUtils.getDouble(companyMap, "belongNetAssets")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "belongNetAssets")));
@@ -310,10 +308,16 @@ public class EnterpriseService {
 
             companyMap.put("claimStatus", 0);
             for (CustomerStatusListVo vo : claimStatusList) {
-                if (uipId.equals(vo.getUipId())) {
+                if (companyName.equals(vo.getCompanyName())) {
                     companyMap.put("claimStatus", 1);
                 }
             }
+            for (Map<String, Object> m : objArrayList) {
+                Long companyIdCredit = MapUtils.getLong(m, "companyId", 0L);
+                if (companyIdCredit.equals(companyId)) {
+                    companyMap.put("bratingSubjectLevel", m.get("bratingSubjectLevel"));
+                }
+            }
         }
 
         return new TableDataInfo(list, MapUtils.getInteger(data, "totalCount", 0));

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

@@ -139,24 +139,28 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
 
     @Override
     public List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto) {
-        List<BusinessLikeProjectNameListVo> vos = businessInfoMapper.selectProjectName(dto);
-//        List<BusinessLikeProjectNameListVo> vos = new ArrayList<>();
-//        Map<String, Object> result = dskOpenApiUtil.requestBody("/company/bidding/newZhaoBiao/list", toRequestMap(dto));
-//        if ("200".equals(result.get("code")) && ObjectUtil.isNotEmpty(result.get("data"))
-//                && ObjectUtil.isNotEmpty(BeanUtil.beanToMap(result.get("data")).get("list"))) {
-//            List<Map<String, Object>> list = (List<Map<String, Object>>) BeanUtil.beanToMap(result.get("data")).get("list");
-//            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.setInvestmentAmount(MapUtil.getDouble(map, "bidMoney"));
-//                    vo.setProjectLevel(MapUtil.getStr(map, "bidMoney"));
-//                    vo.setProjectStage(MapUtil.getStr(map, "tenderStage"));
-//                    vo.setProjectType(MapUtil.getStr(map, "projectType"));
-//                    vo.setProjectCategory(MapUtil.getStr(map, "projectType"));
-//                }
-//            }
-//        }
+//        List<BusinessLikeProjectNameListVo> vos = businessInfoMapper.selectProjectName(dto);
+        List<BusinessLikeProjectNameListVo> vos = new ArrayList<>();
+        try {
+            Map<String, Object> result = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/findByName", toRequestMap(dto));
+            if (ObjectUtil.isNotEmpty(result.get("data"))) {
+                List<Map<String, Object>> list = (List<Map<String, Object>>) BeanUtil.beanToMap(result.get("data")).get("list");
+                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.setCompanyName(MapUtil.getStr(map, "tenderee"));
+                        vo.setInvestmentAmount(Double.parseDouble(MapUtil.getStr(map, "projectContractAmount")));
+                        vo.setProjectType(MapUtil.getStr(map, "projectType"));
+                        vo.setProjectCategory(MapUtil.getStr(map, "projectPurposes"));
+                        vos.add(vo);
+                    }
+                }
+            }
+        }catch (Exception e) {
+            log.error("模糊查询项目名称调用失败！");
+        }
+
         return vos;
     }
 

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

@@ -5,6 +5,7 @@ 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.annotation.DataScope;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.SecurityUtils;
@@ -27,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -52,6 +54,7 @@ public class CustomerServiceImpl implements ICustomerService {
     private BusinessOpportunityRadarService opportunityRadarService;
 
     @Override
+//    @DataScope(deptAlias = "d", userAlias = "u")
     public List<CustomerListVo> selectList(CustomerSearchDto dto) {
         dto.setUserId(SecurityUtils.getUserId());
         dto.setStatus(ObjectUtils.isEmpty(dto.getStatus()) ? 0 : dto.getStatus());
@@ -74,9 +77,18 @@ public class CustomerServiceImpl implements ICustomerService {
         dealWithcustomerData(customer);
         if (ObjectUtils.isEmpty(customer.getUipId())) {
             try {
-                R res = enterpriseService.getUipId(customer.getCompanyName());
-                if (!ObjectUtils.isEmpty(res.getData())) {
-                    customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(res.getData()), "uipId"));
+                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();
+                    customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(data.get((0))), "uipId"));
+                }
+                if(ObjectUtils.isEmpty(customer.getUipId())){
+                    res = enterpriseService.getUipId(customer.getCompanyName());
+                    if (!ObjectUtils.isEmpty(res.getData())) {
+                        customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(res.getData()), "uipId"));
+                    }
                 }
             } catch (Exception e) {
                 log.error("获取城投平台企业id错误！error：{}", e.getMessage());

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

@@ -2,6 +2,7 @@ package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.constant.CacheConstants;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.redis.RedisCache;
@@ -15,7 +16,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -40,7 +40,23 @@ public class EconomicServiceImpl implements EconomicService {
         if (ObjectUtil.isEmpty(dto.getYear())) {
             dto.setYear(DateUtils.getYear() - 1);
         }
+        String redisKey = CacheConstants.DATA_ECONOMIC + dto.getYear() + dto.getProvinceIds() + dto.getCityIds() + dto.getAreaIds();
+        Map<String, Object> cacheMap = redisCache.getCacheObject(redisKey);
+        if (ObjectUtil.isNotEmpty(cacheMap)) {
+            return BeanUtil.toBean(cacheMap, AjaxResult.class);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (!code.equals(HttpStatus.OK.value())) {
+            throw new RuntimeException();
+        }
+        Map data = MapUtils.getMap(map, "data", null);
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (ObjectUtil.isNotEmpty(list)) {
+            if (ObjectUtil.isEmpty(dto.getProvinceIds()) && ObjectUtil.isEmpty(dto.getCityIds()) && ObjectUtil.isEmpty(dto.getAreaIds())) {
+                redisCache.setCacheObject(redisKey, map);
+            }
+        }
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

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

@@ -49,48 +49,48 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
             return BeanUtil.toBean(map, AjaxResult.class);
         }
 
-        ArrayList<String> uipIds = new ArrayList<>();
+        ArrayList<String> companyNames = new ArrayList<>();
+        ArrayList<Long> cIds = new ArrayList<>();
         for (Object dataMap : list) {
-            uipIds.add(MapUtils.getString(CommonUtils.assertAsMap(dataMap), "uipId"));
+            companyNames.add(MapUtils.getString(CommonUtils.assertAsMap(dataMap), "companyName"));
+            cIds.add(MapUtils.getLong(CommonUtils.assertAsMap(dataMap), "companyId"));
         }
-//        List<String> claimStatusList = iCustomerService.selectUipIdList(uipIds);
-        List<CustomerStatusListVo> customerStatusListVos = iCustomerService.selectStatusList(uipIds);
+        List<CustomerStatusListVo> customerStatusListVos = iCustomerService.selectStatusListByCompanyName(companyNames);
+
+        Map<String, Object> bondCreditRatingBatchMap = new HashMap<>(1);
+        bondCreditRatingBatchMap.put("cIds", cIds);
+        Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRatingBatch", bondCreditRatingBatchMap);
+        Integer codeRating = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
+        ArrayList<Map<String, Object>> objArrayList = new ArrayList(1);
+        if (codeRating.equals(HttpStatus.OK.value())) {
+            Object object = bondCreditRatingMap.get("data");
+            if (ObjectUtil.isNotEmpty(object)) {
+                objArrayList = (ArrayList)object;
+            }
+        }
+
         //按照城投企业id合并两个list
         //按照城投企业id合并两个list
         for (Object companyObj : list) {
             Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
-            companyMap.put("bratingSubjectLevel", null);
-            companyMap.put("cid", MapUtils.getString(companyMap, "companyId"));
-            Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", companyMap);
-            Integer codeRating = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
-            if (codeRating.equals(HttpStatus.OK.value())) {
-                Object object = bondCreditRatingMap.get("data");
-                if (ObjectUtil.isNotEmpty(object)) {
-                    ArrayList obj = (ArrayList)object;
-                    Map<String, Object> bondCreditRating = (Map<String, Object>)obj.get(0);
-                    companyMap.put("bratingSubjectLevel", bondCreditRating.get("bratingSubjectLevel"));
-                }
-            }
+            Long companyId = MapUtils.getLong(companyMap, "companyId");
             String uipId = MapUtils.getString(companyMap, "uipId");
+            String companyName = MapUtils.getString(companyMap, "companyName", "");
             companyMap.put("claimStatus", 0);
+            companyMap.put("bratingSubjectLevel", null);
             for (CustomerStatusListVo vo : customerStatusListVos) {
-                if (uipId.equals(vo.getUipId())) {
+                if (companyName.equals(vo.getCompanyName())) {
                     companyMap.put("claimStatus", 1);
                 }
             }
-        }
 
-//        for (Object companyObj : list) {
-//            Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
-//            String uipId = MapUtils.getString(companyMap, "uipId","uipId");
-//            if (CollectionUtils.isEmpty(claimStatusList)) {
-//                companyMap.put("claimStatus", 0);
-//            } else if (claimStatusList.contains(uipId)) {
-//                companyMap.put("claimStatus", 1);
-//            } else {
-//                companyMap.put("claimStatus", 0);
-//            }
-//        }
+            for (Map<String, Object> m : objArrayList) {
+                Long companyIdCredit = MapUtils.getLong(m, "companyId", 0L);
+                if (companyIdCredit.equals(companyId)) {
+                    companyMap.put("bratingSubjectLevel", m.get("bratingSubjectLevel"));
+                }
+            }
+        }
         return BeanUtil.toBean(map, AjaxResult.class);
     }