Skip to content

D
dsk-cr20g
Commit e0e9b4c5 authored by MyName's avatar MyName
Browse files
Options

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

parents f558b68f 9981a0d5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3973 additions and 386 deletions
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
View file @ e0e9b4c5
package com.dsk.web.controller.search.macroMarket; package com.dsk.web.controller.search.macroMarket;
import cn.hutool.core.bean.BeanUtil;
import com.dsk.common.core.domain.AjaxResult; import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto; import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
import com.dsk.system.domain.OpRegionalEconomicDataV1;
import com.dsk.system.service.EconomicService; import com.dsk.system.service.EconomicService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/** /**
* @ClassName EconomicController * @ClassName RegionalEconomicDataController
* @Description 经济大全 * @Description 区域经济大全
* @Author Dgm * @Author Dgm
* @Date 2023/5/18 10:09 * @Date 2023/5/18 10:09
* @Version 1.0.0 * @Version 1.0.0
*/ */
@RestController @RestController
@RequestMapping(value ="/economic") @RequestMapping(value ="/economic")
public class EconomicController { public class RegionalEconomicDataController {
@Autowired @Autowired
private EconomicService economicService; private EconomicService economicService;
...@@ -35,10 +28,9 @@ public class EconomicController { ...@@ -35,10 +28,9 @@ public class EconomicController {
*@Author: Dgm *@Author: Dgm
*@date: 2023/5/18 10:29 *@date: 2023/5/18 10:29
*/ */
@PostMapping("/national/list") @PostMapping("/national/nationalPage")
public AjaxResult nationalList(@RequestBody OpRegionalEconomicDataV1Dto dto) { public AjaxResult nationalPage(@RequestBody OpRegionalEconomicDataV1Dto dto) {
// return economicService.nationalList(dto); return economicService.nationalPage(dto);
return new AjaxResult(HttpStatus.OK.value(), "", new OpRegionalEconomicDataV1());
} }
/*** /***
...@@ -50,8 +42,7 @@ public class EconomicController { ...@@ -50,8 +42,7 @@ public class EconomicController {
*/ */
@GetMapping("/details/{id}") @GetMapping("/details/{id}")
public AjaxResult details(@PathVariable("id") Integer id) { public AjaxResult details(@PathVariable("id") Integer id) {
// return economicService.details(id); return economicService.details(id);
return new AjaxResult(HttpStatus.OK.value(), "", new OpRegionalEconomicDataV1());
} }
...@@ -64,17 +55,7 @@ public class EconomicController { ...@@ -64,17 +55,7 @@ public class EconomicController {
*/ */
@PostMapping("/statistics/regional") @PostMapping("/statistics/regional")
public AjaxResult statisticsRegional(@RequestBody OpRegionalEconomicDataV1Dto dto) { public AjaxResult statisticsRegional(@RequestBody OpRegionalEconomicDataV1Dto dto) {
// return economicService.regional(dto); return economicService.statisticsRegional(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);
} }
/*** /***
...@@ -86,32 +67,7 @@ public class EconomicController { ...@@ -86,32 +67,7 @@ public class EconomicController {
*/ */
@PostMapping("/regional/list") @PostMapping("/regional/list")
public AjaxResult regionalList(@RequestBody OpRegionalEconomicDataV1Dto dto) { public AjaxResult regionalList(@RequestBody OpRegionalEconomicDataV1Dto dto) {
// return economicService.regionalList(dto); return economicService.regionalList(dto);
List<OpRegionalEconomicDataV1> opRegionalEconomicDataV1List= new ArrayList<>(5);
OpRegionalEconomicDataV1 dataV1 = new OpRegionalEconomicDataV1();
dataV1.setProvince("重庆");
dataV1.setYear(2022);
OpRegionalEconomicDataV1 dataV2 = new OpRegionalEconomicDataV1();
dataV2.setProvince("重庆");
dataV2.setYear(2021);
OpRegionalEconomicDataV1 dataV3 = new OpRegionalEconomicDataV1();
dataV3.setProvince("重庆");
dataV3.setYear(2020);
OpRegionalEconomicDataV1 dataV4 = new OpRegionalEconomicDataV1();
dataV4.setProvince("重庆");
dataV4.setYear(2019);
OpRegionalEconomicDataV1 dataV5 = new OpRegionalEconomicDataV1();
dataV5.setProvince("重庆");
dataV5.setYear(2018);
opRegionalEconomicDataV1List.add(dataV1);
opRegionalEconomicDataV1List.add(dataV2);
opRegionalEconomicDataV1List.add(dataV3);
opRegionalEconomicDataV1List.add(dataV4);
opRegionalEconomicDataV1List.add(dataV5);
return new AjaxResult(HttpStatus.OK.value(), "", opRegionalEconomicDataV1List);
} }
......
dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/SpecialBondProjectsController.java 0 → 100644
View file @ e0e9b4c5
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 deleted 100644 → 0
View file @ f558b68f
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
View file @ e0e9b4c5
package com.dsk.web.controller.search.macroMarket; package com.dsk.web.controller.search.macroMarket;
import cn.hutool.core.bean.BeanUtil;
import com.dsk.common.core.domain.AjaxResult; import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.dtos.UrbanInvestmentPlatformDto; import com.dsk.common.dtos.UrbanInvestmentPlatformDto;
import com.dsk.system.domain.OpUipFinancialData;
import com.dsk.system.service.UrbanInvestmentPlatformService; import com.dsk.system.service.UrbanInvestmentPlatformService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Map;
/** /**
* @ClassName UrbanInvestmentPlatformController * @ClassName UrbanInvestmentPlatformController
* @Description 城投平台 * @Description 城投平台
...@@ -35,15 +29,7 @@ public class UrbanInvestmentPlatformController { ...@@ -35,15 +29,7 @@ public class UrbanInvestmentPlatformController {
*/ */
@PostMapping("/page") @PostMapping("/page")
public AjaxResult page(@RequestBody UrbanInvestmentPlatformDto dto) { public AjaxResult page(@RequestBody UrbanInvestmentPlatformDto dto) {
// return urbanInvestmentPlatformService.page(); return urbanInvestmentPlatformService.page(dto);
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);
} }
/*** /***
...@@ -57,4 +43,17 @@ public class UrbanInvestmentPlatformController { ...@@ -57,4 +43,17 @@ public class UrbanInvestmentPlatformController {
public AjaxResult details(@PathVariable("id") String id) { public AjaxResult details(@PathVariable("id") String id) {
return urbanInvestmentPlatformService.details(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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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 0 → 100644
View file @ e0e9b4c5
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
View file @ e0e9b4c5
package com.dsk.common.dtos; package com.dsk.common.dtos;
import com.dsk.common.core.domain.model.BasePage;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.event.SpringApplicationEvent;
/** /**
* @ClassName OpRegionalEconomicDataV1Dto * @ClassName OpRegionalEconomicDataV1Dto
...@@ -11,7 +11,7 @@ import org.springframework.boot.context.event.SpringApplicationEvent; ...@@ -11,7 +11,7 @@ import org.springframework.boot.context.event.SpringApplicationEvent;
* @Version * @Version
*/ */
@Data @Data
public class OpRegionalEconomicDataV1Dto { public class OpRegionalEconomicDataV1Dto extends BasePage {
/** /**
* 年份 * 年份
...@@ -20,15 +20,15 @@ public class OpRegionalEconomicDataV1Dto { ...@@ -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 * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
......
dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondInformationPageDto.java 0 → 100644
View file @ e0e9b4c5
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
View file @ e0e9b4c5
...@@ -15,7 +15,7 @@ public class SpecialPurposeBondsDto { ...@@ -15,7 +15,7 @@ public class SpecialPurposeBondsDto {
/** /**
* 项目类型 * 项目类型
*/ */
private String projectType; private String specialBondProjectType;
/** /**
* 项目个数 * 项目个数
*/ */
...@@ -23,7 +23,7 @@ public class SpecialPurposeBondsDto { ...@@ -23,7 +23,7 @@ public class SpecialPurposeBondsDto {
/** /**
* 投资金额 * 投资金额
*/ */
private Double totalInvestment; private Double projectTotalInvestment;
/** /**
* 比例（%） * 比例（%）
*/ */
......
dsk-common/src/main/java/com/dsk/common/dtos/SpecialPurposeBondsPageDto.java 0 → 100644
View file @ e0e9b4c5
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-operate-ui/src/assets/styles/public.css
View file @ e0e9b4c5
...@@ -37,17 +37,18 @@ input { ...@@ -37,17 +37,18 @@ input {
background: none; background: none;
outline: none; outline: none;
} }
html { html {
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
body { body {
height: 100%; height: 100%;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
} }
ul, ul,
...@@ -112,6 +113,7 @@ select { ...@@ -112,6 +113,7 @@ select {
.float_right { .float_right {
float: right; float: right;
} }
.el-input { .el-input {
width: 100%; width: 100%;
} }
...@@ -130,6 +132,11 @@ select { ...@@ -130,6 +132,11 @@ select {
line-height: 34px; line-height: 34px;
} }
.el-dropdown-link {
cursor: pointer;
color: #333333;
}
.el-dropdown-link .el-input { .el-dropdown-link .el-input {
width: 100%; width: 100%;
} }
...@@ -141,6 +148,7 @@ select { ...@@ -141,6 +148,7 @@ select {
.el-input--suffix .el-input__inner { .el-input--suffix .el-input__inner {
padding-right: 15px; padding-right: 15px;
} }
.el-select .el-input.is-focus .el-input__inner, .el-select .el-input.is-focus .el-input__inner,
.el-input.is-active .el-input__inner, .el-input.is-active .el-input__inner,
.el-input__inner:focus, .el-input__inner:focus,
...@@ -148,9 +156,15 @@ select { ...@@ -148,9 +156,15 @@ select {
.el-range-editor.is-active:focus-within { .el-range-editor.is-active:focus-within {
border-color: #3181fa; border-color: #3181fa;
} }
.el-popper[x-placement^=top] { .el-popper[x-placement^=top] {
margin-bottom: 12px; margin-bottom: 12px;
}
.el-popper[x-placement^=bottom] {
margin-top: 12px;
} }
.el-select-dropdown .popper__arrow { .el-select-dropdown .popper__arrow {
display: none; display: none;
} }
...@@ -158,6 +172,7 @@ select { ...@@ -158,6 +172,7 @@ select {
.el-popper .popper__arrow { .el-popper .popper__arrow {
display: none; display: none;
} }
.select-popper { .select-popper {
text-align: center; text-align: center;
display: inline-block; display: inline-block;
...@@ -217,6 +232,7 @@ select { ...@@ -217,6 +232,7 @@ select {
.select-popper::-webkit-scrollbar-corner { .select-popper::-webkit-scrollbar-corner {
background: #fff; background: #fff;
} }
.select-popper .el-select { .select-popper .el-select {
width: 100%; width: 100%;
} }
...@@ -255,11 +271,103 @@ select { ...@@ -255,11 +271,103 @@ select {
.content_item .select-popper:hover .select-caret { .content_item .select-popper:hover .select-caret {
color: #0074E5; color: #0074E5;
} }
.content_item .select-caret:focus { .content_item .select-caret:focus {
border: none; border: none;
outline: none; outline: none;
} }
.content_item .geduan{
.select-multiple {
position: absolute;
left: 0;
top: 0px;
opacity: 0;
line-height: 16px;
}
.select-multiple .el-input {
width: 100%;
line-height: 16px;
}
.select-multiple .el-input .el-input__inner {
width: 100%;
height: 16px !important;
}
.select-multiple .el-tag__close.el-icon-close {
display: none;
}
.el-dropdown-land {
margin-right: 24px;
}
.el-dropdown-land .el-icon-caret-bottom {
color: #333333;
margin-left: 4px;
}
.land_date_picker {
position: absolute !important;
visibility: hidden;
left: 100px;
top: 206px;
}
.jabph_popper_box {
position: absolute;
left: 146px;
bottom: -1px;
background: #ffffff;
width: 186px;
color: #606266;
text-indent: 0;
padding: 16px;
padding-top: 0px;
border: 1px solid #e0e0e0;
}
.jabph_popper_box .jabph_popper_wrap {
margin-top: 16px;
display: inline-block;
}
.jabph_popper_box .jabph_popper_wrap .jabph_popper_input {
width: 100px;
display: inline-block;
margin: 0px 8px;
.el-input__inner {
width: 100px;
}
}
.jabph_popper_box div:last-child {
display: flex;
justify-content: center;
margin-top: 16px;
}
.jabph_popper_box1 {
left: 0;
border: none;
}
.jabph_popper_box2 {
left: 101px;
}
.jabph_popper_box3 {
left: 115px;
}
.content_item .geduan {
width: 100%; width: 100%;
height: 0px; height: 0px;
opacity: 1; opacity: 1;
...@@ -306,3 +414,97 @@ select { ...@@ -306,3 +414,97 @@ select {
color: #0081FF; color: #0081FF;
border-color: #0081FF; border-color: #0081FF;
} }
.toolbar-right-download {
padding: 8px 21px;
margin: 0px;
cursor: pointer;
font-weight: 400;
color: #232323;
background: #FFFFFF;
border-radius: 5px 5px 5px 5px;
border: 1px solid #D9D9D9;
text-align: center;
}
.toolbar-right-download .el-icon-arrow-down{
margin-left: 8px;
}
.viewlist-el-popover {
min-width: 130px;
padding: 0px;
}
.viewlist-el-popover .pup_list {
line-height: 36px;
text-align: left;
margin: 5px 0;
cursor: pointer;
}
.viewlist-el-popover .pup_list li {
padding: 0 16px;
}
.viewlist-el-popover .pup_list li span {
position: relative;
display: inline-block;
}
.viewlist-el-popover .pup_list li .VIP {
width: 24px;
height: 12px;
top: 0px;
right: -8px;
position: absolute;
}
.viewlist-el-popover .pup_list li .SVIP {
width: 24px;
height: 12px;
top: 0px;
right: -10px;
position: absolute;
}
.viewlist-el-popover .pup_list li:hover {
color: #0081FF;
background: #F4F6F9;
}
.viewlist-el-popover .pup_list .activefield {
color: #0081FF;
background: #F4F6F9;
}
.viewlist-el-popover .pup_list_export li {
display: flex;
align-items: center;
padding-right: 0px;
}
.viewlist-el-popover .pup_list_export li img {
width: auto;
height: 12px;
margin-left: 4px;
}
.viewlist-el-popover .pup_zhclist .active {
color: #0081FF;
background: #F4F6F9;
}
.viewlist-el-popover .pup_zhclist li span:hover {
color: #0081FF;
font-weight: 400;
}
.viewlist-el-popover .pup_zhclist .active span {
color: #0081FF;
font-weight: 400;
}
.viewlist-el-popover .pup_list_export li .lowerRate_imgzhc {
width: 39px;
height: 14px;
}
\ No newline at end of file
dsk-operate-ui/src/directive/index.js
View file @ e0e9b4c5
...@@ -4,6 +4,8 @@ import dialogDrag from './dialog/drag' ...@@ -4,6 +4,8 @@ import dialogDrag from './dialog/drag'
import dialogDragWidth from './dialog/dragWidth' import dialogDragWidth from './dialog/dragWidth'
import dialogDragHeight from './dialog/dragHeight' import dialogDragHeight from './dialog/dragHeight'
import clipboard from './module/clipboard' import clipboard from './module/clipboard'
import limitNum from './limitNum/limitNum'
const install = function(Vue) { const install = function(Vue) {
Vue.directive('hasRole', hasRole) Vue.directive('hasRole', hasRole)
...@@ -12,6 +14,7 @@ const install = function(Vue) { ...@@ -12,6 +14,7 @@ const install = function(Vue) {
Vue.directive('dialogDrag', dialogDrag) Vue.directive('dialogDrag', dialogDrag)
Vue.directive('dialogDragWidth', dialogDragWidth) Vue.directive('dialogDragWidth', dialogDragWidth)
Vue.directive('dialogDragHeight', dialogDragHeight) Vue.directive('dialogDragHeight', dialogDragHeight)
Vue.directive('limitNum', limitNum)
} }
if (window.Vue) { if (window.Vue) {
......
dsk-operate-ui/src/directive/limitNum/limitNum.js 0 → 100644
View file @ e0e9b4c5
export default {
bind(el) {
el.oninput = () => {
el.children[0].value = el.children[0].value.replace(/[^\d.]/g,""); //清除“数字”和“.”以外的字符
el.children[0].value = el.children[0].value.replace(/\.{2,}/g,"."); //只保留第一个. 清除多余的
el.children[0].value = el.children[0].value.replace(/^\./g,""); //必须保证第一个为数字而不是.
el.children[0].value = el.children[0].value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
if(el.children[0].value.indexOf(".")< 0 && el.children[0].value !=""){//以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
el.children[0].value= parseFloat(el.children[0].value);
}
};
},
}
\ No newline at end of file
dsk-operate-ui/src/main.js
View file @ e0e9b4c5
...@@ -14,6 +14,7 @@ import directive from './directive' // directive ...@@ -14,6 +14,7 @@ import directive from './directive' // directive
import plugins from './plugins' // plugins import plugins from './plugins' // plugins
import { download } from '@/utils/request' import { download } from '@/utils/request'
import './assets/icons' // icon import './assets/icons' // icon
import './permission' // permission control import './permission' // permission control
import { getDicts } from "@/api/system/dict/data"; import { getDicts } from "@/api/system/dict/data";
......
dsk-operate-ui/src/router/index.js
View file @ e0e9b4c5
...@@ -136,6 +136,20 @@ export const constantRoutes = [ ...@@ -136,6 +136,20 @@ export const constantRoutes = [
meta: { title: '企业专项债详情', icon: 'radar' } meta: { title: '企业专项债详情', icon: 'radar' }
} }
] ]
},
{
path: '/Land',
component: Layout,
hidden: true,
redirect: 'noredirect',
children: [
{
path: '/radar/Land/details/:id(\\d+)',
component: () => import('@/views/radar/Land/details'),
name: 'LandDetails',
meta: { title: '土地交易详情', icon: 'radar' }
}
]
} }
] ]
......
dsk-operate-ui/src/views/radar/Land/details.vue 0 → 100644
View file @ e0e9b4c5
This diff is collapsed.
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue 0 → 100644
View file @ e0e9b4c5
This diff is collapsed.
dsk-operate-ui/src/views/radar/components/Land/index.vue 0 → 100644
View file @ e0e9b4c5
This diff is collapsed.
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ e0e9b4c5
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
</div> </div>
</div> </div>
<div class="bottomlist"> <div class="bottomlist">
<div class="bottomlist-title"> <div class="bottomlist-title">
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
...@@ -455,7 +456,6 @@ ...@@ -455,7 +456,6 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.content{ .content{
padding: 0px 16px; padding: 0px 16px;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
background: #FFFFFF; background: #FFFFFF;
.content_item{ .content_item{
...@@ -563,10 +563,11 @@ ...@@ -563,10 +563,11 @@
} }
} }
.bottomlist-content{ .bottomlist-content{
padding: 14px;
padding-bottom: 0px; padding-bottom: 0px;
} }
.bottomlist-list{ .bottomlist-list{
padding: 14px;
font-size: 14px; font-size: 14px;
border-bottom: 1px solid #EFEFEF; border-bottom: 1px solid #EFEFEF;
padding-bottom: 14px; padding-bottom: 14px;
......
dsk-operate-ui/src/views/radar/index.vue
View file @ e0e9b4c5
...@@ -14,28 +14,30 @@ ...@@ -14,28 +14,30 @@
</div> </div>
</div> </div>
<debtProject v-if="personnelHerf=='debtProject'" /> <debtProject v-if="personnelHerf=='debtProject'" />
<Land v-if="personnelHerf=='Land'" />
</div> </div>
</template> </template>
<script> <script>
import debtProject from "./components/debtProject/index.vue"; import debtProject from "./components/debtProject/index.vue";
import Land from "./components/Land/index.vue";
import "@/assets/styles/public.css"; import "@/assets/styles/public.css";
export default { export default {
name: 'radar', name: 'radar',
components: { debtProject }, components: { debtProject,Land },
data() { data() {
return { return {
// tablist // tablist
personnelList: [{ personnelList: [{
key: 'debtProject', key: 'debtProject',
status: true, status: false,
value: '企业专项债项目', value: '企业专项债项目',
}, },
{ {
key: 'Builder', key: 'Land',
status: false, status: true,
value: '土地交易', value: '土地交易',
}, },
...@@ -71,7 +73,7 @@ ...@@ -71,7 +73,7 @@
}, },
], ],
personnelHerf:'debtProject' personnelHerf:'Land'
} }
}, },
created() {}, created() {},
...@@ -81,7 +83,7 @@ ...@@ -81,7 +83,7 @@
this.personnelList[i].status = false; this.personnelList[i].status = false;
} }
this.personnelList[index].status = true; this.personnelList[index].status = true;
this.personnelHerf=this.personnelList[index].key;
}, },
} }
} }
......
dsk-system/src/main/java/com/dsk/system/domain/customer/vo/CustomerFollowRecordListVo.java 0 → 100644
View file @ e0e9b4c5
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
View file @ e0e9b4c5
...@@ -57,17 +57,17 @@ public class EnterpriseService { ...@@ -57,17 +57,17 @@ public class EnterpriseService {
//todo 新数据，待入库 //todo 新数据，待入库
public TableDataInfo partners(EnterprisePartnersBody body) throws Exception { 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); return dskOpenApiUtil.responsePage(map);
} }
public TableDataInfo investment(EnterpriseInvestmentBody body) throws Exception { 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); return dskOpenApiUtil.responsePage(map);
} }
public TableDataInfo affiliates(EnterpriseAffiliatesBody body) throws Exception { 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); return dskOpenApiUtil.responsePage(map);
} }
...@@ -105,22 +105,22 @@ public class EnterpriseService { ...@@ -105,22 +105,22 @@ public class EnterpriseService {
} }
public R icInfo(EnterpriseIcInfoBody body) throws Exception { 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); return BeanUtil.toBean(map, R.class);
} }
public TableDataInfo changeInfo(EnterpriseChangeInfoBody body) throws Exception { 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); return dskOpenApiUtil.responsePage(map);
} }
public TableDataInfo keymembers(EnterpriseKeymembersBody body) throws Exception { 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); return dskOpenApiUtil.responsePage(map);
} }
public TableDataInfo bestStockPage(EnterpriseKeymembersBody body) throws Exception { 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); return dskOpenApiUtil.responsePage(map);
} }
} }
dsk-system/src/main/java/com/dsk/system/mapper/CustomerFollowRecordMapper.java
View file @ e0e9b4c5
...@@ -3,6 +3,7 @@ package com.dsk.system.mapper; ...@@ -3,6 +3,7 @@ package com.dsk.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsk.system.domain.customer.CustomerFollowRecord; import com.dsk.system.domain.customer.CustomerFollowRecord;
import com.dsk.system.domain.customer.dto.CustomerFollowRecordSearchDto; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -18,7 +19,7 @@ import java.util.List; ...@@ -18,7 +19,7 @@ import java.util.List;
@Mapper @Mapper
public interface CustomerFollowRecordMapper extends BaseMapper<CustomerFollowRecord> { 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
View file @ e0e9b4c5
...@@ -19,7 +19,7 @@ public interface EconomicService { ...@@ -19,7 +19,7 @@ public interface EconomicService {
*@Author: Dgm *@Author: Dgm
*@date: 2023/5/18 10:25 *@date: 2023/5/18 10:25
*/ */
AjaxResult nationalList(OpRegionalEconomicDataV1Dto dto); AjaxResult nationalPage(OpRegionalEconomicDataV1Dto dto);
/*** /***
*@Description: 全国经济大全详情 *@Description: 全国经济大全详情
......
dsk-system/src/main/java/com/dsk/system/service/ICustomerFollowRecordService.java
View file @ e0e9b4c5
...@@ -3,6 +3,7 @@ package com.dsk.system.service; ...@@ -3,6 +3,7 @@ package com.dsk.system.service;
import com.dsk.system.domain.customer.CustomerFollowRecord; import com.dsk.system.domain.customer.CustomerFollowRecord;
import com.dsk.system.domain.customer.dto.CustomerFollowRecordSearchDto; import com.dsk.system.domain.customer.dto.CustomerFollowRecordSearchDto;
import com.dsk.system.domain.customer.vo.CustomerFollowRecordListVo;
import java.util.List; import java.util.List;
...@@ -14,7 +15,7 @@ import java.util.List; ...@@ -14,7 +15,7 @@ import java.util.List;
*/ */
public interface ICustomerFollowRecordService { public interface ICustomerFollowRecordService {
List<CustomerFollowRecord> selectList(CustomerFollowRecordSearchDto dto); List<CustomerFollowRecordListVo> selectList(CustomerFollowRecordSearchDto dto);
boolean add(CustomerFollowRecord followRecord); boolean add(CustomerFollowRecord followRecord);
......
dsk-system/src/main/java/com/dsk/system/service/SpecialPurposeBondsService.java
View file @ e0e9b4c5
package com.dsk.system.service; package com.dsk.system.service;
import com.dsk.common.core.domain.AjaxResult; import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.dtos.SpecialBondInformationPageDto;
import com.dsk.common.dtos.SpecialPurposeBondsDto; import com.dsk.common.dtos.SpecialPurposeBondsDto;
import com.dsk.common.dtos.SpecialPurposeBondsPageDto;
/** /**
* @ClassName EconomicService * @ClassName EconomicService
...@@ -19,7 +21,7 @@ public interface SpecialPurposeBondsService { ...@@ -19,7 +21,7 @@ public interface SpecialPurposeBondsService {
*@Author: Dgm *@Author: Dgm
*@date: 2023/5/18 10:25 *@date: 2023/5/18 10:25
*/ */
AjaxResult page(SpecialPurposeBondsDto dto); AjaxResult page(SpecialPurposeBondsPageDto dto);
/*** /***
*@Description: 专项债项目详情 *@Description: 专项债项目详情
...@@ -39,4 +41,13 @@ public interface SpecialPurposeBondsService { ...@@ -39,4 +41,13 @@ public interface SpecialPurposeBondsService {
*/ */
AjaxResult bondStatistics(SpecialPurposeBondsDto dto); 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
View file @ e0e9b4c5
package com.dsk.system.service; package com.dsk.system.service;
import com.dsk.common.core.domain.AjaxResult; import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.dtos.UrbanInvestmentPlatformDto;
/** /**
* @ClassName EconomicService * @ClassName EconomicService
...@@ -18,7 +19,7 @@ public interface UrbanInvestmentPlatformService { ...@@ -18,7 +19,7 @@ public interface UrbanInvestmentPlatformService {
*@Author: Dgm *@Author: Dgm
*@date: 2023/5/18 10:25 *@date: 2023/5/18 10:25
*/ */
AjaxResult page(); AjaxResult page(UrbanInvestmentPlatformDto dto);
/*** /***
*@Description: 城投平台详情 *@Description: 城投平台详情
...@@ -28,4 +29,13 @@ public interface UrbanInvestmentPlatformService { ...@@ -28,4 +29,13 @@ public interface UrbanInvestmentPlatformService {
*@date: 2023/5/18 10:25 *@date: 2023/5/18 10:25
*/ */
AjaxResult details(String id); 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
View file @ e0e9b4c5
...@@ -7,6 +7,7 @@ import com.dsk.common.annotation.DataScope; ...@@ -7,6 +7,7 @@ import com.dsk.common.annotation.DataScope;
import com.dsk.common.utils.SecurityUtils; import com.dsk.common.utils.SecurityUtils;
import com.dsk.system.domain.customer.CustomerFollowRecord; import com.dsk.system.domain.customer.CustomerFollowRecord;
import com.dsk.system.domain.customer.dto.CustomerFollowRecordSearchDto; 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.mapper.CustomerFollowRecordMapper;
import com.dsk.system.service.ICustomerFollowRecordService; import com.dsk.system.service.ICustomerFollowRecordService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -30,19 +31,13 @@ public class CustomerFollowRecordServiceImpl implements ICustomerFollowRecordSer ...@@ -30,19 +31,13 @@ public class CustomerFollowRecordServiceImpl implements ICustomerFollowRecordSer
private CustomerFollowRecordMapper baseMapper; private CustomerFollowRecordMapper baseMapper;
@Override @Override
// @DataScope(deptAlias = "d",userAlias = "u") @DataScope(deptAlias = "d",userAlias = "u")
public List<CustomerFollowRecord> selectList(CustomerFollowRecordSearchDto dto) { public List<CustomerFollowRecordListVo> selectList(CustomerFollowRecordSearchDto dto) {
LambdaQueryWrapper<CustomerFollowRecord> wrapper = Wrappers.lambdaQuery(); if (ObjectUtils.isEmpty(dto.getCustomerId())) {
if (!ObjectUtils.isEmpty(dto.getCustomerId())) { dto.setUserId(SecurityUtils.getUserId());
wrapper.eq(CustomerFollowRecord::getCustomerId, dto.getCustomerId());
} else {
wrapper.eq(CustomerFollowRecord::getUserId, SecurityUtils.getUserId());
} }
wrapper.orderByDesc(CustomerFollowRecord::getCreateTime); // log.debug("dto.params.dataScope{}",dto.getParams().get("dataScope"));
return baseMapper.selectList(wrapper); return baseMapper.selectAuthList(dto);
// dto.setUserId(SecurityUtils.getUserId());
// return baseMapper.selectAuthList(dto);
} }
@Override @Override
......
dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java
View file @ e0e9b4c5
...@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; ...@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import com.dsk.common.core.domain.AjaxResult; import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto; import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
import com.dsk.common.utils.DskOpenApiUtil; import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.system.mapper.OpRegionalEconomicDataV1Mapper;
import com.dsk.system.service.EconomicService; import com.dsk.system.service.EconomicService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -25,60 +24,9 @@ public class EconomicServiceImpl implements EconomicService { ...@@ -25,60 +24,9 @@ public class EconomicServiceImpl implements EconomicService {
@Autowired @Autowired
private DskOpenApiUtil dskOpenApiUtil; private DskOpenApiUtil dskOpenApiUtil;
@Autowired
private OpRegionalEconomicDataV1Mapper mapper;
@Override @Override
public AjaxResult nationalList(OpRegionalEconomicDataV1Dto dto) { public AjaxResult nationalPage(OpRegionalEconomicDataV1Dto dto) {
// SELECT Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/national/nationalPage", BeanUtil.beanToMap(dto, false, false));
// id,
// `year`,
// province,
// city,
// area,
// gdp,
// gdp_add_value,
// gdp_growth,
// gdp_per_capita,
// pi_add_value,
// si_add_value,
// ti_add_value,
// population,
// population_growth_rate,
// population_add_value,
// industry_add_value,
// industry_total_value,
// fixed_investment,
// real_estate_investment,
// exim_total_value,
// trscg,
// urban_pcdi,
// gbr,
// gbr_growth,
// tax_income,
// transfer_income,
// superior_subsidy_income,
// gbe,
// gov_fund_income,
// land_transfer_income,
// gov_fund_expenditure,
// soecoi,
// soecoe,
// gov_debt_balance,
// general_debt_balance,
// special_debt_balance,
// gov_debt_limit,
// uip_interest_bearing_debt,
// fiscal_self_sufficiency_rate,
// gov_debt_to_gdp_rate,
// gov_debt_to_gdp_rate_wild,
// gov_debt_rate,
// gov_debt_rate_wild,
// is_deal,
// is_statua
//FROM
// `op_regional_economic_data_v1`;
Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
...@@ -86,25 +34,25 @@ public class EconomicServiceImpl implements EconomicService { ...@@ -86,25 +34,25 @@ public class EconomicServiceImpl implements EconomicService {
public AjaxResult details(Integer id) { public AjaxResult details(Integer id) {
Map<String, Object> bodyMap = new HashMap<>(1); Map<String, Object> bodyMap = new HashMap<>(1);
bodyMap.put("id", id); 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); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override @Override
public AjaxResult statisticsRegional(OpRegionalEconomicDataV1Dto dto) { 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); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override @Override
public AjaxResult regionalList(OpRegionalEconomicDataV1Dto dto) { 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); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override @Override
public AjaxResult regionalComparison(OpRegionalEconomicDataV1Dto dto) { 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); return BeanUtil.toBean(map, AjaxResult.class);
} }
......
dsk-system/src/main/java/com/dsk/system/service/impl/SpecialPurposeBondsServiceImpl.java
View file @ e0e9b4c5
...@@ -2,9 +2,10 @@ package com.dsk.system.service.impl; ...@@ -2,9 +2,10 @@ package com.dsk.system.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.dsk.common.core.domain.AjaxResult; import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.dtos.SpecialBondInformationPageDto;
import com.dsk.common.dtos.SpecialPurposeBondsDto; import com.dsk.common.dtos.SpecialPurposeBondsDto;
import com.dsk.common.dtos.SpecialPurposeBondsPageDto;
import com.dsk.common.utils.DskOpenApiUtil; import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.system.service.EconomicService;
import com.dsk.system.service.SpecialPurposeBondsService; import com.dsk.system.service.SpecialPurposeBondsService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -26,8 +27,8 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic ...@@ -26,8 +27,8 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
private DskOpenApiUtil dskOpenApiUtil; private DskOpenApiUtil dskOpenApiUtil;
@Override @Override
public AjaxResult page(SpecialPurposeBondsDto dto) { public AjaxResult page(SpecialPurposeBondsPageDto dto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/api/specialPurposeBonds/projects/page", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
...@@ -35,13 +36,19 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic ...@@ -35,13 +36,19 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
public AjaxResult details(String id) { public AjaxResult details(String id) {
Map<String, Object> bodyMap = new HashMap<>(1); Map<String, Object> bodyMap = new HashMap<>(1);
bodyMap.put("id", id); 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); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override @Override
public AjaxResult bondStatistics(SpecialPurposeBondsDto dto) { 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); return BeanUtil.toBean(map, AjaxResult.class);
} }
} }
dsk-system/src/main/java/com/dsk/system/service/impl/UrbanInvestmentPlatformServiceImpl.java
View file @ e0e9b4c5
...@@ -2,12 +2,13 @@ package com.dsk.system.service.impl; ...@@ -2,12 +2,13 @@ package com.dsk.system.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.dsk.common.core.domain.AjaxResult; import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.dtos.UrbanInvestmentPlatformDto;
import com.dsk.common.utils.DskOpenApiUtil; import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.system.service.EconomicService;
import com.dsk.system.service.UrbanInvestmentPlatformService; import com.dsk.system.service.UrbanInvestmentPlatformService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
...@@ -24,14 +25,22 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo ...@@ -24,14 +25,22 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
private DskOpenApiUtil dskOpenApiUtil; private DskOpenApiUtil dskOpenApiUtil;
@Override @Override
public AjaxResult page() { public AjaxResult page(UrbanInvestmentPlatformDto pageDto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/xx", null); Map<String, Object> map = dskOpenApiUtil.requestBody("/api/urbanInvestment/page", BeanUtil.beanToMap(pageDto, false, false));
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override @Override
public AjaxResult details(String id) { 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); return BeanUtil.toBean(map, AjaxResult.class);
} }
} }
dsk-system/src/main/resources/mapper/system/customer/CustomerFollowRecordMapper.xml
View file @ e0e9b4c5
...@@ -7,16 +7,20 @@ ...@@ -7,16 +7,20 @@
cfr.content, cfr.create_time cfr.content, cfr.create_time
</sql> </sql>
<select id="selectAuthList" resultType="com.dsk.system.domain.customer.CustomerFollowRecord"> <select id="selectAuthList" resultType="com.dsk.system.domain.customer.vo.CustomerFollowRecordListVo">
select select
<include refid="Base_Bean"></include> ct.company_name, u.nick_name,
<include refid="Base_Bean"></include>
from customer_follow_record cfr 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_user u on u.user_id = cfr.user_id
join sys_dept d on d.dept_id = u.dept_id left join sys_dept d on d.dept_id = u.dept_id
where cfr.user_id = #{dto.userId} <where>
<if test="dto.customerId != null and dto.customerId != '' "> and cfr.customer_id = #{dto.customerId} </if> <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 order by cfr.create_time desc
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment