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

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

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.dsk.common.core.domain.entity.BusinessFollowRecord;
+import com.dsk.system.domain.BusinessIdDto;
 import com.dsk.system.service.IBusinessFollowRecordService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,11 +40,12 @@ public class BusinessFollowRecordController extends BaseController
      * 根据项目id查询项目跟进记录
      */
 //    @PreAuthorize("@ss.hasPermi('system:record:list')")
-    @GetMapping("/list/{businessId}")
-    public AjaxResult list(@PathVariable Integer businessId)
-    {
-        return success(businessFollowRecordService.selectBusinessFollowRecordList(businessId));
-    }
+//    @GetMapping("/list/{businessId}")
+//    public TableDataInfo list(@PathVariable("businessId") Integer businessId)
+//    {
+//        startPage();
+//        return getDataTable(businessFollowRecordService.selectBusinessFollowRecordList(businessId));
+//    }
 
     /**
      * 新增项目跟进记录
@@ -60,13 +62,24 @@ public class BusinessFollowRecordController extends BaseController
      * 分页查询项目跟进记录
      */
 //    @PreAuthorize("@ss.hasPermi('system:record:list')")
-//    @GetMapping("/list")
-//    public TableDataInfo list(BusinessFollowRecord businessFollowRecord)
-//    {
-//        startPage();
-//        List<BusinessFollowRecord> list = businessFollowRecordService.selectBusinessFollowRecordList(businessFollowRecord);
-//        return getDataTable(list);
-//    }
+    @GetMapping("/list")
+    public TableDataInfo list(@RequestBody(required=false) BusinessIdDto businessId)
+    {
+        startPage();
+        List<BusinessFollowRecord> list = businessFollowRecordService.selectBusinessFollowRecordList(businessId);
+        return getDataTable(list);
+    }
+
+    /**
+     * 删除项目跟进记录
+     */
+//    @PreAuthorize("@ss.hasPermi('system:record:remove')")
+//    @Log(title = "项目跟进记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("remove/{ids}")
+    public AjaxResult remove(@PathVariable(value = "ids",required=false) Long[] ids)
+    {
+        return toAjax(businessFollowRecordService.deleteBusinessFollowRecordByIds(ids));
+    }
 
 //    /**
 //     * 导出项目跟进记录列表
@@ -102,14 +115,4 @@ public class BusinessFollowRecordController extends BaseController
 //        return toAjax(businessFollowRecordService.updateBusinessFollowRecord(businessFollowRecord));
 //    }
 
-//    /**
-//     * 删除项目跟进记录
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:record:remove')")
-//    @Log(title = "项目跟进记录", businessType = BusinessType.DELETE)
-//	@DeleteMapping("/{ids}")
-//    public AjaxResult remove(@PathVariable Long[] ids)
-//    {
-//        return toAjax(businessFollowRecordService.deleteBusinessFollowRecordByIds(ids));
-//    }
 }

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

@@ -4,6 +4,8 @@ import java.util.List;
 
 import com.dsk.common.core.domain.entity.BusinessInfo;
 import com.dsk.common.dtos.BusinessInfoDto;
+import com.dsk.common.exception.base.BaseException;
+import com.dsk.common.utils.CheckUtils;
 import com.dsk.system.domain.BusinessAddDto;
 import com.dsk.system.domain.BusinessListDto;
 import com.dsk.system.domain.vo.BusinessBrowseVo;
@@ -69,9 +71,9 @@ public class BusinessInfoController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:business:query')")
     @GetMapping("/browse/{businessId}")
-    public AjaxResult browse(@PathVariable Integer id)
+    public AjaxResult browse(@PathVariable("businessId") Integer businessId)
     {
-        return success(businessInfoService.browse(id));
+        return success(businessInfoService.browse(businessId));
     }
 
     /**

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

 package com.dsk.web.controller.search.macroMarket;
 
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.dtos.OpRegionalEconomicDataRegionalListDto;
-import com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto;
-import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
+import com.dsk.common.dtos.*;
 import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -44,9 +42,9 @@ public class RegionalEconomicDataController {
      *@Author: Dgm
      *@date: 2023/5/18 10:29
      */
-    @GetMapping("/years/list")
-    public AjaxResult yearsList() {
-        return economicService.yearsList();
+    @PostMapping("/years/list")
+    public AjaxResult yearsList(@RequestBody OpRegionalEconomicDataYearsListDto dto) {
+        return economicService.yearsList(dto);
     }
 
 
@@ -57,9 +55,9 @@ public class RegionalEconomicDataController {
      *@Author: Dgm
      *@date: 2023/5/18 10:29
      */
-    @GetMapping("/details/{id}")
-    public AjaxResult details(@PathVariable("id") Integer id) {
-        return economicService.details(id);
+    @PostMapping("/details")
+    public AjaxResult details(@RequestBody @Valid OpRegionalEconomicDataDetailsDto detailsDto) {
+        return economicService.details(detailsDto);
     }
 
 

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.SpecialBondInformationDetailsDto;
 import com.dsk.common.dtos.SpecialBondInformationPageDto;
 import com.dsk.common.dtos.SpecialPurposeBondsDto;
 import com.dsk.common.dtos.SpecialPurposeBondsPageDto;
@@ -8,6 +9,8 @@ import com.dsk.system.service.SpecialPurposeBondsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * @ClassName SpecialBondProjectsController
  * @Description 专项债项目
@@ -42,9 +45,9 @@ public class SpecialBondProjectsController {
      *@Author: Dgm
      *@date: 2023/5/18 10:29
      */
-    @GetMapping("/details/{id}")
-    public AjaxResult details(@PathVariable("id") String id) {
-        return specialPurposeBondsService.details(id);
+    @PostMapping("/details")
+    public AjaxResult details(@RequestBody @Valid SpecialBondInformationDetailsDto detailsDto) {
+        return specialPurposeBondsService.details(detailsDto);
     }
 
 

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

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/dsk-operate-sys/uploadPath
+  profile: D:/dsk-operate-sys/uploadPath/
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

dsk-common/pom.xml

@@ -150,6 +150,18 @@
             <artifactId>dsk-acc-open-sdk-java</artifactId>
             <version>${dsk-openapi-sdk.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.13</version>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -142,6 +142,78 @@ public class BusinessInfo extends BaseEntity
     @Excel(name = "评标委员会")
     private String evaluationBidCouncil;
 
+    /** 建设单位 */
+    @Excel(name = "建设单位")
+    private String constructionUnit;
+
+    /** 建设单位负责人 */
+    @Excel(name = "建设单位负责人")
+    private String constructionPrincipal;
+
+    /** 建设单位联系电话 */
+    @Excel(name = "建设单位联系电话")
+    private String constructionPhone;
+
+    /** 主管单位 */
+    @Excel(name = "主管单位")
+    private String supervisorUnit;
+
+    /** 主管单位负责人 */
+    @Excel(name = "主管单位负责人")
+    private String supervisorPrincipal;
+
+    /** 主管单位联系电话 */
+    @Excel(name = "主管单位联系电话")
+    private String supervisorPhone;
+
+    public String getConstructionUnit() {
+        return constructionUnit;
+    }
+
+    public void setConstructionUnit(String constructionUnit) {
+        this.constructionUnit = constructionUnit;
+    }
+
+    public String getConstructionPrincipal() {
+        return constructionPrincipal;
+    }
+
+    public void setConstructionPrincipal(String constructionPrincipal) {
+        this.constructionPrincipal = constructionPrincipal;
+    }
+
+    public String getConstructionPhone() {
+        return constructionPhone;
+    }
+
+    public void setConstructionPhone(String constructionPhone) {
+        this.constructionPhone = constructionPhone;
+    }
+
+    public String getSupervisorUnit() {
+        return supervisorUnit;
+    }
+
+    public void setSupervisorUnit(String supervisorUnit) {
+        this.supervisorUnit = supervisorUnit;
+    }
+
+    public String getSupervisorPrincipal() {
+        return supervisorPrincipal;
+    }
+
+    public void setSupervisorPrincipal(String supervisorPrincipal) {
+        this.supervisorPrincipal = supervisorPrincipal;
+    }
+
+    public String getSupervisorPhone() {
+        return supervisorPhone;
+    }
+
+    public void setSupervisorPhone(String supervisorPhone) {
+        this.supervisorPhone = supervisorPhone;
+    }
+
     public String getEvaluationBidWay() {
         return evaluationBidWay;
     }
@@ -437,6 +509,12 @@ public class BusinessInfo extends BaseEntity
             .append("earnestMoneyPay", getEarnestMoneyPay())
             .append("earnestMoney", getEarnestMoney())
             .append("evaluationBidCouncil", getEvaluationBidCouncil())
+            .append("constructionUnit", getConstructionUnit())
+            .append("constructionPrincipal", getConstructionPrincipal())
+            .append("constructionPhone", getConstructionPhone())
+            .append("supervisorUnit", getSupervisorUnit())
+            .append("supervisorPrincipal", getSupervisorPrincipal())
+            .append("supervisorPhone", getSupervisorPhone())
             .toString();
     }
 }

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

@@ -21,7 +21,7 @@ public class EnterpriseUipSearchBody extends BasePage {
 
 
     /*
-     * 1供应商倒序，2供应商正序，3拟建项目倒序，4拟建项目正序，5招标公告倒序，6招标公告正序
+     * 1供应商倒序，2供应商正序，3拟建项目倒序，4拟建项目正序，5招标公告倒序，6招标公告正序,7土地倒序，8土地正序
      */
     @NotNull(message = "排序条件不能为空")
     private Integer sort;

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

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1Dto
+ * @Description  区域经济大全-详情
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataDetailsDto {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id 不能为空")
+    private Integer id;
+}

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

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * @ClassName OpRegionalEconomicDataYearsListDto
+ * @Description 获取年份
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataYearsListDto {
+
+    private Integer year;
+}

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

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName SpecialBondInformationDetailsDto
+ * @Description 专项债-详情
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class SpecialBondInformationDetailsDto {
+
+    /**
+     * 专项债券唯一标识
+     */
+    @NotNull(message = "id 不能为空")
+    private Integer id;
+}

dsk-common/src/main/java/com/dsk/common/utils/file/FileUtils.java

@@ -7,13 +7,20 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.dsk.common.utils.DateUtils;
 import com.dsk.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import com.dsk.common.config.RuoYiConfig;
@@ -25,10 +32,51 @@ import org.apache.commons.io.FilenameUtils;
  *
  * @author dsk
  */
+@Slf4j
 public class FileUtils
 {
     public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
 
+
+    /**
+     * 检查目录是否存在，如果不存在，则创建目录，如果创建失败则返回false
+     *
+     * @param path 文件夹路径
+     * @return boolean
+     */
+    public static boolean newFolder(String path) {
+        File file = new File(path);
+        if (!file.exists()) {
+            boolean isSuccess = file.mkdir();
+            if (!isSuccess)
+                file.mkdirs();
+            return !isSuccess;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     *
+     *
+     * @param folderPath 文件夹路径
+     * @return 文件夹路径
+     */
+    public static String newFolder1(String folderPath) {
+        String filePath = folderPath;
+        try {
+            File myFilePath = new File(filePath);
+            if (!myFilePath.exists()) {
+                myFilePath.mkdirs();
+            }
+        } catch (Exception e) {
+            log.error("创建文件夹失败");
+            filePath = "";
+            e.printStackTrace();
+        }
+        return filePath;
+    }
+
     /**
      * 输出指定文件的byte数组
      *
@@ -104,12 +152,12 @@ public class FileUtils
         return FileUploadUtils.getPathFileName(uploadDir, pathName);
     }
 
-    /**
+/*    *//**
      * 删除文件
      *
      * @param filePath 文件
      * @return
-     */
+     *//*
     public static boolean deleteFile(String filePath)
     {
         boolean flag = false;
@@ -120,7 +168,170 @@ public class FileUtils
             flag = file.delete();
         }
         return flag;
+    }*/
+    /**
+     * 删除整个文件夹或者文某个文件
+     *
+     * @param filePath 文件
+     * @return
+     */
+    public static boolean deleteFile(String filePath) {
+        try {
+            if(StringUtils.isNotEmpty(delAllFile(filePath))) return false;
+            File file = new File(filePath);
+            return file.delete();
+        } catch (Exception e) {
+            log.info("删除文件失败");
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 文件夹过滤
+     *
+     * @param path 文件夹路径
+     */
+    public static String delAllFile(String path) {
+        String hint = "这是一个根目录，请更换目录!";
+        File file = new File(path);
+        if (!file.exists()) {
+            return hint;
+        }
+//        if (!file.isDirectory()) {
+//            return false;
+//        }
+        if (file.getAbsolutePath().equalsIgnoreCase("/")) {
+            return hint;
+        }
+        if (file.getAbsolutePath().equalsIgnoreCase("/root")) {
+            return hint;
+        }
+        if (file.getAbsolutePath().equalsIgnoreCase("/usr") || file.getAbsolutePath().equalsIgnoreCase("/opt")
+                || file.getAbsolutePath().equalsIgnoreCase("/bin") || file.getAbsolutePath().equalsIgnoreCase("/sbin")
+                || file.getAbsolutePath().equalsIgnoreCase("/etc") || file.getAbsolutePath().equalsIgnoreCase("/selinux")
+                || file.getAbsolutePath().equalsIgnoreCase("/sys") || file.getAbsolutePath().equalsIgnoreCase("/var")
+                || file.getAbsolutePath().equalsIgnoreCase("/home") || file.getAbsolutePath().equalsIgnoreCase("/net")) {
+            return hint;
+        }
+        if (file.getAbsolutePath().equalsIgnoreCase("C://") || file.getAbsolutePath().equalsIgnoreCase("C:\\\\")) {
+            return hint;
         }
+        return "";
+    }
+
+
+    /**
+     * 获取文件夹中所有文件
+     * @param filePath 全路径
+     * @return
+     */
+    public static List<String> getAllFiles(String filePath) {
+        List<String> fileList = new ArrayList<String>();
+        File file = new File(filePath);
+
+        if (!file.exists()) {
+            return fileList;
+        }
+        if (!file.isDirectory()) {
+            return fileList;
+        }
+
+        // 获取当前目录下的文件和文件夹
+        File[] files = file.listFiles();
+
+        if (files != null) {
+            for (File directory : files) {
+                // 如果是文件夹则递归调用此方法
+                if (directory.isDirectory()) {
+                    fileList.add(directory.getPath());
+                    getAllFiles(directory.getPath());
+                } else {
+                    // 如果是文件则直接输出路径
+                    fileList.add(directory.getPath());
+                }
+            }
+            return fileList;
+        }
+        return fileList;
+    }
+
+    /**
+     * 获取文件夹中的所有文件,不包括文件夹
+     *
+     * @param path 文件夹路径
+     * @return List<File>
+     */
+    public static List<File> getAllFileNames(String path) {
+        List<File> fileList = new ArrayList<File>();
+        File file = new File(path);
+        if (!file.exists()) {
+            return fileList;
+        }
+        if (!file.isDirectory()) {
+            return fileList;
+        }
+        String[] tempList = file.list();
+        File tempFile;
+        for (String fileName : tempList) {
+            if (path.endsWith(File.separator)) {
+                tempFile = new File(path + fileName);
+            } else {
+                tempFile = new File(path + File.separator + fileName);
+            }
+            if (tempFile.isFile()) {
+                fileList.add(tempFile);
+            }
+            if (tempFile.isDirectory()) {
+                List<File> allFiles = getAllFileNames(tempFile.getAbsolutePath());
+                fileList.addAll(allFiles);
+            }
+        }
+        return fileList;
+    }
+
+    /**
+     * 下载文件
+     *
+     * @param url          要下载的文件链接
+     * @param targetFolder 目标文件
+     * @throws IOException
+     */
+    public static void downloadFolder(String url, String targetFolder) throws IOException {
+        URL downloadUrl = new URL(url);
+        HttpURLConnection connection = (HttpURLConnection) downloadUrl.openConnection();
+        connection.setRequestMethod("GET");
+        connection.connect();
+
+        if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
+            throw new RuntimeException("下载文件夹失败: " + connection.getResponseMessage());
+        }
+
+        try (ZipInputStream zipInputStream = new ZipInputStream(connection.getInputStream())) {
+            ZipEntry entry;
+            while ((entry = zipInputStream.getNextEntry()) != null) {
+                String entryName = entry.getName();
+                if (StringUtils.isBlank(entryName)) {
+                    continue;
+                }
+
+                File entryFile = new File(targetFolder, entryName);
+                if (entry.isDirectory()) {
+                    entryFile.mkdirs();
+                } else {
+                    File parent = entryFile.getParentFile();
+                    if (!parent.exists()) {
+                        parent.mkdirs();
+                    }
+
+                    try (FileOutputStream outputStream = new FileOutputStream(entryFile)) {
+                        IOUtils.copy(zipInputStream, outputStream);
+                    }
+                }
+            }
+        }
+    }
+
 
     /**
      * 文件名称验证

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

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

dsk-framework/src/main/java/com/dsk/framework/web/service/SysLoginService.java

@@ -64,7 +64,7 @@ public class SysLoginService
     public String login(String username, String password, String code, String uuid)
     {
         // 验证码校验
-        validateCaptcha(username, code, uuid);
+//        validateCaptcha(username, code, uuid);
         // 登录前置校验
         loginPreCheck(username, password);
         // 用户验证

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

 package com.dsk.system.domain.vo;
 
+import com.dsk.common.annotation.Excel;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
 import lombok.Data;
 
@@ -53,6 +54,21 @@ public class BusinessBrowseVo {
      */
     private String districtName;
 
+    /**
+     * 省id
+     */
+    private Integer provinceId;
+
+    /**
+     * 市id
+     */
+    private Integer cityId;
+
+    /**
+     * 区id
+     */
+    private Integer districtId;
+
     /**
      * 商务团队
      */
@@ -73,10 +89,23 @@ public class BusinessBrowseVo {
      */
     private List<String> labelList;
 
-    /**
-     * 关键企业
-     */
-    private List<BusinessRelateCompany> relateCompany;
+    /** 建设单位 */
+    private String constructionUnit;
+
+    /** 建设单位负责人 */
+    private String constructionPrincipal;
+
+    /** 建设单位联系电话 */
+    private String constructionPhone;
+
+    /** 主管单位 */
+    private String supervisorUnit;
+
+    /** 主管单位负责人 */
+    private String supervisorPrincipal;
+
+    /** 主管单位联系电话 */
+    private String supervisorPhone;
 
     /**
      * 联系人统计

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

 package com.dsk.system.mapper;
 
 import com.dsk.common.core.domain.entity.BusinessFollowRecord;
+import com.dsk.system.domain.BusinessIdDto;
 
 import java.util.List;
 
@@ -34,7 +35,7 @@ public interface BusinessFollowRecordMapper
      * @param businessId 项目id
      * @return 项目跟进记录集合
      */
-    public List<BusinessFollowRecord> selectBusinessFollowRecordList(Integer businessId);
+    public List<BusinessFollowRecord> selectBusinessFollowRecordList(BusinessIdDto businessId);
 
     /**
      * 新增项目跟进记录

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

@@ -58,4 +58,11 @@ public interface BusinessUserMapper
      * @return 结果
      */
     public int deleteBusinessUserByIds(Long[] ids);
+
+    /**
+     * 根据项目id查询项目的创建人
+     * @param businessId
+     * @return
+     */
+    String selectCreatorByBusinessId(Integer businessId);
 }

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.OpRegionalEconomicDataRegionalListDto;
-import com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto;
-import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
-import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
+import com.dsk.common.dtos.*;
 
 /**
  * @ClassName EconomicService
@@ -32,7 +29,7 @@ public interface EconomicService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult yearsList();
+    AjaxResult yearsList(OpRegionalEconomicDataYearsListDto dataYearsListDto);
 
 
     /***
@@ -42,7 +39,7 @@ public interface EconomicService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult details(Integer id);
+    AjaxResult details(OpRegionalEconomicDataDetailsDto detailsDto);
 
 
     /***

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

 package com.dsk.system.service;
 
 import com.dsk.common.core.domain.entity.BusinessFollowRecord;
+import com.dsk.system.domain.BusinessIdDto;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface IBusinessFollowRecordService
      * @param businessId 项目跟进记录
      * @return 项目跟进记录集合
      */
-    public List<BusinessFollowRecord> selectBusinessFollowRecordList(Integer businessId);
+    public List<BusinessFollowRecord> selectBusinessFollowRecordList(BusinessIdDto businessId);
 
     /**
      * 分页查询项目跟进记录列表

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.SpecialBondInformationDetailsDto;
 import com.dsk.common.dtos.SpecialBondInformationPageDto;
 import com.dsk.common.dtos.SpecialPurposeBondsDto;
 import com.dsk.common.dtos.SpecialPurposeBondsPageDto;
@@ -30,7 +31,7 @@ public interface SpecialPurposeBondsService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult details(String id);
+    AjaxResult details(SpecialBondInformationDetailsDto detailsDto);
 
     /***
      *@Description: 项目类别统计

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.dsk.common.core.domain.entity.BusinessFollowRecord;
 import com.dsk.common.utils.DateUtils;
+import com.dsk.system.domain.BusinessIdDto;
 import com.dsk.system.mapper.BusinessFollowRecordMapper;
 import com.dsk.system.service.IBusinessFollowRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +36,7 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
     }
 
     @Override
-    public List<BusinessFollowRecord> selectBusinessFollowRecordList(Integer businessId)
+    public List<BusinessFollowRecord> selectBusinessFollowRecordList(BusinessIdDto businessId)
     {
         return businessFollowRecordMapper.selectBusinessFollowRecordList(businessId);
     }
@@ -78,6 +79,7 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteBusinessFollowRecordByIds(Long[] ids)
     {
         return businessFollowRecordMapper.deleteBusinessFollowRecordByIds(ids);

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

@@ -8,6 +8,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsk.common.config.RuoYiConfig;
 import com.dsk.common.constant.HttpStatus;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessInfo;
@@ -15,8 +16,11 @@ 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.exception.base.BaseException;
+import com.dsk.common.utils.CheckUtils;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.common.utils.SecurityUtils;
+import com.dsk.common.utils.StringUtils;
+import com.dsk.common.utils.file.FileUtils;
 import com.dsk.system.domain.BusinessExcelDto;
 import com.dsk.system.domain.BusinessAddDto;
 import com.dsk.system.domain.BusinessListDto;
@@ -82,11 +86,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      */
     @Override
     public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
-        if (dto.getUserId() == null) {
-            Long deptId = SecurityUtils.getLoginUser().getDeptId();
-            if (deptId == null) throw new BaseException("请登录");
-            dto.setDeptId(deptId.intValue());
-        }
+//        if (dto.getUserId() == null) {
+//            Long deptId = SecurityUtils.getLoginUser().getDeptId();
+//            if (deptId == null) throw new BaseException("请登录");
+//            dto.setDeptId(deptId.intValue());
+//        }
         return businessInfoMapper.selectBusinessInfoList(dto);
     }
 
@@ -96,15 +100,18 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         //查询项目基本信息
         BusinessInfo businessInfo = businessInfoMapper.selectBusinessInfoById(businessId);
         BeanUtil.copyProperties(businessInfo, businessBrowseVo);
+        //商务团队
+        businessBrowseVo.setTeam(businessUserMapper.selectCreatorByBusinessId(businessId));
         //查询项目标签
         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());
         businessBrowseVo.setFollowRecordCount(total.getFollowRecordCount());
         businessBrowseVo.setRelateCompanyCount(total.getRelateCompanyCount());
+        //资料文档统计
+        businessBrowseVo.setRelateCompanyCount(FileUtils.getAllFileNames(RuoYiConfig.getProfile()+businessId).size());
         return businessBrowseVo;
     }
 
@@ -186,6 +193,10 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     @Override
     @Transactional
     public int updateBusinessInfo(BusinessInfo businessInfo) {
+        if (StringUtils.isNotEmpty(businessInfo.getConstructionPhone()) && StringUtils.isNotEmpty(businessInfo.getSupervisorPhone())) {
+            if (!CheckUtils.isPhone(businessInfo.getConstructionPhone()) || !CheckUtils.isPhone(businessInfo.getSupervisorPhone()))
+                throw new BaseException("500", "请输入正确的手机号码");
+        }
         businessInfo.setUpdateTime(DateUtils.getNowDate());
         return businessInfoMapper.updateBusinessInfo(businessInfo);
     }

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

@@ -63,7 +63,7 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS
     @Transactional
     public int insertBusinessRelateCompany(BusinessRelateCompany businessRelateCompany)
     {
-        if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的手机号码");
+//        if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的手机号码");
         businessRelateCompany.setCreateTime(DateUtils.getNowDate());
         return businessRelateCompanyMapper.insertBusinessRelateCompany(businessRelateCompany);
     }
@@ -78,7 +78,7 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS
     @Transactional
     public int updateBusinessRelateCompany(BusinessRelateCompany businessRelateCompany)
     {
-        if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的手机号码");
+//        if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的手机号码");
         businessRelateCompany.setUpdateTime(DateUtils.getNowDate());
         return businessRelateCompanyMapper.updateBusinessRelateCompany(businessRelateCompany);
     }

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

@@ -3,17 +3,13 @@ package com.dsk.system.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.dtos.OpRegionalEconomicDataRegionalListDto;
-import com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto;
-import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
-import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
+import com.dsk.common.dtos.*;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.common.utils.DskOpenApiUtil;
 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;
 
 /**
@@ -39,16 +35,14 @@ public class EconomicServiceImpl implements EconomicService {
     }
 
     @Override
-    public AjaxResult yearsList() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/years/list",  null);
+    public AjaxResult yearsList(OpRegionalEconomicDataYearsListDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/years/list",  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("/economic/details", bodyMap);
+    public AjaxResult details(OpRegionalEconomicDataDetailsDto detailsDto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/details", BeanUtil.beanToMap(detailsDto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

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

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

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

@@ -24,7 +24,6 @@
         <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"/>
@@ -35,6 +34,12 @@
         <result property="earnestMoneyPay" column="earnest_money_pay"/>
         <result property="earnestMoney" column="earnest_money"/>
         <result property="evaluationBidCouncil" column="evaluation_bid_council"/>
+        <result property="constructionUnit" column="construction_unit"/>
+        <result property="constructionPrincipal" column="construction_principal"/>
+        <result property="constructionPhone" column="construction_phone"/>
+        <result property="supervisorUnit" column="supervisor_unit"/>
+        <result property="supervisorPrincipal" column="supervisor_principal"/>
+        <result property="supervisorPhone" column="supervisor_phone"/>
     </resultMap>
 
     <sql id="selectBusinessInfoVo">
@@ -57,7 +62,6 @@
                district_id,
                project_type,
                project_category,
-               team,
                is_private,
                create_time,
                update_time,
@@ -68,7 +72,13 @@
                bid_open_place,
                earnest_money_pay,
                earnest_money,
-               evaluation_bid_council
+               evaluation_bid_council,
+               construction_unit,
+               construction_principal,
+               construction_phone,
+               supervisor_unit,
+               supervisor_principal,
+               supervisor_phone
         from business_info
     </sql>
 
@@ -246,7 +256,6 @@
             <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>
@@ -257,6 +266,12 @@
             <if test="earnestMoneyPay != null">earnest_money_pay,</if>
             <if test="earnestMoney != null">earnest_money,</if>
             <if test="evaluationBidCouncil != null">evaluation_bid_council,</if>
+            <if test="constructionUnit != null">construction_unit,</if>
+            <if test="constructionPrincipal != null">construction_principal,</if>
+            <if test="constructionPhone != null">construction_phone,</if>
+            <if test="supervisorUnit != null">supervisor_unit,</if>
+            <if test="supervisorPrincipal != null">supervisor_principal,</if>
+            <if test="supervisorPhone != null">supervisor_phone,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectName != null">#{projectName},</if>
@@ -277,7 +292,6 @@
             <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>
@@ -289,6 +303,12 @@
             <if test="earnestMoneyPay != null">#{earnestMoneyPay},</if>
             <if test="earnestMoney != null">#{earnestMoney},</if>
             <if test="evaluationBidCouncil != null">#{evaluationBidCouncil},</if>
+            <if test="constructionUnit != null">#{constructionUnit},</if>
+            <if test="constructionPrincipal != null">#{constructionPrincipal},</if>
+            <if test="constructionPhone != null">#{constructionPhone},</if>
+            <if test="supervisorUnit != null">#{supervisorUnit},</if>
+            <if test="supervisorPrincipal != null">#{supervisorPrincipal},</if>
+            <if test="supervisorPhone != null">#{supervisorPhone},</if>
         </trim>
     </insert>
 
@@ -313,7 +333,6 @@
             <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>
@@ -325,6 +344,12 @@
             <if test="earnestMoneyPay != null">earnest_money_pay = #{earnestMoneyPay},</if>
             <if test="earnestMoney != null">earnest_money = #{earnestMoney},</if>
             <if test="evaluationBidCouncil != null">evaluation_bid_council = #{evaluationBidCouncil},</if>
+            <if test="constructionUnit != null">construction_unit = #{constructionUnit},</if>
+            <if test="constructionPrincipal != null">construction_principal = #{constructionPrincipal},</if>
+            <if test="constructionPhone != null">construction_phone = #{constructionPhone},</if>
+            <if test="supervisorUnit != null">supervisor_unit = #{supervisorUnit},</if>
+            <if test="supervisorPrincipal != null">supervisor_principal = #{supervisorPrincipal},</if>
+            <if test="supervisorPhone != null">evaluation_bid_council = #{supervisorPhone},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -33,6 +33,14 @@
         <include refid="selectBusinessUserVo"/>
         where id = #{id}
     </select>
+    <select id="selectCreatorByBusinessId" resultType="java.lang.String">
+        select u.nick_name
+        from business_user bu
+        left join business_info i on i.id = bu.business_id
+        left join sys_user u on u.user_id = bu.user_id
+        where bu.is_founder = 1
+        and i.id = #{BusinessId}
+    </select>
 
     <insert id="insertBusinessUser" parameterType="com.dsk.common.core.domain.entity.BusinessUser" useGeneratedKeys="true" keyProperty="id">
         insert into business_user