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

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

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessInfoController.java

@@ -58,9 +58,9 @@ public class BusinessInfoController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:info:list')")
     @GetMapping("/browse/{businessId}")
-    public AjaxResult browse(@PathVariable Integer businessId)
+    public AjaxResult browse(@PathVariable Integer id)
     {
-        return success(businessInfoService.browse(businessId));
+        return success(businessInfoService.browse(id));
     }
 
     /**
@@ -74,14 +74,14 @@ public class BusinessInfoController extends BaseController
     }
 
     /**
-     * 删除项目
+     * 删除项目列表
      */
 //    @PreAuthorize("@ss.hasPermi('system:info:remove')")
 //    @Log(title = "项目详情", businessType = BusinessType.DELETE)
     @DeleteMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable(value = "ids",required=false) Long id)
+    public AjaxResult remove(@PathVariable(value = "ids",required=false) Long[] ids)
     {
-        return toAjax(businessInfoService.deleteBusinessInfoById(id));
+        return toAjax(businessInfoService.deleteBusinessInfoByIds(ids));
     }
 
     /**

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/BusinessOpportunityRadarController.java

@@ -58,4 +58,20 @@ public class BusinessOpportunityRadarController {
         return opportunityRadarService.jskBidNewsPage(compose);
     }
 
+
+    /*
+     * 专项债查询
+     */
+    @RequestMapping("/bondProjectPage")
+    public AjaxResult bondProjectPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.bondProjectPage(compose);
+    }
+
+    /*
+     * 投标计划查询
+     */
+    @RequestMapping("/jskBidPlanPage")
+    public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidPlanPage(compose);
+    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/EconomicController.java

 package com.dsk.web.controller.search.macroMarket;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
+import com.dsk.system.domain.OpRegionalEconomicDataV1;
 import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * @ClassName EconomicController
@@ -28,8 +35,84 @@ public class EconomicController {
      *@Author: Dgm
      *@date: 2023/5/18 10:29
      */
-    @GetMapping("/nationalPage")
-    public AjaxResult areaGroupByProvince() {
-        return economicService.nationalPage();
+    @PostMapping("/national/list")
+    public AjaxResult nationalList(@RequestBody OpRegionalEconomicDataV1Dto dto) {
+//        return economicService.nationalList(dto);
+        return new AjaxResult(HttpStatus.OK.value(), "", new OpRegionalEconomicDataV1());
+    }
+
+    /***
+     *@Description: 全国经济大全详情
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @GetMapping("/details/{id}")
+    public AjaxResult details(@PathVariable("id") Integer id) {
+//        return economicService.details(id);
+        return new AjaxResult(HttpStatus.OK.value(), "", new OpRegionalEconomicDataV1());
+    }
+
+
+    /***
+     *@Description: 地区经济-统计
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/statistics/regional")
+    public AjaxResult statisticsRegional(@RequestBody OpRegionalEconomicDataV1Dto dto) {
+//        return economicService.regional(dto);
+        Map<String, Object> map = BeanUtil.beanToMap(new OpRegionalEconomicDataV1(), false, false);
+        // 下属辖区
+        map.put("subordinateJurisdiction", 38);
+        // 城投平台
+        map.put("urbanInvestmentPlatform", 365);
+        // 城投平台授信余额
+        map.put("creditBalance", 666.66);
+        // 城投平台营收账款
+        map.put("accountsReceivable", 888.88);
+        return new AjaxResult(HttpStatus.OK.value(), "", map);
+    }
+
+    /***
+     *@Description: 地区经济-主要指标列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/regional/list")
+    public AjaxResult regionalList(@RequestBody OpRegionalEconomicDataV1Dto dto) {
+//        return economicService.regionalList(dto);
+        List<OpRegionalEconomicDataV1> opRegionalEconomicDataV1List= new ArrayList<>(5);
+
+        OpRegionalEconomicDataV1 dataV1 = new OpRegionalEconomicDataV1();
+        dataV1.setProvince("重庆");
+        dataV1.setYear(2022);
+        OpRegionalEconomicDataV1 dataV2 = new OpRegionalEconomicDataV1();
+        dataV2.setProvince("重庆");
+        dataV2.setYear(2021);
+        OpRegionalEconomicDataV1 dataV3 = new OpRegionalEconomicDataV1();
+        dataV3.setProvince("重庆");
+        dataV3.setYear(2020);
+        OpRegionalEconomicDataV1 dataV4 = new OpRegionalEconomicDataV1();
+        dataV4.setProvince("重庆");
+        dataV4.setYear(2019);
+        OpRegionalEconomicDataV1 dataV5 = new OpRegionalEconomicDataV1();
+        dataV5.setProvince("重庆");
+        dataV5.setYear(2018);
+
+        opRegionalEconomicDataV1List.add(dataV1);
+        opRegionalEconomicDataV1List.add(dataV2);
+        opRegionalEconomicDataV1List.add(dataV3);
+        opRegionalEconomicDataV1List.add(dataV4);
+        opRegionalEconomicDataV1List.add(dataV5);
+
+        return new AjaxResult(HttpStatus.OK.value(), "", opRegionalEconomicDataV1List);
     }
+
+
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEnterprisesController.java

+package com.dsk.web.controller.search.macroMarket;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.system.service.RegionalEnterprisesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName RegionalEnterprisesController
+ * @Description 区域企业
+ * @Author Dgm
+ * @Date 2023/5/24 16:20
+ * @Version
+ */
+@RestController
+@RequestMapping(value="/enterprises")
+public class RegionalEnterprisesController {
+
+    @Autowired
+    private RegionalEnterprisesService regionalEnterprisesService;
+
+    @PostMapping("regional/page")
+    public AjaxResult page(@RequestBody ComposeQueryDto compose) {
+        return regionalEnterprisesService.page(compose);
+    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/SpecialPurposeBondsController.java

+package com.dsk.web.controller.search.macroMarket;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.SpecialPurposeBondsDto;
+import com.dsk.system.domain.SpecialBondInformationV1;
+import com.dsk.system.domain.SpecialBondProjectsV1;
+import com.dsk.system.service.SpecialPurposeBondsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName SpecialPurposeBondsController
+ * @Description 专项债项目
+ * @Author Dgm
+ * @Date 2023/5/18 10:09
+ * @Version 1.0.0
+ */
+@RestController
+@RequestMapping(value ="/specialPurposeBonds")
+public class SpecialPurposeBondsController {
+
+    @Autowired
+    private SpecialPurposeBondsService specialPurposeBondsService;
+
+    /***
+     *@Description: 专项债项目分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/projects/page")
+    public AjaxResult page() {
+//        return specialPurposeBondsService.page();
+
+        Map<String, Object> map = BeanUtil.beanToMap(new SpecialBondProjectsV1(), false, false);
+        return new AjaxResult(HttpStatus.OK.value(), "", map);
+    }
+
+
+    /***
+     *@Description: 专项债项目详情
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @GetMapping("/details/{id}")
+    public AjaxResult details(@PathVariable("id") String id) {
+        return specialPurposeBondsService.details(id);
+    }
+
+
+    /***
+     *@Description: 专项债-项目类别统计
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/bond/statistics")
+    public AjaxResult bondStatistics(@RequestBody SpecialPurposeBondsDto dto) {
+//        return specialPurposeBondsService.bondStatistics();
+
+        Map<String, Object> map = BeanUtil.beanToMap(new SpecialPurposeBondsDto(), false, false);
+
+        List<SpecialPurposeBondsDto> list = new ArrayList<>(4);
+        SpecialPurposeBondsDto one = new SpecialPurposeBondsDto();
+        one.setCount(3);
+        one.setProportion(55.55);
+
+        SpecialPurposeBondsDto two = new SpecialPurposeBondsDto();
+        two.setCount(8);
+        two.setProportion(0.12);
+
+        SpecialPurposeBondsDto three = new SpecialPurposeBondsDto();
+        three.setCount(1);
+        three.setProportion(33.33);
+
+        SpecialPurposeBondsDto four = new SpecialPurposeBondsDto();
+        four.setCount(5);
+        four.setProportion(11.11);
+
+        list.add(one);
+        list.add(two);
+        list.add(three);
+        list.add(four);
+        switch (dto.getField()) {
+            case "count": list = sortedCount(list, dto);
+            break;
+            case "totalInvestment": list = sortedTotalInvestment(list, dto);
+            break;
+            case "proportion": list = sortedProportion(list, dto);
+            break;
+            default:
+                break;
+        }
+        return new AjaxResult(HttpStatus.OK.value(), "", list);
+    }
+
+
+    /***
+     *@Description: 专项债分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/bond/page")
+    public AjaxResult bondPage() {
+//        return specialPurposeBondsService.bondPage();
+
+        Map<String, Object> map = BeanUtil.beanToMap(new SpecialBondInformationV1(), false, false);
+        return new AjaxResult(HttpStatus.OK.value(), "", map);
+    }
+
+    /***
+     *@Description:  项目数量
+     *@Param:
+     *@return: void
+     *@Author: Dgm
+     *@date: 2023/5/25 11:26
+     */
+    public List<SpecialPurposeBondsDto> sortedCount(List<SpecialPurposeBondsDto> list, SpecialPurposeBondsDto dto) {
+        if ("desc".equals(dto.getOrder())) {
+            list = list.stream().sorted(Comparator.comparing(SpecialPurposeBondsDto::getCount).reversed()).collect(Collectors.toList());
+        } else {
+            list = list.stream().sorted(Comparator.comparing(SpecialPurposeBondsDto::getCount)).collect(Collectors.toList());
+        }
+        return list;
+    }
+
+    /***
+     *@Description: 金额
+     *@Param:
+     *@return: void
+     *@Author: Dgm
+     *@date: 2023/5/25 11:26
+     */
+    public List<SpecialPurposeBondsDto> sortedTotalInvestment(List<SpecialPurposeBondsDto> list, SpecialPurposeBondsDto dto) {
+        if ("desc".equals(dto.getOrder())) {
+            list = list.stream().sorted(Comparator.comparing(SpecialPurposeBondsDto::getTotalInvestment).reversed()).collect(Collectors.toList());
+        } else {
+            list = list.stream().sorted(Comparator.comparing(SpecialPurposeBondsDto::getTotalInvestment)).collect(Collectors.toList());
+        }
+        return list;
+    }
+
+    /***
+     *@Description: 比例
+     *@Param:
+     *@return: void
+     *@Author: Dgm
+     *@date: 2023/5/25 11:26
+     */
+    public List<SpecialPurposeBondsDto> sortedProportion(List<SpecialPurposeBondsDto> list, SpecialPurposeBondsDto dto) {
+        if ("desc".equals(dto.getOrder())) {
+            list = list.stream().sorted(Comparator.comparing(SpecialPurposeBondsDto::getProportion).reversed()).collect(Collectors.toList());
+        } else {
+            list = list.stream().sorted(Comparator.comparing(SpecialPurposeBondsDto::getProportion)).collect(Collectors.toList());
+        }
+        return list;
+    }
+
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/UrbanInvestmentPlatformController.java

+package com.dsk.web.controller.search.macroMarket;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.UrbanInvestmentPlatformDto;
+import com.dsk.system.domain.OpUipFinancialData;
+import com.dsk.system.service.UrbanInvestmentPlatformService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @ClassName UrbanInvestmentPlatformController
+ * @Description 城投平台
+ * @Author Dgm
+ * @Date 2023/5/18 10:09
+ * @Version 1.0.0
+ */
+@RestController
+@RequestMapping(value ="/urbanInvestment")
+public class UrbanInvestmentPlatformController {
+
+    @Autowired
+    private UrbanInvestmentPlatformService urbanInvestmentPlatformService;
+
+    /***
+     *@Description: 城投平台分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/page")
+    public AjaxResult page(@RequestBody UrbanInvestmentPlatformDto dto) {
+//        return urbanInvestmentPlatformService.page();
+        Map<String, Object> map = BeanUtil.beanToMap(new OpUipFinancialData(), false, false);
+        // 招标
+        map.put("biddingAnnouncement", 11);
+        // 供应商
+        map.put("supplier", 33);
+        // 土地
+        map.put("landInfo",  66);
+        return new AjaxResult(HttpStatus.OK.value(), "", map);
+    }
+
+    /***
+     *@Description: 城投平台详情
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/details/{id}")
+    public AjaxResult details(@PathVariable("id") String id) {
+        return urbanInvestmentPlatformService.details(id);
+    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -21,4 +21,8 @@ public interface BusinessOpportunityRadarService {
     AjaxResult enterprisePage(ComposeQueryDto compose);
 
     AjaxResult enterpriseByName(String keyword);
+
+    AjaxResult bondProjectPage(ComposeQueryDto compose);
+
+    AjaxResult jskBidPlanPage(ComposeQueryDto compose);
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -63,4 +63,16 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", params);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    @Override
+    public AjaxResult bondProjectPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/bondProject/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult jskBidPlanPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBidPlan/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

dsk-admin/src/main/resources/application-dev.yml

@@ -193,11 +193,6 @@ xss:
 
 dsk:
   open:
-#    endPoint: sandbox.openapi.jiansheku.com
-#    accessKeyId: aec7b3ff2e8b48e79a7e2c463ce21912
-#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-#    protocol: https
-    endPoint: 120.27.13.145:8865
-    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+    endPoint: sandbox.openapi.jiansheku.com
+    accessKeyId: aec7b3ff2e8b48e79a7e2c463ce21912
     accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: http

dsk-common/src/main/java/com/dsk/common/config/DskOpenApiConfig.java

@@ -15,7 +15,6 @@ public class DskOpenApiConfig {
     public String accessKeyId;
     public String accessKeySecret;
     public String endPoint;
-    public String protocol;
 
     public String getAccessKeyId() {
         return accessKeyId;
@@ -40,12 +39,4 @@ public class DskOpenApiConfig {
     public void setEndPoint(String endPoint) {
         this.endPoint = endPoint;
     }
-
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
 }
\ No newline at end of file

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

@@ -102,6 +102,10 @@ public class BusinessInfo extends BaseEntity
     @Excel(name = "项目类别")
     private String projectCategory;
 
+    /** 商务团队 */
+    @Excel(name = "商务团队")
+    private String team;
+
     /** 0 仅自己可见，1 他人可见 */
     @Excel(name = "0 仅自己可见，1 他人可见")
     private Integer isPrivate;
@@ -309,7 +313,15 @@ public class BusinessInfo extends BaseEntity
     {
         return projectCategory;
     }
+    public void setTeam(String team)
+    {
+        this.team = team;
+    }
 
+    public String getTeam()
+    {
+        return team;
+    }
     public void setIsPrivate(Integer isPrivate)
     {
         this.isPrivate = isPrivate;
@@ -342,6 +354,7 @@ public class BusinessInfo extends BaseEntity
             .append("districtId", getDistrictId())
             .append("projectType", getProjectType())
             .append("projectCategory", getProjectCategory())
+            .append("team", getTeam())
             .append("isPrivate", getIsPrivate())
             .append("createTime", getCreateTime())
             .append("updateTime", getUpdateTime())

dsk-common/src/main/java/com/dsk/common/dtos/ComposeQueryDto.java

@@ -58,6 +58,10 @@ public class ComposeQueryDto {
 	JskBidCandidateDto jskBidCandidateDto;
 	//中标公示
 	JskBidWinListDto jskBidWinListDto;
+	//专项债项目
+	SpecialBondProjectDto specialBondProjectDto;
+	//投标计划
+	JskBidPlanDto jskBidPlanDto;
 
 	String achievementQueryType;
 

dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class JskBidPlanDto {
+
+
+	String id;
+
+	String uuid;
+
+	String title;
+
+	String projectName;
+
+	String projectNumber;
+	//招标人
+	String tenderee;
+
+	String tendereeId;
+
+	String projectScale;
+
+	String province;
+
+	String city;
+
+	String area;
+
+	String domicile;
+	//标的物类型
+	String objectType;
+	//项目类型
+	String projectType;
+	//招标方式
+	String tenderWay;
+	//合同预估金额
+	Double planTenderAmount;
+	Double startPlanTenderAmount;
+	Double endPlanTenderAmount;
+	//资金来源
+	String projecetCapitalSource;
+	//发布时间
+	String issueTime;
+	//来源网站
+	String sourceName;
+
+	/**
+	 * 修改时间
+	 */
+	String updateTime;
+}

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataV1Dto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+import org.springframework.boot.context.event.SpringApplicationEvent;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1Dto
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataV1Dto {
+
+    /**
+     * 年份
+     */
+    private Integer year;
+    /**
+     * 省
+     */
+    private Integer provinceId;
+    /**
+     * 市
+     */
+    private Integer cityId;
+    /**
+     * 区
+     */
+    private Integer areaId;
+
+    /**
+     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     */
+    private Integer type;
+}

dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondProjectDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class SpecialBondProjectDto {
+
+
+	Long id;
+
+	String uuid;
+
+	String projectName;
+
+	String projectType;
+	//项目总投资
+	String projectTotalInvestment;
+	//项目资本金
+	String projectCapital;
+	//专项债金额
+	String specialCapital;
+	//项目主体
+	String projectEntity;
+	//项目主体id
+	Long projectEntityId;
+	//主管部门
+	String chargeDepartment;
+	//实施单位
+	String piu;
+
+	Long piuId;
+
+	String domicile;
+
+	String province;
+
+	String city;
+
+	String area;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/SpecialPurposeBondsDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * @ClassName SpecialPurposeBonds
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class SpecialPurposeBondsDto {
+
+    /**
+     * 项目类型
+     */
+    private String projectType;
+    /**
+     * 项目个数
+     */
+    private Integer count;
+    /**
+     * 投资金额
+     */
+    private Double totalInvestment;
+    /**
+     * 比例（%）
+     */
+    private Double proportion;
+    /**
+     * 排序字段
+     */
+    private String field;
+    /**
+     * 排序 (降序desc 升序asc)
+     */
+    private String order;
+}

dsk-common/src/main/java/com/dsk/common/dtos/UrbanInvestmentPlatformDto.java

+package com.dsk.common.dtos;
+
+import com.dsk.common.core.domain.model.BasePage;
+import lombok.Data;
+
+
+/**
+ * @ClassName UrbanInvestmentPlatformDto
+ * @Description 城投平台参数对象
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class UrbanInvestmentPlatformDto extends BasePage {
+
+    /**
+     * 行政级别
+     */
+    private String uipExecutiveLevel;
+    /**
+     * 城投业务类型
+     */
+    private String uipBusinessType;
+    /**
+     * 主体评级
+     */
+    private String bratingSubjectLevel;
+    /**
+     * 股东背景
+     */
+    private String shareholderBg;
+    /**
+     * 股权关系
+     */
+    private String equityRelationship;
+    /**
+     * 平台重要性
+     */
+    private String platformImportance;
+
+    /**
+     * 所属开发区
+     */
+    private String developmentZone;
+
+    /**
+     * 省
+     */
+    private Integer provinceId;
+    /**
+     * 市
+     */
+    private Integer cityId;
+    /**
+     * 区
+     */
+    private Integer areaId;
+}

dsk-common/src/main/java/com/dsk/common/utils/DskOpenApiUtil.java

@@ -59,7 +59,7 @@ public class DskOpenApiUtil {
 	public Map<String,Object> request(String path, Map<String, Object> bodyMap, String reqBodyType){
 		try {
 			AccClient.init(new Config(dskOpenApiConfig.accessKeyId, dskOpenApiConfig.accessKeySecret)
-					.setEndpoint(dskOpenApiConfig.endPoint).setProtocol(dskOpenApiConfig.protocol));
+					.setEndpoint(dskOpenApiConfig.endPoint));
 			Map<String, ?> res = AccClient.request(reqBodyType, path, bodyMap);
 			if(!res.containsKey("headers") || !res.containsKey("body")) {
 				throw new RuntimeException(String.format("请求无返回:path=%s",path));

dsk-operate-ui/.env.development

@@ -5,7 +5,25 @@ VUE_APP_TITLE = 央企经营系统
 ENV = 'development'
 
 # 央企经营系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+#VUE_APP_BASE_API = '/dev-api'
+
+VUE_APP_BASE_API = http://122.9.160.122:9011
+#VUE_APP_BASE_API = http://localhost:9011
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

dsk-system/src/main/java/com/dsk/system/domain/OpRegionalEconomicDataV1.java

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 区域经济数据表
+ * </p>
+ *
+ * @author xzr
+ * @since 2023-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OpRegionalEconomicDataV1 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 年份
+     */
+    private Integer year;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区
+     */
+    private String area;
+
+    /**
+     * GDP(亿元)
+     */
+    private Double gdp;
+
+    /**
+     * GDP增长值
+     */
+    private Double gdpAddValue;
+
+    /**
+     * GDP增速(%)
+     */
+    private Double gdpGrowth;
+
+    /**
+     * 人均GDP(元)
+     */
+    private Double gdpPerCapita;
+
+    /**
+     * 第一产业增加值(亿元)
+     */
+    private Double piAddValue;
+
+    /**
+     * 第二产业增加值(亿元)
+     */
+    private Double siAddValue;
+
+    /**
+     * 第三产业增加值(亿元)
+     */
+    private Double tiAddValue;
+
+    /**
+     * 人口(万人)
+     */
+    private Double population;
+
+    /**
+     * 人口增长率（%）
+     */
+    private Double populationGrowthRate;
+
+    /**
+     * 人口增加值
+     */
+    private String populationAddValue;
+
+    /**
+     * 工业增加值(亿元)
+     */
+    private Double industryAddValue;
+
+    /**
+     * 工业总产值(亿元)
+     */
+    private Double industryTotalValue;
+
+    /**
+     * 固定资产投资(亿元)
+     */
+    private Double fixedInvestment;
+
+    /**
+     * 房地产开发投资(亿元)
+     */
+    private Double realEstateInvestment;
+
+    /**
+     * 进出口总额(亿美元)
+     */
+    private Double eximTotalValue;
+
+    /**
+     * 社会消费品零售总额(亿元)
+     */
+    private Double trscg;
+
+    /**
+     * 城镇居民人均可支配收入(元)
+     */
+    private Double urbanPcdi;
+
+    /**
+     * 一般公共预算收入(亿元)
+     */
+    private Double gbr;
+
+    /**
+     * 一般公共预算收入增速(%)
+     */
+    private Double gbrGrowth;
+
+    /**
+     * 税收收入(亿元)
+     */
+    private Double taxIncome;
+
+    /**
+     * 转移性收入(亿元)
+     */
+    private Double transferIncome;
+
+    /**
+     * 上级补助收入(亿元)
+     */
+    private Double superiorSubsidyIncome;
+
+    /**
+     * 一般公共预算支出(亿元)
+     */
+    private Double gbe;
+
+    /**
+     * 政府性基金收入(亿元)
+     */
+    private Double govFundIncome;
+
+    /**
+     * 土地出让收入(亿元)
+     */
+    private Double landTransferIncome;
+
+    /**
+     * 政府性基金支出(亿元)
+     */
+    private Double govFundExpenditure;
+
+    /**
+     * 国有资本经营收入(亿元)
+     */
+    private Double soecoi;
+
+    /**
+     * 国有资本经营支出(亿元)
+     */
+    private Double soecoe;
+
+    /**
+     * 地方政府债务余额(亿元)
+     */
+    private Double govDebtBalance;
+
+    /**
+     * 一般债余额(亿元)
+     */
+    private Double generalDebtBalance;
+
+    /**
+     * 专项债余额(亿元)
+     */
+    private Double specialDebtBalance;
+
+    /**
+     * 地方政府债务限额(亿元)
+     */
+    private Double govDebtLimit;
+
+    /**
+     * 城投平台有息债务(亿元)
+     */
+    private Double uipInterestBearingDebt;
+
+    /**
+     * 财政自给率(%)
+     */
+    private Double fiscalSelfSufficiencyRate;
+
+    /**
+     * 负债率(%)政府负债率(%)
+     */
+    private Double govDebtToGdpRate;
+
+    /**
+     * 负债率(宽口径)(%)政府负债率(宽口径)(%)
+     */
+    private Double govDebtToGdpRateWild;
+
+    /**
+     * 债务率(%)政府债务率(%)
+     */
+    private Double govDebtRate;
+
+    /**
+     * 债务率(宽口径)(%)政府债务率(宽口径)(%)
+     */
+    private Double govDebtRateWild;
+
+    /**
+     * 状态码
+     */
+    private Integer isDeal;
+
+    /**
+     * 状态码2
+     */
+    private Integer isStatua;
+
+    /**
+     * 全字段生成md5
+     */
+    private String md5;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+
+}

dsk-system/src/main/java/com/dsk/system/domain/OpUipFinancialData.java

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 城投平台财务数据表
+ * </p>
+ *
+ * @author xzr
+ * @since 2023-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OpUipFinancialData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * 企业id
+     */
+    private Long companyId;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 省id
+     */
+    private Integer provinceId;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 市id
+     */
+    private Integer cityId;
+
+    /**
+     * 区
+     */
+    private String area;
+
+    /**
+     * 区id
+     */
+    private Integer areaId;
+
+    /**
+     * 最新报告期
+     */
+    private Date latestReportPeriod;
+
+    /**
+     * 最新评级
+     */
+    private String bratingSubjectLevel;
+
+    /**
+     * 股东背景
+     */
+    private String shareholderBg;
+
+    /**
+     * 实际控制人
+     */
+    private String actualController;
+
+    /**
+     * 股权关系
+     */
+    private String equityRelationship;
+
+    /**
+     * 行政级别
+     */
+    private String uipExecutiveLevel;
+
+    /**
+     * 平台重要性
+     */
+    private String platformImportance;
+
+    /**
+     * 债券余额（亿元）
+     */
+    private Double bondBalance;
+
+    /**
+     * 所属开发区
+     */
+    private String developmentZone;
+
+    /**
+     * 城投业务类型
+     */
+    private String uipBusinessType;
+
+    /**
+     * 总资产（亿元）
+     */
+    private Double totalAssets;
+
+    /**
+     * 归母净资产（亿元）
+     */
+    private Double belongNetAssets;
+
+    /**
+     * 货币资金（亿元）
+     */
+    private Double monetaryFunds;
+
+    /**
+     * 土地资产（亿元）
+     */
+    private Double landAssets;
+
+    /**
+     * 受限资产（亿元）
+     */
+    private Double restrictedAssets;
+
+    /**
+     * 应收账款（亿元）
+     */
+    private Double accountsReceivable;
+
+    /**
+     * 其他应收款（亿元）
+     */
+    private Double otherReceivable;
+
+    /**
+     * 公益性&准公益性主营占比（%）
+     */
+    private Double econData001;
+
+    /**
+     * 应收账款来自政府占比（%）
+     */
+    private Double receivableFromGovRatio;
+
+    /**
+     * 政府补助（亿元）
+     */
+    private Double govSubsidy;
+
+    /**
+     * 专项应付款（亿元）
+     */
+    private Double specialPayable;
+
+    /**
+     * 营业收入（亿元）
+     */
+    private Double operatingIncome;
+
+    /**
+     * 归母净利润（亿元）
+     */
+    private Double belongNetProfit;
+
+    /**
+     * 净资产收益率（%）
+     */
+    private Double roe;
+
+    /**
+     * 经营现金流量净额(亿元）
+     */
+    private Double netOperatingCashFlow;
+
+    /**
+     * 筹资现金流量净额（亿元）
+     */
+    private Double netFinancingCashFlow;
+
+    /**
+     * 投资现金流量净额（亿元）
+     */
+    private Double netInvestmentCashFlow;
+
+    /**
+     * 总负债（亿元）
+     */
+    private Double totalLiabilities;
+
+    /**
+     * 城投平台有息债务（亿元）
+     */
+    private Double uipInterestBearingDebt;
+
+    /**
+     * 有息债务/总负债（%)
+     */
+    private Double econData002;
+
+    /**
+     * 资产负债率（%）
+     */
+    private Double tdr;
+
+    /**
+     * 综合融资成本（%）
+     */
+    private Double ofcb;
+
+    /**
+     * 现金比率
+     */
+    private Double cashRatio;
+
+    /**
+     * 现金流量比率
+     */
+    private Double cashFlowRatio;
+
+    /**
+     * 现金到期债务比
+     */
+    private Double cashDebtRatio;
+
+    /**
+     * 授信余额（亿元）
+     */
+    private Double creditBalance;
+
+    /**
+     * 授信余额/全部债务（%）
+     */
+    private Double econData003;
+
+    /**
+     * EBITDA利息保障倍数
+     */
+    private String ebitdaIcr;
+
+    /**
+     * 私募债余额占比（%）
+     */
+    private Double ppnBalanceProp;
+
+    /**
+     * 一年内到期债券占比（%）
+     */
+    private Double econData004;
+
+    /**
+     * 债券余额/有息债务（%）
+     */
+    private Double econData005;
+
+    /**
+     * 借款（亿元）
+     */
+    private Double loan;
+
+    /**
+     * 借款/有息债务（%）
+     */
+    private Double econData006;
+
+    /**
+     * 非标余额（亿元）
+     */
+    private Double nonStandardBalance;
+
+    /**
+     * 非标余额/有息债务（%）
+     */
+    private Double nonStandardRatio;
+
+    /**
+     * 对外担保金额（亿元)
+     */
+    private Double guaranteeAmount;
+
+    /**
+     * 对外担保比例（%）
+     */
+    private Double guaranteeRatio;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 状态码1
+     */
+    private Integer isDeal;
+
+    /**
+     * 状态码2
+     */
+    private Integer isStatus;
+
+    /**
+     * 备用状态码1
+     */
+    private Integer state1;
+
+    /**
+     * 备用状态2
+     */
+    private Integer state2;
+
+
+}

dsk-system/src/main/java/com/dsk/system/domain/SpecialBondInformationV1.java

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 专项债债券信息表
+ * </p>
+ *
+ * @author xzr
+ * @since 2023-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SpecialBondInformationV1 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目表uuid
+     */
+    @TableId(value = "project_uuid", type = IdType.ID_WORKER_STR)
+    private String projectUuid;
+
+    /**
+     * 专项债项目唯一标识
+     */
+    private String specialBondUuid;
+
+    /**
+     * 债券名称
+     */
+    private String bondName;
+
+    /**
+     * 债券简称
+     */
+    private String bondAbbreviation;
+
+    /**
+     * 招标日期
+     */
+    private Date tenderDate;
+
+    /**
+     * 债券发行规模
+     */
+    private String actualBondIssueScale;
+
+    /**
+     * 专项债用于项目规模(亿)
+     */
+    private String isUsedProjectScale;
+
+    /**
+     * 是否用资本金
+     */
+    private String isUsedCapital;
+
+    /**
+     * 债券评级
+     */
+    private String bondLevel;
+
+    /**
+     * 信用评级机构
+     */
+    private String creditRatingAgency;
+
+    /**
+     * 债券期限
+     */
+    private String actualBondDuration;
+
+    /**
+     * 发行利率
+     */
+    private String bondIssueRate;
+
+    /**
+     * 发债主体
+     */
+    private String ratingSubject;
+
+    /**
+     * 评级报告url（七牛云）
+     */
+    private String ratingReportUrl;
+
+
+}

dsk-system/src/main/java/com/dsk/system/domain/SpecialBondProjectsV1.java

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 专项债项目表
+ * </p>
+ *
+ * @author xzr
+ * @since 2023-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SpecialBondProjectsV1 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 专项债券唯一标识
+     */
+    private String specialBondUuid;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 省id
+     */
+    private Integer provinceId;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 市id
+     */
+    private Integer cityId;
+
+    /**
+     * 区
+     */
+    private String area;
+
+    /**
+     * 区id
+     */
+    private Integer areaId;
+
+    /**
+     * 专项债项目类型
+     */
+    private String specialBondProjectType;
+
+    /**
+     * 建设规模
+     */
+    private String projectScale;
+
+    /**
+     * 偿债资金来源
+     */
+    private String sourceOfRepayment;
+
+    /**
+     * 项目主体
+     */
+    private String projectEntity;
+
+    /**
+     * 项目主体id
+     */
+    private Long projectEntityId;
+
+    /**
+     * 主管部门
+     */
+    private String chargeDepartment;
+
+    /**
+     * 实施单位
+     */
+    private String piu;
+
+    /**
+     * 实施单位id
+     */
+    private Long piuId;
+
+    /**
+     * 项目总投资
+     */
+    private String projectTotalInvestment;
+
+    /**
+     * 项目资本金
+     */
+    private String projectCapital;
+
+    /**
+     * 专项债融资
+     */
+    private String specialBondFinancing;
+
+    /**
+     * 专项债用作资本金
+     */
+    private String specialCapital;
+
+    /**
+     * 其他资金
+     */
+    private String otherFunds;
+
+    /**
+     * 专项债融资额
+     */
+    private String specialBondFinancingAmount;
+
+    /**
+     * 专项债只数
+     */
+    private String specialBondIssueNumber;
+
+    /**
+     * 其他融资
+     */
+    private String otherFinancing;
+
+    /**
+     * 政府安排资金
+     */
+    private String govSupportFunds;
+
+    /**
+     * 项目总收益/项目总债务融资本息(覆盖倍数)
+     */
+    private String econData007;
+
+    /**
+     * 项目总收益/项目总地方债券融资本息
+     */
+    private String econData008;
+
+    /**
+     * 项目总收益/项目总投资
+     */
+    private String econData009;
+
+    /**
+     * 项目总收益/项目总地方债券融资本金
+     */
+    private String econData010;
+
+    /**
+     * 项目总收益/项目总债务融资本金
+     */
+    private String econData011;
+
+    /**
+     * 项目预测总收益（亿）
+     */
+    private String projectForecastTotalRevenue;
+
+
+}

dsk-system/src/main/java/com/dsk/system/domain/customer/Customer.java

@@ -42,10 +42,6 @@ public class Customer implements Serializable {
      * 注册资本
      */
     private String registerCapital;
-    /**
-     * 注册地址
-     */
-    private String registerAddress;
     /**
      * 社会统一信用代码
      */
@@ -59,13 +55,9 @@ public class Customer implements Serializable {
      */
     private String companyLevel;
     /**
-     * 企业主体评级（credit_level_type）
+     * 信用等级（credit_level_type）
      */
     private String creditLevel;
-    /**
-     * 客户等级（customer_level_type）
-     */
-    private String customerLevel;
     /**
      * 上级公司（控股单位）
      */

dsk-system/src/main/java/com/dsk/system/domain/customer/vo/CustomerListVo.java

@@ -35,13 +35,9 @@ public class CustomerListVo {
      */
     private String legalPerson;
     /**
-     * 注册资本
+     * 注册资本(字符串)
      */
     private String registerCapital;
-    /**
-     * 注册地址
-     */
-    private String registerAddress;
     /**
      * 社会统一信用代码
      */
@@ -58,10 +54,6 @@ public class CustomerListVo {
      * 信用等级
      */
     private String creditLevel;
-    /**
-     * 客户等级
-     */
-    private String customerLevel;
     /**
      * 上级公司
      */

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

@@ -98,10 +98,5 @@ public class BusinessBrowseVo {
      */
     private Integer relateCompanyCount;
 
-    /**
-     * 相关企业统计
-     */
-    private Integer fileCount;
-
 
 }

dsk-system/src/main/java/com/dsk/system/mapper/BusinessBacklogMapper.java

@@ -44,12 +44,12 @@ public interface BusinessBacklogMapper
     public int updateBusinessBacklog(BusinessBacklog businessBacklog);
 
     /**
-     * 根据项目id删除项目工作待办
+     * 删除项目工作待办
      * 
-     * @param businessId 项目id主键
+     * @param id 项目工作待办主键
      * @return 结果
      */
-    public int deleteBacklogByBusinessId(Long businessId);
+    public int deleteBusinessBacklogById(Long id);
 
     /**
      * 批量删除项目工作待办

dsk-system/src/main/java/com/dsk/system/mapper/BusinessContactsMapper.java

@@ -47,10 +47,10 @@ public interface BusinessContactsMapper
     /**
      * 删除项目联系人
      * 
-     * @param businessId 项目联系人主键
+     * @param id 项目联系人主键
      * @return 结果
      */
-    public int deleteBusinessContactsByBusinessId(Long businessId);
+    public int deleteBusinessContactsById(Long id);
 
     /**
      * 批量删除项目联系人

dsk-system/src/main/java/com/dsk/system/mapper/BusinessFollowRecordMapper.java

@@ -53,12 +53,12 @@ public interface BusinessFollowRecordMapper
     public int updateBusinessFollowRecord(BusinessFollowRecord businessFollowRecord);
 
     /**
-     * 根据项目id删除项目跟进记录
+     * 删除项目跟进记录
      * 
-     * @param businessId 项目主键id
+     * @param id 项目跟进记录主键
      * @return 结果
      */
-    public int deleteBusinessFollowRecordByBusinessId(Long businessId);
+    public int deleteBusinessFollowRecordById(Long id);
 
     /**
      * 批量删除项目跟进记录

dsk-system/src/main/java/com/dsk/system/mapper/BusinessInfoMapper.java

@@ -84,7 +84,7 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo>
     public int deleteBusinessInfoByIds(Long[] ids);
 
     /**
-     * 统计项目相关的信息数量
+     * 根据项目统计
      * @param business
      * @return
      */

dsk-system/src/main/java/com/dsk/system/mapper/BusinessLabelMapper.java

@@ -53,14 +53,6 @@ public interface BusinessLabelMapper
      */
     public int deleteBusinessLabelById(BusinessIdDto dto);
 
-    /**
-     * 根据项目id删除项目标签
-     *
-     * @param businessId 项目主键
-     * @return 结果
-     */
-    public int deleteBusinessLabelByBusinessId(Long businessId);
-
     /**
      * 批量删除项目标签
      * 

dsk-system/src/main/java/com/dsk/system/mapper/BusinessRelateCompanyMapper.java

@@ -2,6 +2,7 @@ package com.dsk.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
+import com.dsk.system.domain.customer.CustomerDecisionChain;
 
 import java.util.List;
 
@@ -51,7 +52,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo
      * @param id 项目关联单位主键
      * @return 结果
      */
-    public int deleteRelateCompanyByBusinessId(Long id);
+    public int deleteBusinessRelateCompanyById(Long id);
 
     /**
      * 批量删除项目关联单位

dsk-system/src/main/java/com/dsk/system/mapper/BusinessUserMapper.java

@@ -19,14 +19,6 @@ public interface BusinessUserMapper
      */
     public BusinessUser selectBusinessUserById(Long id);
 
-    /**
-     * 根据项目id查询项目的创建者
-     *
-     * @param businessId 项目id主键
-     * @return 项目创建者名称
-     */
-    String selectCreatorBybusinessId(Integer businessId);
-
     /**
      * 查询项目用户关联列表
      * 
@@ -52,12 +44,12 @@ public interface BusinessUserMapper
     public int updateBusinessUser(BusinessUser businessUser);
 
     /**
-     * 根据项目id删除项目用户关联
+     * 删除项目用户关联
      * 
-     * @param businessId 项目用户关联主键
+     * @param id 项目用户关联主键
      * @return 结果
      */
-    public int deleteBusinessUserByBusinessId(Long businessId);
+    public int deleteBusinessUserById(Long id);
 
     /**
      * 批量删除项目用户关联

dsk-system/src/main/java/com/dsk/system/mapper/OpRegionalEconomicDataV1Mapper.java

+package com.dsk.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.system.domain.OpRegionalEconomicDataV1;
+
+/**
+ * <p>
+ * 区域经济数据表 Mapper 接口
+ * </p>
+ *
+ * @author xzr
+ * @since 2023-05-19
+ */
+public interface OpRegionalEconomicDataV1Mapper extends BaseMapper<OpRegionalEconomicDataV1> {
+
+}

dsk-system/src/main/java/com/dsk/system/mapper/OpUipFinancialDataMapper.java

+package com.dsk.system.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.system.domain.OpUipFinancialData;
+
+/**
+ * <p>
+ * 城投平台财务数据表 Mapper 接口
+ * </p>
+ *
+ * @author xzr
+ * @since 2023-05-19
+ */
+public interface OpUipFinancialDataMapper extends BaseMapper<OpUipFinancialData> {
+
+}

dsk-system/src/main/java/com/dsk/system/mapper/SpecialBondInformationV1Mapper.java

+package com.dsk.system.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.system.domain.SpecialBondInformationV1;
+
+/**
+ * <p>
+ * 专项债债券信息表 Mapper 接口
+ * </p>
+ *
+ * @author xzr
+ * @since 2023-05-19
+ */
+public interface SpecialBondInformationV1Mapper extends BaseMapper<SpecialBondInformationV1> {
+
+}

dsk-system/src/main/java/com/dsk/system/mapper/SpecialBondProjectsV1Mapper.java

+package com.dsk.system.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.system.domain.SpecialBondProjectsV1;
+
+/**
+ * <p>
+ * 专项债项目表 Mapper 接口
+ * </p>
+ *
+ * @author xzr
+ * @since 2023-05-19
+ */
+public interface SpecialBondProjectsV1Mapper extends BaseMapper<SpecialBondProjectsV1> {
+
+}

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

 package com.dsk.system.service;
 
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
 
 /**
  * @ClassName EconomicService
@@ -18,5 +19,43 @@ public interface EconomicService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult nationalPage();
+    AjaxResult nationalList(OpRegionalEconomicDataV1Dto dto);
+
+    /***
+     *@Description: 全国经济大全详情
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult details(Integer id);
+
+
+    /***
+     *@Description: 地区经济统计
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult statisticsRegional(OpRegionalEconomicDataV1Dto dto);
+
+    /***
+     *@Description: 地区经济-分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult regionalList(OpRegionalEconomicDataV1Dto dto);
+
+    /***
+     *@Description: 地区经济-分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult regionalComparison(OpRegionalEconomicDataV1Dto dto);
+
 }

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

+package com.dsk.system.service;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+
+/**
+ * @ClassName EconomicService
+ * @Description 区域企业业务层
+ * @Author Dgm
+ * @Date 2023/5/18 10:17
+ * @Version 1.00
+ */
+public interface RegionalEnterprisesService {
+
+    /***
+     *@Description: 区域企业分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult page(ComposeQueryDto compose);
+}

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

+package com.dsk.system.service;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.SpecialPurposeBondsDto;
+
+/**
+ * @ClassName EconomicService
+ * @Description 专项债项目业务层
+ * @Author Dgm
+ * @Date 2023/5/18 10:17
+ * @Version 1.00
+ */
+public interface SpecialPurposeBondsService {
+
+    /***
+     *@Description: 专项债项目分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult page(SpecialPurposeBondsDto dto);
+
+    /***
+     *@Description: 专项债项目详情
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult details(String id);
+
+    /***
+     *@Description: 项目类别统计
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult bondStatistics(SpecialPurposeBondsDto dto);
+
+}

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

+package com.dsk.system.service;
+
+import com.dsk.common.core.domain.AjaxResult;
+
+/**
+ * @ClassName EconomicService
+ * @Description 城投平台业务层
+ * @Author Dgm
+ * @Date 2023/5/18 10:17
+ * @Version 1.00
+ */
+public interface UrbanInvestmentPlatformService {
+
+    /***
+     *@Description: 城投平台分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult page();
+
+    /***
+     *@Description: 城投平台详情
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult details(String id);
+}

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

@@ -97,6 +97,6 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService
     @Override
     public int deleteBusinessBacklogById(Long id)
     {
-        return businessBacklogMapper.deleteBacklogByBusinessId(id);
+        return businessBacklogMapper.deleteBusinessBacklogById(id);
     }
 }

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

@@ -98,6 +98,6 @@ public class BusinessContactsServiceImpl implements IBusinessContactsService
     @Override
     public int deleteBusinessContactsById(Long id)
     {
-        return businessContactsMapper.deleteBusinessContactsByBusinessId(id);
+        return businessContactsMapper.deleteBusinessContactsById(id);
     }
 }

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

@@ -92,6 +92,6 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
     @Override
     public int deleteBusinessFollowRecordById(Long id)
     {
-        return businessFollowRecordMapper.deleteBusinessFollowRecordByBusinessId(id);
+        return businessFollowRecordMapper.deleteBusinessFollowRecordById(id);
     }
 }

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

 package com.dsk.system.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessInfo;
 import com.dsk.common.core.domain.entity.BusinessLabel;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
 import com.dsk.common.core.domain.entity.BusinessUser;
+import com.dsk.common.dtos.BusinessInfoDto;
 import com.dsk.common.utils.DateUtils;
+import com.dsk.common.utils.SecurityUtils;
 import com.dsk.system.domain.BusinessAddDto;
 import com.dsk.system.domain.BusinessListDto;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.vo.CustomerBusinessListVo;
 import com.dsk.system.domain.vo.BusinessBrowseVo;
 import com.dsk.system.domain.vo.BusinessListVo;
-import com.dsk.system.mapper.*;
+import com.dsk.system.mapper.BusinessInfoMapper;
+import com.dsk.system.mapper.BusinessLabelMapper;
+import com.dsk.system.mapper.BusinessRelateCompanyMapper;
+import com.dsk.system.mapper.BusinessUserMapper;
 import com.dsk.system.service.IBusinessInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,12 +46,6 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     private BusinessRelateCompanyMapper businessRelateCompanyMapper;
     @Resource
     private BusinessLabelMapper businessLabelMapper;
-    @Resource
-    private BusinessBacklogMapper businessBacklogMapper;
-    @Resource
-    private  BusinessContactsMapper businessContactsMapper;
-    @Resource
-    private BusinessFollowRecordMapper businessFollowRecordMapper;
 
     /**
      * 查询项目详情
@@ -80,15 +80,10 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         //查询项目基本信息
         BusinessInfo businessInfo = businessInfoMapper.selectBusinessInfoById(businessId);
         BeanUtil.copyProperties(businessInfo,businessBrowseVo);
-        //查询商务团队
-        String team = "";
-        team = businessUserMapper.selectCreatorBybusinessId(businessId);
-        businessBrowseVo.setTeam(team);
         //查询项目标签
         businessBrowseVo.setLabelList(businessLabelMapper.selectBusinessLabelList(new BusinessLabel(businessId)).stream().map(p -> p.getLabel()).collect(Collectors.toList()));
         //查询关键企业
         businessBrowseVo.setRelateCompany(businessRelateCompanyMapper.selectBusinessRelateCompanyList(new BusinessRelateCompany(businessId)));
-        //统计项目相关的信息数量
         BusinessBrowseVo total = businessInfoMapper.selectTotal(businessId);
         businessBrowseVo.setBacklogCount(total.getBacklogCount());
         businessBrowseVo.setContactsCount(total.getContactsCount());
@@ -122,7 +117,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
             //新增用户-项目关系信息
             int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), deptId.intValue(), dto.getUserId(), 1));
             //新增项目-关联企业信息
-            int addRelateCompany = businessRelateCompanyMapper.insertBusinessRelateCompany(new BusinessRelateCompany(businessInfo.getId(), dto.getCompanyId(), dto.getOwnerCompany(), "业主单位"));
+            int addRelateCompany = businessRelateCompanyMapper.insertBusinessRelateCompany(new BusinessRelateCompany(businessInfo.getId(), dto.getCompanyId(), dto.getOwnerCompany(), "业主"));
             return addbusinessUser > 0 && addRelateCompany > 0 ? AjaxResult.success() : AjaxResult.error();
         }
         return AjaxResult.error();
@@ -162,25 +157,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      * @return 结果
      */
     @Override
-    @Transactional
     public int deleteBusinessInfoById(Long id) {
-        int removeBusiness = businessInfoMapper.deleteBusinessInfoById(id);
-        if (removeBusiness > 0) {
-            //删除用户关联项目
-            businessUserMapper.deleteBusinessUserByBusinessId(id);
-            //删除项目关联单位
-            businessRelateCompanyMapper.deleteRelateCompanyByBusinessId(id);
-            //删除项目关联工作待办
-            businessBacklogMapper.deleteBacklogByBusinessId(id);
-            //删除项目关联联系人
-            businessContactsMapper.deleteBusinessContactsByBusinessId(id);
-            //删除项目跟进记录
-            businessFollowRecordMapper.deleteBusinessFollowRecordByBusinessId(id);
-            //删除项目标签
-            businessLabelMapper.deleteBusinessLabelByBusinessId(id);
-            return 1;
-        }
-        return 0;
+        return businessInfoMapper.deleteBusinessInfoById(id);
     }
 
     /**

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
 import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.utils.CheckUtils;
@@ -103,7 +104,7 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS
     @Override
     public int deleteBusinessRelateCompanyById(Long id)
     {
-        return businessRelateCompanyMapper.deleteRelateCompanyByBusinessId(id);
+        return businessRelateCompanyMapper.deleteBusinessRelateCompanyById(id);
     }
 
     @Override

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

@@ -92,6 +92,6 @@ public class BusinessUserServiceImpl implements IBusinessUserService
     @Override
     public int deleteBusinessUserById(Long id)
     {
-        return businessUserMapper.deleteBusinessUserByBusinessId(id);
+        return businessUserMapper.deleteBusinessUserById(id);
     }
 }

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanException;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.SecurityUtils;
@@ -28,9 +27,7 @@ import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 客户信息表(Customer)表服务实现类
@@ -117,4 +114,5 @@ public class CustomerServiceImpl implements ICustomerService {
         dto.setUserId(SecurityUtils.getUserId());
         return businessInfoService.selectCustomerBusinessList(dto);
     }
+
 }

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

@@ -2,11 +2,14 @@ package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
 import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.mapper.OpRegionalEconomicDataV1Mapper;
 import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -22,9 +25,87 @@ public class EconomicServiceImpl implements EconomicService {
     @Autowired
     private DskOpenApiUtil dskOpenApiUtil;
 
+    @Autowired
+    private OpRegionalEconomicDataV1Mapper mapper;
+
+    @Override
+    public AjaxResult nationalList(OpRegionalEconomicDataV1Dto dto) {
+        // SELECT
+        //	id,
+        //	`year`,
+        //	province,
+        //	city,
+        //	area,
+        //	gdp,
+        //	gdp_add_value,
+        //	gdp_growth,
+        //	gdp_per_capita,
+        //	pi_add_value,
+        //	si_add_value,
+        //	ti_add_value,
+        //	population,
+        //	population_growth_rate,
+        //	population_add_value,
+        //	industry_add_value,
+        //	industry_total_value,
+        //	fixed_investment,
+        //	real_estate_investment,
+        //	exim_total_value,
+        //	trscg,
+        //	urban_pcdi,
+        //	gbr,
+        //	gbr_growth,
+        //	tax_income,
+        //	transfer_income,
+        //	superior_subsidy_income,
+        //	gbe,
+        //	gov_fund_income,
+        //	land_transfer_income,
+        //	gov_fund_expenditure,
+        //	soecoi,
+        //	soecoe,
+        //	gov_debt_balance,
+        //	general_debt_balance,
+        //	special_debt_balance,
+        //	gov_debt_limit,
+        //	uip_interest_bearing_debt,
+        //	fiscal_self_sufficiency_rate,
+        //	gov_debt_to_gdp_rate,
+        //	gov_debt_to_gdp_rate_wild,
+        //	gov_debt_rate,
+        //	gov_debt_rate_wild,
+        //	is_deal,
+        //	is_statua
+        //FROM
+        //	`op_regional_economic_data_v1`;
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx",  BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult details(Integer id) {
+        Map<String, Object> bodyMap = new HashMap<>(1);
+        bodyMap.put("id", id);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", bodyMap);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
     @Override
-    public AjaxResult nationalPage() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", null);
+    public AjaxResult statisticsRegional(OpRegionalEconomicDataV1Dto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    @Override
+    public AjaxResult regionalList(OpRegionalEconomicDataV1Dto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx",  BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult regionalComparison(OpRegionalEconomicDataV1Dto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx",  BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
 }

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

+package com.dsk.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.service.RegionalEnterprisesService;
+import com.dsk.system.service.SpecialPurposeBondsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @ClassName RegionalEnterprisesServiceImpl
+ * @Description 区域企业业务层实现
+ * @Author Dgm
+ * @Date 2023/5/18 10:23
+ * @Version
+ */
+@Service
+public class RegionalEnterprisesServiceImpl implements RegionalEnterprisesService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+    @Override
+    public AjaxResult page(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/search/enterprisePage", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

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 com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.SpecialPurposeBondsDto;
+import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.service.EconomicService;
+import com.dsk.system.service.SpecialPurposeBondsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName EconomicServiceImpl
+ * @Description 专项债项目业务层实现
+ * @Author Dgm
+ * @Date 2023/5/18 10:23
+ * @Version
+ */
+@Service
+public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+    @Override
+    public AjaxResult page(SpecialPurposeBondsDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult details(String id) {
+        Map<String, Object> bodyMap = new HashMap<>(1);
+        bodyMap.put("id", id);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", bodyMap);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult bondStatistics(SpecialPurposeBondsDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

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.common.core.domain.AjaxResult;
+import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.service.EconomicService;
+import com.dsk.system.service.UrbanInvestmentPlatformService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @ClassName EconomicServiceImpl
+ * @Description 城投平台业务层实现
+ * @Author Dgm
+ * @Date 2023/5/18 10:23
+ * @Version
+ */
+@Service
+public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatformService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+    @Override
+    public AjaxResult page() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult details(String id) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

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

@@ -82,10 +82,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteBacklogByBusinessId" parameterType="Long">
+    <delete id="deleteBusinessBacklogById" parameterType="Long">
         delete
         from business_backlog
-        where business_id = #{businessId}
+        where id = #{id}
     </delete>
 
     <delete id="deleteBusinessBacklogByIds" parameterType="String">

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

@@ -93,10 +93,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteBusinessContactsByBusinessId" parameterType="Long">
+    <delete id="deleteBusinessContactsById" parameterType="Long">
         delete
         from business_contacts
-        where business_id = #{businessId}
+        where id = #{id}
     </delete>
 
     <delete id="deleteBusinessContactsByIds" parameterType="String">

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

@@ -107,10 +107,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteBusinessFollowRecordByBusinessId" parameterType="Long">
+    <delete id="deleteBusinessFollowRecordById" parameterType="Long">
         delete
         from business_follow_record
-        where business_id = #{businessId}
+        where id = #{id}
     </delete>
 
     <delete id="deleteBusinessFollowRecordByIds" parameterType="String">

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

@@ -24,6 +24,7 @@
         <result property="districtId" column="district_id"/>
         <result property="projectType" column="project_type"/>
         <result property="projectCategory" column="project_category"/>
+        <result property="team" column="team"/>
         <result property="isPrivate" column="is_private"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -51,6 +52,7 @@
                district_id,
                project_type,
                project_category,
+               team,
                is_private,
                create_time,
                update_time,
@@ -171,6 +173,7 @@
             <if test="districtId != null">district_id,</if>
             <if test="projectType != null">project_type,</if>
             <if test="projectCategory != null">project_category,</if>
+            <if test="team != null">team,</if>
             <if test="isPrivate != null">is_private,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
@@ -196,6 +199,7 @@
             <if test="districtId != null">#{districtId},</if>
             <if test="projectType != null">#{projectType},</if>
             <if test="projectCategory != null">#{projectCategory},</if>
+            <if test="team != null">#{team},</if>
             <if test="isPrivate != null">#{isPrivate},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -225,6 +229,7 @@
             <if test="districtId != null">district_id = #{districtId},</if>
             <if test="projectType != null">project_type = #{projectType},</if>
             <if test="projectCategory != null">project_category = #{projectCategory},</if>
+            <if test="team != null">team = #{team},</if>
             <if test="isPrivate != null">is_private = #{isPrivate},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>

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

@@ -71,9 +71,4 @@
             #{id}
         </foreach>
     </delete>
-    <delete id="deleteBusinessLabelByBusinessId">
-        delete
-        from business_label
-        where business_id = #{businessId}
-    </delete>
 </mapper>
\ No newline at end of file

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

@@ -97,10 +97,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteRelateCompanyByBusinessId" parameterType="Long">
+    <delete id="deleteBusinessRelateCompanyById" parameterType="Long">
         delete
         from business_relate_company
-        where business_id = #{businessId}
+        where id = #{id}
     </delete>
 
     <delete id="deleteBusinessRelateCompanyByIds" parameterType="String">

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

@@ -33,12 +33,6 @@
         <include refid="selectBusinessUserVo"/>
         where id = #{id}
     </select>
-    <select id="selectCreatorBybusinessId" resultType="java.lang.String">
-        select u.nick_name
-        from business_user b
-        left join sys_user u on u.user_id = b.user_id
-        where b.is_founder = 1 and business_id =#{businessId}
-    </select>
 
     <insert id="insertBusinessUser" parameterType="com.dsk.common.core.domain.entity.BusinessUser" useGeneratedKeys="true" keyProperty="id">
         insert into business_user
@@ -73,10 +67,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteBusinessUserByBusinessId" parameterType="Long">
+    <delete id="deleteBusinessUserById" parameterType="Long">
         delete
         from business_user
-        where business_id = #{businessId} and is_founder = 1
+        where id = #{id}
     </delete>
 
     <delete id="deleteBusinessUserByIds" parameterType="String">

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.dsk.system.mapper.CustomerMapper">
 
     <sql id="Base_Bean">
-        ct.customer_id, ct.company_id, ct.company_name, ct.legal_person, ct.credit_code,ct.register_capital,
-        ct.register_address, ct.company_nature, ct.company_level, ct.credit_level, ct.super_company,
-        ct.is_on, ct.is_major, ct.company_attribute, ct.main_business, ct.business_scope, ct.customer_level,
+        ct.customer_id, ct.company_id, ct.company_name, ct.legal_person, ct.credit_code,
+        ct.register_capital, ct.company_nature, ct.company_level, ct.credit_level, ct.super_company,
+        ct.is_on, ct.is_major, ct.company_attribute, ct.main_business, ct.business_scope,
         ct.business_characteristic, ct.decision_chain, ct.bid_characteristic, ct.performance_characteristic,
         ct.other_ms_characteistic, ct.create_id, ct.create_time, ct.update_id, ct.update_time
     </sql>