Merge remote-tracking branch 'origin/master'

dsk-framework/src/main/java/com/dsk/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/economic/**","/enterprises/**","/specialPurposeBonds/**","/urbanInvestment/**").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

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

 package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.UrbanInvestmentPlatformDto;
 import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
+import com.dsk.system.service.ICustomerService;
 import com.dsk.system.service.UrbanInvestmentPlatformService;
+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.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,9 +32,41 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
     @Autowired
     private DskOpenApiUtil dskOpenApiUtil;
 
+    @Autowired
+    private ICustomerService iCustomerService;
+
     @Override
     public AjaxResult page(UrbanInvestmentPlatformDto pageDto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/urbanInvestment/page", BeanUtil.beanToMap(pageDto, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (HttpStatus.OK.value() != code) {
+            throw new RuntimeException();
+        }
+        Map data = MapUtils.getMap(map, "data", null);
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (CollectionUtils.isEmpty(list)) {
+            return BeanUtil.toBean(map, AjaxResult.class);
+        }
+
+        ArrayList<String> uipIds = new ArrayList<>();
+        for (Object dataMap : list) {
+            uipIds.add(MapUtils.getString(CommonUtils.assertAsMap(dataMap), "uipId"));
+        }
+        List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
+
+        //按照城投企业id合并两个list
+        for (Object companyObj : list) {
+            Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
+            String uipId = MapUtils.getString(companyMap, "uipId");
+            if (CollectionUtils.isEmpty(claimStatusList)) {
+                companyMap.put("claimStatus", 0);
+            }
+            for (CustomerStatusListVo vo : claimStatusList) {
+                if (uipId.equals(vo.getUipId())) {
+                    companyMap.put("claimStatus", 1);
+                }
+            }
+        }
         return BeanUtil.toBean(map, AjaxResult.class);
     }