Merge remote-tracking branch 'origin/master'

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

@@ -387,21 +387,13 @@ ul, li {
 }
 
 .common-title{
+  border-left: 2px solid #445781;
+  padding-left: 8px;
   font-size: 16px;
-  color: #232323;
+  height: 16px;
+  line-height: 16px;
   font-weight: 700;
-  line-height: 0.9;
-  position: relative;
-  padding: 0 0 0 8px;
-  &:before{
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 2px;
-    height: 14px;
-    background: #445781;
-    content:"";
-  }
+  color: #232323;
 }
 
 .pagination-box{

dsk-operate-ui/src/layout/components/TagsView/index.vue

@@ -355,9 +355,9 @@ export default {
       transition: all .3s cubic-bezier(.645, .045, .355, 1);
       transform-origin: 100% 50%;
       &:before {
-        transform: scale(.6);
+        transform: scale(.95);
         display: inline-block;
-        vertical-align: -3px;
+        vertical-align: -2.5px;
       }
     }
   }

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

 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.core.domain.AjaxResult;
 import com.dsk.common.dtos.SpecialBondInformationDetailsDto;
 import com.dsk.common.dtos.SpecialBondInformationPageDto;
@@ -8,9 +10,13 @@ import com.dsk.common.dtos.SpecialPurposeBondsDto;
 import com.dsk.common.dtos.SpecialPurposeBondsPageDto;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.system.service.SpecialPurposeBondsService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,12 +35,64 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
     @Override
     public AjaxResult page(SpecialPurposeBondsPageDto dto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/projects/page", BeanUtil.beanToMap(dto, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (code.equals(HttpStatus.OK.value())) {
+            Map data = MapUtils.getMap(map, "data", null);
+            List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (Object projectObj : list) {
+                    Map<String, Object> projectMap = CommonUtils.assertAsMap(projectObj);
+                    // 项目总投资
+                    Double projectTotalInvestment = MapUtils.getDouble(projectMap, "projectTotalInvestment",0.00);
+                    projectMap.put("projectTotalInvestment", projectTotalInvestment / 10000);
+                    // 专项债用作资本金
+                    Double specialBondCapital = MapUtils.getDouble(projectMap, "specialBondCapital",0.00);
+                    projectMap.put("specialBondCapital", specialBondCapital / 10000);
+                    // 项目资本金
+                    Double projectCapital = MapUtils.getDouble(projectMap, "projectCapital",0.00);
+                    projectMap.put("projectCapital", projectCapital / 10000);
+                }
+            }
+        }
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult details(SpecialBondInformationDetailsDto detailsDto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/details", BeanUtil.beanToMap(detailsDto, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (code.equals(HttpStatus.OK.value())) {
+            Map projectMap = MapUtils.getMap(map, "data", null);
+            if (ObjectUtil.isNotEmpty(projectMap)) {
+                // 项目总投资
+                Double projectTotalInvestment = MapUtils.getDouble(projectMap, "projectTotalInvestment",0.00);
+                projectMap.put("projectTotalInvestment", projectTotalInvestment / 10000);
+                // 专项债用作资本金
+                Double specialBondCapital = MapUtils.getDouble(projectMap, "specialBondCapital",0.00);
+                projectMap.put("specialBondCapital", specialBondCapital / 10000);
+                // 项目资本金
+                Double projectCapital = MapUtils.getDouble(projectMap, "projectCapital",0.00);
+                projectMap.put("projectCapital", projectCapital / 10000);
+                // 其他资金
+                Double otherFunds = MapUtils.getDouble(projectMap, "otherFunds",0.00);
+                projectMap.put("otherFunds", otherFunds / 10000);
+                // 计划使用专项债融资额
+                Double econData012 = MapUtils.getDouble(projectMap, "econData012",0.00);
+                projectMap.put("econData012", econData012 / 10000);
+                // 当前使用专项债融资额
+                Double econData013 = MapUtils.getDouble(projectMap, "econData013",0.00);
+                projectMap.put("econData013", econData013 / 10000);
+                // 其他融资
+                Double otherFinancing = MapUtils.getDouble(projectMap, "otherFinancing",0.00);
+                projectMap.put("otherFinancing", otherFinancing / 10000);
+                // 政府安排资金
+                Double govSupportFunds = MapUtils.getDouble(projectMap, "govSupportFunds",0.00);
+                projectMap.put("govSupportFunds", govSupportFunds / 10000);
+                // 项目预测总收益
+                Double projectForecastTotalRevenue = MapUtils.getDouble(projectMap, "projectForecastTotalRevenue",0.00);
+                projectMap.put("projectForecastTotalRevenue", projectForecastTotalRevenue / 10000);
+            }
+        }
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -47,6 +105,19 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
     @Override
     public AjaxResult bondPage(SpecialBondInformationPageDto pageDto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/bond/page", BeanUtil.beanToMap(pageDto, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (code.equals(HttpStatus.OK.value())) {
+            Map data = MapUtils.getMap(map, "data", null);
+            List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (Object informationObj : list) {
+                    Map<String, Object> informationMap = CommonUtils.assertAsMap(informationObj);
+                    // 专项债用于项目规模
+                    Double isUsedProjectScale = MapUtils.getDouble(informationMap, "isUsedProjectScale",0.00);
+                    informationMap.put("isUsedProjectScale", isUsedProjectScale / 10000);
+                }
+            }
+        }
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

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

@@ -57,13 +57,15 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
         //按照城投企业id合并两个list
         for (Object companyObj : list) {
             Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
-            String uipId = MapUtils.getString(companyMap, "uipId");
+            String uipId = MapUtils.getString(companyMap, "uipId","uipId");
             if (CollectionUtils.isEmpty(claimStatusList)) {
                 companyMap.put("claimStatus", 0);
             }
             for (CustomerStatusListVo vo : claimStatusList) {
                 if (uipId.equals(vo.getUipId())) {
                     companyMap.put("claimStatus", 1);
+                } else {
+                    companyMap.put("claimStatus", 0);
                 }
             }
         }