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

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/EconomicController.java → dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEconomicDataController.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.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 
 /**
- * @ClassName EconomicController
- * @Description 经济大全
+ * @ClassName RegionalEconomicDataController
+ * @Description 区域经济大全
  * @Author Dgm
  * @Date 2023/5/18 10:09
  * @Version 1.0.0
  */
 @RestController
 @RequestMapping(value ="/economic")
-public class EconomicController {
+public class RegionalEconomicDataController {
 
     @Autowired
     private EconomicService economicService;
@@ -35,10 +28,9 @@ public class EconomicController {
      *@Author: Dgm
      *@date: 2023/5/18 10:29
      */
-    @PostMapping("/national/list")
-    public AjaxResult nationalList(@RequestBody OpRegionalEconomicDataV1Dto dto) {
-//        return economicService.nationalList(dto);
-        return new AjaxResult(HttpStatus.OK.value(), "", new OpRegionalEconomicDataV1());
+    @PostMapping("/national/nationalPage")
+    public AjaxResult nationalPage(@RequestBody OpRegionalEconomicDataV1Dto dto) {
+        return economicService.nationalPage(dto);
     }
 
     /***
@@ -50,8 +42,7 @@ public class EconomicController {
      */
     @GetMapping("/details/{id}")
     public AjaxResult details(@PathVariable("id") Integer id) {
-//        return economicService.details(id);
-        return new AjaxResult(HttpStatus.OK.value(), "", new OpRegionalEconomicDataV1());
+        return economicService.details(id);
     }
 
 
@@ -64,17 +55,7 @@ public class EconomicController {
      */
     @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);
+        return economicService.statisticsRegional(dto);
     }
 
     /***
@@ -86,32 +67,7 @@ public class EconomicController {
      */
     @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);
+        return economicService.regionalList(dto);
     }
 
 

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

+package com.dsk.web.controller.search.macroMarket;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.SpecialBondInformationPageDto;
+import com.dsk.common.dtos.SpecialPurposeBondsDto;
+import com.dsk.common.dtos.SpecialPurposeBondsPageDto;
+import com.dsk.system.service.SpecialPurposeBondsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @ClassName SpecialBondProjectsController
+ * @Description 专项债项目
+ * @Author Dgm
+ * @Date 2023/5/18 10:09
+ * @Version 1.0.0
+ */
+@RestController
+@RequestMapping(value ="/specialPurposeBonds")
+public class SpecialBondProjectsController {
+
+    @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(@RequestBody SpecialPurposeBondsPageDto pageDto) {
+        return specialPurposeBondsService.page(pageDto);
+    }
+
+
+    /***
+     *@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(dto);
+    }
+
+
+    /***
+     *@Description: 专项债分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/bond/page")
+    public AjaxResult bondPage(@RequestBody SpecialBondInformationPageDto dto) {
+        return specialPurposeBondsService.bondPage(dto);
+    }
+
+}

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 城投平台
@@ -35,15 +29,7 @@ public class UrbanInvestmentPlatformController {
      */
     @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);
+        return urbanInvestmentPlatformService.page(dto);
     }
 
     /***
@@ -57,4 +43,17 @@ public class UrbanInvestmentPlatformController {
     public AjaxResult details(@PathVariable("id") String id) {
         return urbanInvestmentPlatformService.details(id);
     }
+
+
+    /***
+     *@Description: 城投平台统计
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/statistics")
+    public AjaxResult statistics(@RequestBody UrbanInvestmentPlatformDto dto) {
+        return urbanInvestmentPlatformService.statistics(dto);
+    }
 }

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectApprovalExaminePageBody extends BasePage {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String id;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectApprovalInfoDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String id;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectApprovalMarketingPageBody extends BasePage {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String id;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectApprovalProjectPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+    /*
+     * 1金额倒序，2金额正序，3计划开工时间倒序，4计划开工时间正序，13计划完工时间倒序，14计划完工时间正序
+     */
+    @NotNull(message = "排序条件不能为空")
+    private Integer sort;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticeAreaBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticeDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String id;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticePageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+    /**
+     * 类型
+     */
+    private String tenderStage;
+
+    /*
+     * 1金额倒序，2金额正序，3时间倒序，4时间正序
+     */
+    @NotNull(message = "排序条件不能为空")
+    private Integer sort;
+
+    /**
+     * 省份
+     */
+    private List<Integer> provinceIds;
+
+    /**
+     * 市份
+     */
+    private List<Integer> cityIds;
+
+    /**
+     * 县
+     */
+    private List<Integer> areaIds;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticeProAssessmentWayBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticeProDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String id;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticeProPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+    /**
+     * 项目类别
+     */
+    private String projectType;
+
+    /**
+     * 工程用途
+     */
+    private String projectPurposes;
+
+    /**
+     * 评标办法
+     */
+    private String bidAssessmentWay;
+
+
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticeProProjectPurposesBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticeProProjectTypeBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticeTenderStageBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectCreditXzxkPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectLandDetailBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectLandTransactionPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 土地用途
+     */
+    private List<String> landUse;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+    /*
+     * 1金额倒序，2金额正序，3时间倒序，4时间正序，11面积倒序，12面积正序
+     */
+    @NotNull(message = "排序条件不能为空")
+    private Integer sort;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectLandUseBody  {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+
+}

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

 package com.dsk.common.dtos;
 
+import com.dsk.common.core.domain.model.BasePage;
 import lombok.Data;
-import org.springframework.boot.context.event.SpringApplicationEvent;
 
 /**
  * @ClassName OpRegionalEconomicDataV1Dto
@@ -11,7 +11,7 @@ import org.springframework.boot.context.event.SpringApplicationEvent;
  * @Version
  */
 @Data
-public class OpRegionalEconomicDataV1Dto {
+public class OpRegionalEconomicDataV1Dto extends BasePage {
 
     /**
      * 年份
@@ -20,15 +20,15 @@ public class OpRegionalEconomicDataV1Dto {
     /**
      * 省
      */
-    private Integer provinceId;
+    private String provinceId;
     /**
      * 市
      */
-    private Integer cityId;
+    private String cityId;
     /**
      * 区
      */
-    private Integer areaId;
+    private String areaId;
 
     /**
      * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3

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

+package com.dsk.common.dtos;
+
+import com.dsk.common.core.domain.model.BasePage;
+import lombok.Data;
+
+/**
+ * @ClassName SpecialBondInformationPageDto
+ * @Description 专项债-详情分页
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class SpecialBondInformationPageDto extends BasePage {
+}

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

@@ -15,7 +15,7 @@ public class SpecialPurposeBondsDto {
     /**
      * 项目类型
      */
-    private String projectType;
+    private String specialBondProjectType;
     /**
      * 项目个数
      */
@@ -23,7 +23,7 @@ public class SpecialPurposeBondsDto {
     /**
      * 投资金额
      */
-    private Double totalInvestment;
+    private Double projectTotalInvestment;
     /**
      * 比例（%）
      */

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

+package com.dsk.common.dtos;
+
+import com.dsk.common.core.domain.model.BasePage;
+import lombok.Data;
+
+/**
+ * @ClassName SpecialPurposeBonds
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class SpecialPurposeBondsPageDto extends BasePage {
+}

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

+package com.dsk.system.domain.customer.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客户跟进记录列表
+ *
+ * @author makejava
+ * @since 2023-05-18 15:07:59
+ */
+@Data
+public class CustomerFollowRecordListVo implements Serializable {
+    private static final long serialVersionUID = -17639570424991398L;
+
+
+    private Long id;
+    /**
+     * 客户id
+     */
+    private String customerId;
+    /**
+     * 客户名称
+     */
+    private String companyName;
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+    /**
+     * 拜访方式（visit_mode_type）
+     */
+    private String visitMode;
+    /**
+     * 下次拜访时间
+     */
+    private Date nextVisitTime;
+    /**
+     * 拜访对象姓名
+     */
+    private String name;
+    /**
+     * 拜访对象职务
+     */
+    private String position;
+    /**
+     * 拜访内容
+     */
+    private String content;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+}

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

@@ -57,17 +57,17 @@ public class EnterpriseService {
 
     //todo 新数据，待入库
     public TableDataInfo partners(EnterprisePartnersBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/partners", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/partners", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo investment(EnterpriseInvestmentBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo affiliates(EnterpriseAffiliatesBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/affiliates", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/affiliates", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
@@ -105,22 +105,22 @@ public class EnterpriseService {
     }
 
     public R icInfo(EnterpriseIcInfoBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/icInfo", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/icInfo", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
     public TableDataInfo changeInfo(EnterpriseChangeInfoBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/changeInfo", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/changeInfo", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo keymembers(EnterpriseKeymembersBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/keymembers", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/keymembers", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo bestStockPage(EnterpriseKeymembersBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 }

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

@@ -3,6 +3,7 @@ package com.dsk.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsk.system.domain.customer.CustomerFollowRecord;
 import com.dsk.system.domain.customer.dto.CustomerFollowRecordSearchDto;
+import com.dsk.system.domain.customer.vo.CustomerFollowRecordListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,7 +19,7 @@ import java.util.List;
 @Mapper
 public interface CustomerFollowRecordMapper extends BaseMapper<CustomerFollowRecord> {
 
-    List<CustomerFollowRecord> selectAuthList(@Param("dto") CustomerFollowRecordSearchDto dto);
+    List<CustomerFollowRecordListVo> selectAuthList(@Param("dto") CustomerFollowRecordSearchDto dto);
 
 }
 

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

@@ -19,7 +19,7 @@ public interface EconomicService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult nationalList(OpRegionalEconomicDataV1Dto dto);
+    AjaxResult nationalPage(OpRegionalEconomicDataV1Dto dto);
 
     /***
      *@Description: 全国经济大全详情

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

@@ -3,6 +3,7 @@ package com.dsk.system.service;
 
 import com.dsk.system.domain.customer.CustomerFollowRecord;
 import com.dsk.system.domain.customer.dto.CustomerFollowRecordSearchDto;
+import com.dsk.system.domain.customer.vo.CustomerFollowRecordListVo;
 
 import java.util.List;
 
@@ -14,7 +15,7 @@ import java.util.List;
  */
 public interface ICustomerFollowRecordService {
 
-    List<CustomerFollowRecord> selectList(CustomerFollowRecordSearchDto dto);
+    List<CustomerFollowRecordListVo> selectList(CustomerFollowRecordSearchDto dto);
 
     boolean add(CustomerFollowRecord followRecord);
 

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.SpecialBondInformationPageDto;
 import com.dsk.common.dtos.SpecialPurposeBondsDto;
+import com.dsk.common.dtos.SpecialPurposeBondsPageDto;
 
 /**
  * @ClassName EconomicService
@@ -19,7 +21,7 @@ public interface SpecialPurposeBondsService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult page(SpecialPurposeBondsDto dto);
+    AjaxResult page(SpecialPurposeBondsPageDto dto);
 
     /***
      *@Description: 专项债项目详情
@@ -39,4 +41,13 @@ public interface SpecialPurposeBondsService {
      */
     AjaxResult bondStatistics(SpecialPurposeBondsDto dto);
 
+    /***
+     *@Description: 专项债分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+     AjaxResult bondPage(SpecialBondInformationPageDto pageDto);
+
 }

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

 package com.dsk.system.service;
 
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.UrbanInvestmentPlatformDto;
 
 /**
  * @ClassName EconomicService
@@ -18,7 +19,7 @@ public interface UrbanInvestmentPlatformService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult page();
+    AjaxResult page(UrbanInvestmentPlatformDto dto);
 
     /***
      *@Description: 城投平台详情
@@ -28,4 +29,13 @@ public interface UrbanInvestmentPlatformService {
      *@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:29
+     */
+    AjaxResult statistics(UrbanInvestmentPlatformDto pageDto);
 }

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

@@ -7,6 +7,7 @@ import com.dsk.common.annotation.DataScope;
 import com.dsk.common.utils.SecurityUtils;
 import com.dsk.system.domain.customer.CustomerFollowRecord;
 import com.dsk.system.domain.customer.dto.CustomerFollowRecordSearchDto;
+import com.dsk.system.domain.customer.vo.CustomerFollowRecordListVo;
 import com.dsk.system.mapper.CustomerFollowRecordMapper;
 import com.dsk.system.service.ICustomerFollowRecordService;
 import lombok.extern.slf4j.Slf4j;
@@ -30,19 +31,13 @@ public class CustomerFollowRecordServiceImpl implements ICustomerFollowRecordSer
     private CustomerFollowRecordMapper baseMapper;
 
     @Override
-//    @DataScope(deptAlias = "d",userAlias = "u")
-    public List<CustomerFollowRecord> selectList(CustomerFollowRecordSearchDto dto) {
-        LambdaQueryWrapper<CustomerFollowRecord> wrapper = Wrappers.lambdaQuery();
-        if (!ObjectUtils.isEmpty(dto.getCustomerId())) {
-            wrapper.eq(CustomerFollowRecord::getCustomerId, dto.getCustomerId());
-        } else {
-            wrapper.eq(CustomerFollowRecord::getUserId, SecurityUtils.getUserId());
+    @DataScope(deptAlias = "d",userAlias = "u")
+    public List<CustomerFollowRecordListVo> selectList(CustomerFollowRecordSearchDto dto) {
+        if (ObjectUtils.isEmpty(dto.getCustomerId())) {
+            dto.setUserId(SecurityUtils.getUserId());
         }
-        wrapper.orderByDesc(CustomerFollowRecord::getCreateTime);
-        return baseMapper.selectList(wrapper);
-
-//        dto.setUserId(SecurityUtils.getUserId());
-//        return baseMapper.selectAuthList(dto);
+//        log.debug("dto.params.dataScope{}",dto.getParams().get("dataScope"));
+        return baseMapper.selectAuthList(dto);
     }
 
     @Override

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

@@ -4,7 +4,6 @@ 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;
@@ -25,60 +24,9 @@ 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));
+    public AjaxResult nationalPage(OpRegionalEconomicDataV1Dto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -86,25 +34,25 @@ public class EconomicServiceImpl implements EconomicService {
     public AjaxResult details(Integer id) {
         Map<String, Object> bodyMap = new HashMap<>(1);
         bodyMap.put("id", id);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", bodyMap);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/details", bodyMap);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult statisticsRegional(OpRegionalEconomicDataV1Dto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx",  BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/statistics/regional",  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));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/regional/list",  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));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/xx",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

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

@@ -2,9 +2,10 @@ package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.SpecialBondInformationPageDto;
 import com.dsk.common.dtos.SpecialPurposeBondsDto;
+import com.dsk.common.dtos.SpecialPurposeBondsPageDto;
 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;
@@ -26,8 +27,8 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
     private DskOpenApiUtil dskOpenApiUtil;
 
     @Override
-    public AjaxResult page(SpecialPurposeBondsDto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", BeanUtil.beanToMap(dto, false, false));
+    public AjaxResult page(SpecialPurposeBondsPageDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/specialPurposeBonds/projects/page", BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -35,13 +36,19 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
     public AjaxResult details(String id) {
         Map<String, Object> bodyMap = new HashMap<>(1);
         bodyMap.put("id", id);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", bodyMap);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/specialPurposeBonds/details", 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));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/specialPurposeBonds/bond/statistics", BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult bondPage(SpecialBondInformationPageDto pageDto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/specialPurposeBonds/bond/page", BeanUtil.beanToMap(pageDto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

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

@@ -2,12 +2,13 @@ package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.UrbanInvestmentPlatformDto;
 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.HashMap;
 import java.util.Map;
 
 /**
@@ -24,14 +25,22 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
     private DskOpenApiUtil dskOpenApiUtil;
 
     @Override
-    public AjaxResult page() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", null);
+    public AjaxResult page(UrbanInvestmentPlatformDto pageDto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/urbanInvestment/page", BeanUtil.beanToMap(pageDto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult details(String id) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", null);
+        Map<String, Object> bodyMap = new HashMap<>(1);
+        bodyMap.put("id", id);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/urbanInvestment/details", bodyMap);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult statistics(UrbanInvestmentPlatformDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/urbanInvestment/statistics", BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

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

@@ -7,16 +7,20 @@
         cfr.content, cfr.create_time
     </sql>
 
-    <select id="selectAuthList" resultType="com.dsk.system.domain.customer.CustomerFollowRecord">
+    <select id="selectAuthList" resultType="com.dsk.system.domain.customer.vo.CustomerFollowRecordListVo">
         select
+            ct.company_name, u.nick_name,
             <include refid="Base_Bean"></include>
         from customer_follow_record cfr
+        join customer ct on ct.customer_id = cfr.customer_id
         join sys_user u on u.user_id = cfr.user_id
-        join sys_dept d on d.dept_id = u.dept_id
-        where cfr.user_id = #{dto.userId}
+        left join sys_dept d on d.dept_id = u.dept_id
+        <where>
+            <if test="dto.userId != null "> and cfr.user_id = #{dto.userId} </if>
             <if test="dto.customerId != null and dto.customerId != '' "> and cfr.customer_id = #{dto.customerId} </if>
             <!-- 数据范围过滤 -->
-        ${params.dataScope}
+            <if test="dto.params.dataScope != null and dto.params.dataScope != '' "> ${dto.params.dataScope} </if>
+        </where>
         order by cfr.create_time desc
     </select>