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

@@ -27,6 +27,24 @@ public class BusinessFollowRecordController extends BaseController
 
 
 
+    /**
+     * 查询关联项目
+     */
+    @GetMapping("/relate/project/{userId}")
+    public AjaxResult selectRelateProject(@PathVariable("userId") Integer userId)
+    {
+        return success(businessFollowRecordService.selectRelateProject(userId));
+    }
+
+    /**
+     * 查询关联业主企业
+     */
+    @GetMapping("/relate/company/{userId}")
+    public AjaxResult selectRelateCompany(@PathVariable("userId") Integer userId)
+    {
+        return success(businessFollowRecordService.selectRelateCompany(userId));
+    }
+
     /**
      * 新增项目跟进记录
      */

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

@@ -6,6 +6,7 @@ import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 
@@ -60,6 +61,19 @@ public class RegionalEconomicDataController {
         return economicService.details(detailsDto);
     }
 
+    /***
+     *@Description: 获取当前地区
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping(value = "location")
+    public AjaxResult location(@RequestBody OpRegionalLocalDto vo, HttpServletRequest request){
+//        String ip = IpUtil.getIpAddr(request);
+        return economicService.location(vo);
+    }
+
 
     /***
      *@Description: 地区经济-统计
@@ -85,5 +99,16 @@ public class RegionalEconomicDataController {
         return economicService.regionalList(dto);
     }
 
+    /***
+     *@Description: 地区经济
+     *@Param:
+     *@return: com.dsk.acc.security.common.msg.RestResponse
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/regional/compare")
+    public AjaxResult regionalCompare(@RequestBody OpRegionalEconomicDataStatisticsRegionalDto dto) {
+        return economicService.regionalCompare(dto);
+    }
 
 }

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

+package com.dsk.common.core.domain.entity;
+
+import lombok.Data;
+
+/**
+ * @author lxl
+ * @Description:
+ * @Date 2023/6/7 上午 11:05
+ **/
+@Data
+public class BusinessFileVo {
+
+    private String filePath;
+    private String creatTime;
+
+    public BusinessFileVo(String filePath, String creatTime) {
+        this.filePath = filePath;
+        this.creatTime = creatTime;
+    }
+}

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

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * @ClassName OpRegionalLocalDto
+ * @Description 获取当前地区
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalLocalDto {
+    /**
+     * 省Id
+     */
+    private Integer provinceId;
+}

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

@@ -14,6 +14,21 @@ import java.util.List;
  */
 public interface BusinessFollowRecordMapper 
 {
+
+    /**
+     * 查询关联项目
+     * @param userId
+     * @return
+     */
+    List<String> selectRelateProject (Integer userId);
+
+    /**
+     * 查询关联业主企业
+     * @param userId
+     * @return
+     */
+    List<String> selectRelateCompany (Integer userId);
+
     /**
      * 查询项目跟进记录
      * 

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

@@ -42,6 +42,16 @@ public interface EconomicService {
     AjaxResult details(OpRegionalEconomicDataDetailsDto detailsDto);
 
 
+    /***
+     *@Description: 获取当前地区
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult location(OpRegionalLocalDto detailsDto);
+
+
     /***
      *@Description: 地区经济统计
      *@Param:
@@ -61,12 +71,12 @@ public interface EconomicService {
     AjaxResult regionalList(OpRegionalEconomicDataRegionalListDto dto);
 
     /***
-     *@Description: 地区经济-分页列表
+     *@Description: 对比经济
      *@Param:
      *@return: com.dsk.common.core.domain.AjaxResult
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult regionalComparison(OpRegionalEconomicDataV1Dto dto);
+    AjaxResult regionalCompare(OpRegionalEconomicDataStatisticsRegionalDto dto);
 
 }

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

@@ -54,6 +54,20 @@ public interface IBusinessFollowRecordService
      */
     public int insertBusinessFollowRecord(BusinessFollowRecord businessFollowRecord);
 
+    /**
+     * 查询关联项目
+     * @param userId
+     * @return
+     */
+    List<String> selectRelateProject (Integer userId);
+
+    /**
+     * 查询关联业主企业
+     * @param userId
+     * @return
+     */
+    List<String> selectRelateCompany (Integer userId);
+
     /**
      * 修改项目跟进记录
      * 

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

@@ -71,6 +71,16 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
         return businessFollowRecordMapper.insertBusinessFollowRecord(businessFollowRecord);
     }
 
+    @Override
+    public List<String> selectRelateProject(Integer userId) {
+        return businessFollowRecordMapper.selectRelateProject(userId);
+    }
+
+    @Override
+    public List<String> selectRelateCompany(Integer userId) {
+        return businessFollowRecordMapper.selectRelateCompany(userId);
+    }
+
     /**
      * 修改项目跟进记录
      *

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

@@ -46,6 +46,12 @@ public class EconomicServiceImpl implements EconomicService {
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
+    @Override
+    public AjaxResult location(OpRegionalLocalDto detailsDto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/location", BeanUtil.beanToMap(detailsDto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
     @Override
     public AjaxResult statisticsRegional(OpRegionalEconomicDataStatisticsRegionalDto dto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/statistics/regional",  BeanUtil.beanToMap(dto, false, false));
@@ -59,8 +65,8 @@ public class EconomicServiceImpl implements EconomicService {
     }
 
     @Override
-    public AjaxResult regionalComparison(OpRegionalEconomicDataV1Dto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/xx",  BeanUtil.beanToMap(dto, false, false));
+    public AjaxResult regionalCompare(OpRegionalEconomicDataStatisticsRegionalDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/regional/compare",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

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

@@ -87,6 +87,18 @@
         </where>
         ORDER BY f.creat_time DESC
     </select>
+    <select id="selectRelateProject" resultType="java.lang.String">
+        select i.project_name
+        from business_info i
+        left join business_follow_record f on f.business_id = i.id
+        where f.user_id = #{userId}
+    </select>
+    <select id="selectRelateCompany" resultType="java.lang.String">
+        select i.construction_unit
+        from business_info i
+        left join business_follow_record f on f.business_id = i.id
+        where f.user_id = #{userId}
+    </select>
 
     <insert id="insertBusinessFollowRecord" parameterType="com.dsk.common.core.domain.entity.BusinessFollowRecord" useGeneratedKeys="true"
             keyProperty="id">