-

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInvestmentBody.java

@@ -21,6 +21,8 @@ public class EnterpriseInvestmentBody extends BasePage {
     private Integer hasBid;
     private double stockPercentageMin;
     private double stockPercentageMax;
+    //搜索-企业名称
+    private String keyword;
 
     public boolean isVaildCid() {
         return 0 == cid;

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

@@ -145,9 +145,35 @@ public class EnterpriseService {
     }
 
     public TableDataInfo investment(EnterpriseInvestmentBody body) throws Exception {
-        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
+        if (body.isVaildCid()) {
+            return new TableDataInfo(new ArrayList<>(), 0);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
-        return dskOpenApiUtil.responsePage(map);
+        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 (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+        List<Object> newList = new ArrayList<>(20);
+        for (Object companyObj : list) {
+            Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
+            String businessStatus = MapUtils.getString(companyMap, "businessStatus");
+            if (!"注销".equals(businessStatus)) {
+                newList.add(companyMap);
+            }
+        }
+        for (Object companyObj : list) {
+            Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
+            String businessStatus = MapUtils.getString(companyMap, "businessStatus");
+            if ("注销".equals(businessStatus)) {
+                newList.add(companyMap);
+            }
+        }
+        return new TableDataInfo(newList, MapUtils.getInteger(data, "totalCount", 0));
     }
 
     public TableDataInfo affiliates(EnterpriseAffiliatesBody body) throws Exception {