From 80215f3a8459137f1b3b69353ed22311285bc793 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 25 Apr 2023 18:00:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=81=E8=A1=8C=E4=B8=9A=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8=EF=BC=8C=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IndustryDictionary.java | 17 +++++ .../IndustryDictionaryDetailsVo.java | 17 +++++ .../IndustryDictionaryDto.java | 17 +++++ .../IndustryDictionaryFeign.java | 18 +++++ .../IndustryDictionaryFeignFallback.java | 11 +++ .../IndustryDictionaryQuery.java | 17 +++++ .../IndustryDictionaryVo.java | 17 +++++ .../ProjectInformation.java | 29 ++++++++ .../ProjectInformationDetailsVo.java | 13 ++++ .../ProjectInformationDto.java | 44 ++++++++++++ .../ProjectInformationFeign.java | 18 +++++ .../ProjectInformationFeignFallback.java | 11 +++ .../ProjectInformationQuery.java | 31 +++++++++ .../ProjectInformationVo.java | 48 +++++++++++++ .../ProjectTypeDictionary.java | 17 +++++ .../ProjectTypeDictionaryDetailsVo.java | 17 +++++ .../ProjectTypeDictionaryDto.java | 17 +++++ .../ProjectTypeDictionaryFeign.java | 17 +++++ .../ProjectTypeDictionaryFeignFallback.java | 11 +++ .../ProjectTypeDictionaryQuery.java | 18 +++++ .../ProjectTypeDictionaryVo.java | 17 +++++ .../EnterpriseInformationMapper.java | 2 +- .../EnterpriseInformationMapper.xml | 5 +- .../EnterpriseInformationRest.java | 9 +++ .../EnterpriseInformationService.java | 3 + .../IndustryDictionaryMapper.java | 25 +++++++ .../IndustryDictionaryMapper.xml | 24 +++++++ .../IndustryDictionaryRest.java | 67 ++++++++++++++++++ .../IndustryDictionaryService.java | 69 +++++++++++++++++++ .../LoanBankInformationMapper.java | 1 + .../LoanBankInformationMapper.xml | 12 +++- .../LoanBankInformationRest.java | 9 +++ .../LoanBankInformationService.java | 8 +++ .../ProjectInformationMapper.java | 21 ++++++ .../ProjectInformationMapper.xml | 52 ++++++++++++++ .../ProjectInformationRest.java | 60 ++++++++++++++++ .../ProjectInformationService.java | 59 ++++++++++++++++ .../ProjectTypeDictionaryMapper.java | 24 +++++++ .../ProjectTypeDictionaryMapper.xml | 24 +++++++ .../ProjectTypeDictionaryRest.java | 64 +++++++++++++++++ .../ProjectTypeDictionaryService.java | 68 ++++++++++++++++++ .../supervise-customer-biz/pom.xml | 6 ++ .../biz/gdinstoragegd/GdInstorageGdRest.java | 18 ++++- .../gdinstoragegd/GdInstorageGdService.java | 33 +++------ 44 files changed, 1055 insertions(+), 30 deletions(-) create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionary.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDetailsVo.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDto.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryFeign.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryFeignFallback.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryQuery.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryVo.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformation.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDetailsVo.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeign.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeignFallback.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionary.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDetailsVo.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryFeign.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryFeignFallback.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryQuery.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.xml create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryRest.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryService.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.xml create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryRest.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionary.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionary.java new file mode 100644 index 00000000..b85d15ec --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionary.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.industrydictionary; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:34 + */ +@Data +@ApiModel(value = "所属行业字典", description = "所属行业字典") +@TableName("industry_dictionary") +public class IndustryDictionary extends BaseEntity { + private String industryName; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDetailsVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDetailsVo.java new file mode 100644 index 00000000..b1b1b799 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDetailsVo.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.industrydictionary; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:36 + */ +@Data +@ApiModel(value = "所属行业字典 视图数据详情", description = "所属行业字典 视图数据详情") +public class IndustryDictionaryDetailsVo implements Vo { + private String industryName; + private String id; + private String sid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDto.java new file mode 100644 index 00000000..4f496631 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryDto.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.industrydictionary; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:36 + */ +@ApiModel(value = "所属行业字典 数据传输对象", description = "所属行业字典 数据传输对象") +@Data +public class IndustryDictionaryDto implements Dto { + private String industryName; + private String id; + private String sid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryFeign.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryFeign.java new file mode 100644 index 00000000..eeb337de --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryFeign.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.crm.api.industrydictionary; + +import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationFeignFallback; +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @author wangpengfei + * @date 2023/4/25 9:36 + */ +@Api(tags = "所属行业字典") +@FeignClient( + contextId = "supervise-crm-industrydictionary", + name = "supervise-crm", + path = "v1/industrydictionary", + fallback = IndustryDictionaryFeignFallback.class) +public interface IndustryDictionaryFeign { +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryFeignFallback.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryFeignFallback.java new file mode 100644 index 00000000..7a9a2d76 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryFeignFallback.java @@ -0,0 +1,11 @@ +package com.yxt.supervise.crm.api.industrydictionary; + +import org.springframework.stereotype.Component; + +/** + * @author wangpengfei + * @date 2023/4/25 9:37 + */ +@Component +public class IndustryDictionaryFeignFallback { +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryQuery.java new file mode 100644 index 00000000..bc3417ff --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryQuery.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.industrydictionary; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:37 + */ +@ApiModel(value = "所属行业字典 查询条件", description = "所属行业字典 查询条件") +@Data +public class IndustryDictionaryQuery implements Query { + private String industryName; + private String id; + private String sid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryVo.java new file mode 100644 index 00000000..e211b0d9 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/industrydictionary/IndustryDictionaryVo.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.industrydictionary; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:37 + */ +@ApiModel(value = "所属行业字典 视图数据对象", description = "所属行业字典 视图数据对象") +@Data +public class IndustryDictionaryVo implements Vo { + private String industryName; + private String id; + private String sid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformation.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformation.java new file mode 100644 index 00000000..bc2e4a38 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformation.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.crm.api.projectinformation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:27 + */ +@Data +@ApiModel(value = "项目信息", description = "项目信息") +@TableName("project_information") +public class ProjectInformation extends BaseEntity { + private String entryName; + private String engaDate; + private String creditLimit; + private String signingDate; + private String endDate; + private String regulatoryLeader; + private String generalManager; + private String fillInDate; + private String bankSid; + private String managerSid; + private String enterpriseSid; + private String industrySid; + private String typeSid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDetailsVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDetailsVo.java new file mode 100644 index 00000000..7695c399 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDetailsVo.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.crm.api.projectinformation; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:28 + */ +@Data +@ApiModel(value = "项目信息 视图数据详情", description = "项目信息 视图数据详情") +public class ProjectInformationDetailsVo { +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java new file mode 100644 index 00000000..1ff771e4 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java @@ -0,0 +1,44 @@ +package com.yxt.supervise.crm.api.projectinformation; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:28 + */ +@ApiModel(value = "项目信息 数据传输对象", description = "项目信息 数据传输对象") +@Data +public class ProjectInformationDto implements Dto { + private String id; + private String sid; + //项目名称 + private String entryName; + //接洽日期 + private String engaDate; + //授信额度 + private String creditLimit; + //签约日期 + private String signingDate; + //结束日期 + private String endDate; + //监管负责人 + private String regulatoryLeader; + //事业部总经理 + private String generalManager; + //填表日期 + private String fillInDate; + //银行sid + private String bankSid; + //银行负责人sid + private String managerSid; + //企业sid + private String enterpriseSid; + //行业sid + private String industrySid; + //项目类型sid + private String typeSid; + //项目说明 + private String remarks; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeign.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeign.java new file mode 100644 index 00000000..271820d1 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeign.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.crm.api.projectinformation; + +import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationFeignFallback; +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @author wangpengfei + * @date 2023/4/25 9:28 + */ +@Api(tags = "项目信息") +@FeignClient( + contextId = "supervise-crm-projectinformation", + name = "supervise-crm", + path = "v1/projectinformation", + fallback = ProjectInformationFeignFallback.class) +public interface ProjectInformationFeign { +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeignFallback.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeignFallback.java new file mode 100644 index 00000000..56aa151a --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeignFallback.java @@ -0,0 +1,11 @@ +package com.yxt.supervise.crm.api.projectinformation; + +import org.springframework.stereotype.Component; + +/** + * @author wangpengfei + * @date 2023/4/25 9:29 + */ +@Component +public class ProjectInformationFeignFallback { +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java new file mode 100644 index 00000000..1f56ef7f --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.crm.api.projectinformation; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:29 + */ +@ApiModel(value = "项目信息 查询条件", description = "项目信息 查询条件") +@Data +public class ProjectInformationQuery implements Query { + private String id; + private String sid; + private String entryName; + private String engaDate; + private String creditLimit; + private String signingDate; + private String endDate; + private String regulatoryLeader; + private String generalManager; + private String fillInDate; + private String bankSid; + private String bManagerSid; + private String enterpriseSid; + private String industrySid; + private String typeSid; + private String remarks; + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java new file mode 100644 index 00000000..4db9522c --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java @@ -0,0 +1,48 @@ +package com.yxt.supervise.crm.api.projectinformation; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:29 + */ +@ApiModel(value = "项目信息 视图数据对象", description = "项目信息 视图数据对象") +@Data +public class ProjectInformationVo implements Vo { + private String id ; + private String sid; + //项目名称 + private String entryName; + //所属行业 + private String industryName; + //项目类型 + private String typeName; + //授信额度 + private String creditLimit; + //贷款行 + private String bankName; + //客户经理 + private String bManagerName; + //签约日期 + private String signingDate; + //结束日期 + private String endDate; + //企业名称 + private String enterpriseName; + //联系人 + private String eContacts; + //监管负责人 + private String regulatoryLeader; + + private String generalManager; + private String fillInDate; + private String bankSid; + private String managerSid; + private String enterpriseSid; + private String industrySid; + private String typeSid; + private String remarks; + private String engaDate; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionary.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionary.java new file mode 100644 index 00000000..94d5eab3 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionary.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.projecttypedictionary; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:27 + */ +@Data +@ApiModel(value = "项目类型字典", description = "项目类型字典") +@TableName("project_type_dictionary") +public class ProjectTypeDictionary extends BaseEntity { + private String typeName; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDetailsVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDetailsVo.java new file mode 100644 index 00000000..336f4b14 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDetailsVo.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.projecttypedictionary; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:28 + */ +@Data +@ApiModel(value = "项目类型字典 视图数据详情", description = "项目类型字典 视图数据详情") +public class ProjectTypeDictionaryDetailsVo { + private String typeName; + private String id; + private String sid; + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java new file mode 100644 index 00000000..e217237b --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.projecttypedictionary; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:28 + */ +@ApiModel(value = "项目类型字典 数据传输对象", description = "项目类型字典 数据传输对象") +@Data +public class ProjectTypeDictionaryDto implements Dto { + private String typeName; + private String id; + private String sid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryFeign.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryFeign.java new file mode 100644 index 00000000..8db8128d --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryFeign.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.projecttypedictionary; + +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @author wangpengfei + * @date 2023/4/25 9:28 + */ +@Api(tags = "项目类型字典") +@FeignClient( + contextId = "supervise-crm-projecttypedictionary", + name = "supervise-crm", + path = "v1/projecttypedictionary", + fallback = ProjectTypeDictionaryFeignFallback.class) +public interface ProjectTypeDictionaryFeign { +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryFeignFallback.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryFeignFallback.java new file mode 100644 index 00000000..a0b52adb --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryFeignFallback.java @@ -0,0 +1,11 @@ +package com.yxt.supervise.crm.api.projecttypedictionary; + +import org.springframework.stereotype.Component; + +/** + * @author wangpengfei + * @date 2023/4/25 9:29 + */ +@Component +public class ProjectTypeDictionaryFeignFallback { +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryQuery.java new file mode 100644 index 00000000..d5fbba04 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryQuery.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.crm.api.projecttypedictionary; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:29 + */ +@ApiModel(value = "项目类型字典 查询条件", description = "项目类型字典 查询条件") +@Data +public class ProjectTypeDictionaryQuery implements Query { + private String typeName; + private String id; + private String sid; + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java new file mode 100644 index 00000000..29e3d566 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.projecttypedictionary; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/25 9:29 + */ +@ApiModel(value = "项目类型字典 视图数据对象", description = "项目类型字典 视图数据对象") +@Data +public class ProjectTypeDictionaryVo implements Vo { + private String typeName; + private String id; + private String sid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.java index 0ff4498e..24dec6b0 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.java @@ -24,5 +24,5 @@ public interface EnterpriseInformationMapper extends BaseMapper getBankManager(@Param("sid") String sid); //根据sid下级 - List bankList(@Param("sid") String sid); + List EnterpriseList(); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.xml index 81e85440..21bf5544 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.xml @@ -21,9 +21,8 @@ FROM bank_manager WHERE bankSid=#{sid} - SELECT * - FROM loan_bank_information - WHERE psid=#{sid} + FROM enterprise_information \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationRest.java index cc4c8676..62da7a75 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationRest.java @@ -12,6 +12,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author wangpengfei * @date 2023/4/12 11:49 @@ -31,6 +33,13 @@ public class EnterpriseInformationRest { PagerVo pv = EnterpriseInformationService.listPageVo(pq); return rb.success().setData(pv); } + @ApiOperation("查询全部企业") + @PostMapping("/list") + public ResultBean> EnterpriseList() { + ResultBean rb = ResultBean.fireFail(); + List pv = EnterpriseInformationService.EnterpriseList(); + return rb.success().setData(pv); + } @ApiOperation("保存") @PostMapping("/save") public ResultBean save(@RequestBody EnterpriseInformationDto dto) { diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationService.java index 0782c104..c11a3679 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationService.java @@ -65,4 +65,7 @@ public class EnterpriseInformationService extends MybatisBaseService().eq("sid",sid)); return rb.success().setMsg("删除企业信息成功"); } + public List EnterpriseList(){ + return baseMapper.EnterpriseList(); + } } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.java new file mode 100644 index 00000000..863b480c --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.crm.biz.industrydictionary; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.crm.api.industrydictionary.IndustryDictionary; +import com.yxt.supervise.crm.api.industrydictionary.IndustryDictionaryVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/12 17:09 + */ +@Mapper +public interface IndustryDictionaryMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectList(); + IndustryDictionaryVo getIndustryBySid( @Param("sid") String sid); + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.xml new file mode 100644 index 00000000..642ef206 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryRest.java new file mode 100644 index 00000000..57a47ba0 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryRest.java @@ -0,0 +1,67 @@ +package com.yxt.supervise.crm.biz.industrydictionary; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.industrydictionary.IndustryDictionaryDto; +import com.yxt.supervise.crm.api.industrydictionary.IndustryDictionaryFeign; +import com.yxt.supervise.crm.api.industrydictionary.IndustryDictionaryQuery; +import com.yxt.supervise.crm.api.industrydictionary.IndustryDictionaryVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/12 17:10 + */ +@Api(tags = "所属行业字典信息") +@RestController +@RequestMapping("v1/industrydictionary") +public class IndustryDictionaryRest implements IndustryDictionaryFeign { + @Autowired + IndustryDictionaryService IndustryDictionaryService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = IndustryDictionaryService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("查询字典数据") + @PostMapping("/list") + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List pv = IndustryDictionaryService.industrylist(); + return rb.success().setData(pv); + } + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody IndustryDictionaryDto dto) { + return IndustryDictionaryService.save(dto); + } + + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody IndustryDictionaryDto dto) { + return IndustryDictionaryService.update(dto); + } + + @ApiOperation("根据sid查询") + @GetMapping("/getIndustryBySid/{sid}") + public ResultBean getWarehouse(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + IndustryDictionaryVo IndustryDictionaryVo=IndustryDictionaryService.getIndustryBySid(sid); + return rb.success().setData(IndustryDictionaryVo); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid) { + return IndustryDictionaryService.delete(sid); + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryService.java new file mode 100644 index 00000000..b77cab72 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/industrydictionary/IndustryDictionaryService.java @@ -0,0 +1,69 @@ +package com.yxt.supervise.crm.biz.industrydictionary; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.industrydictionary.IndustryDictionary; +import com.yxt.supervise.crm.api.industrydictionary.IndustryDictionaryDto; +import com.yxt.supervise.crm.api.industrydictionary.IndustryDictionaryQuery; +import com.yxt.supervise.crm.api.industrydictionary.IndustryDictionaryVo; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/12 17:10 + */ +@Service +public class IndustryDictionaryService extends MybatisBaseService { + + public PagerVo listPageVo(PagerQuery pq) { + IndustryDictionaryQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); +// if(StringUtils.isNotBlank(query.getEnterpriseName())){ +// qw.like("enterpriseName",query.getEnterpriseName()); +// } +// if(StringUtils.isNotBlank(query.getTelephone())){ +// qw.like("telephone",query.getTelephone()); +// } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List industrylist() { + List list = baseMapper.selectList(); + return list; + } + public ResultBean save(IndustryDictionaryDto dto) { + ResultBean rb=new ResultBean(); + IndustryDictionary entity=new IndustryDictionary(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("保存仓库信息成功"); + } + public ResultBean update(IndustryDictionaryDto dto) { + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + IndustryDictionary entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改仓库信息成功"); + } + public IndustryDictionaryVo getIndustryBySid(String sid){ + IndustryDictionaryVo bank=baseMapper.getIndustryBySid(sid); + return bank; + } + public ResultBean delete(String sid) { + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除仓库信息成功"); + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java index 5d10bc1d..83ee6d75 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java @@ -22,6 +22,7 @@ import java.util.List; @Mapper public interface LoanBankInformationMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + List banksList(); LoanBankInformationVo getBankInformation( @Param("sid") String sid); //查询联系人 List getBankManager(@Param("sid") String sid); diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml index e8415821..1319e519 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml @@ -10,6 +10,10 @@ ${ew.sqlSegment} + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationRest.java index c1120f9d..aa0a61e0 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationRest.java @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author wangpengfei * @date 2023/4/11 16:14 @@ -29,6 +31,13 @@ public class LoanBankInformationRest implements LoanBankInformationFeign { PagerVo pv = loanBankInformationService.listPageVo(pq); return rb.success().setData(pv); } + @ApiOperation("查询银行全部数据") + @PostMapping("/list") + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List pv = loanBankInformationService.bankList(); + return rb.success().setData(pv); + } @ApiOperation("保存") @PostMapping("/save") public ResultBean save(@RequestBody LoanBankInformationDto dto) { diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java index 7a13a21a..d166f76f 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java @@ -41,6 +41,14 @@ public class LoanBankInformationService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + public List bankList() { + List pagging = baseMapper.bankList(null); + for(LoanBankInformationVo p: pagging){ + p.setManagerList(baseMapper.getBankManager(p.getSid())); + } + return pagging; + } + public ResultBean save(LoanBankInformationDto dto) { ResultBean rb=new ResultBean(); if(dto.getPSid().equals("")){ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java new file mode 100644 index 00000000..e1a7362c --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.crm.biz.projectinformation; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.crm.api.projectinformation.ProjectInformation; +import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2023/4/12 17:09 + */ +@Mapper +public interface ProjectInformationMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + ProjectInformationVo getProjectBySid( @Param("sid") String sid); + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml new file mode 100644 index 00000000..ff541329 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml @@ -0,0 +1,52 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java new file mode 100644 index 00000000..d3149213 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java @@ -0,0 +1,60 @@ +package com.yxt.supervise.crm.biz.projectinformation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.projectinformation.ProjectInformationDto; +import com.yxt.supervise.crm.api.projectinformation.ProjectInformationFeign; +import com.yxt.supervise.crm.api.projectinformation.ProjectInformationQuery; +import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/4/12 17:10 + */ +@Api(tags = "项目信息") +@RestController +@RequestMapping("v1/projectinformation") +public class ProjectInformationRest implements ProjectInformationFeign { + @Autowired + ProjectInformationService ProjectInformationService; + + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = ProjectInformationService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectInformationDto dto) { + return ProjectInformationService.save(dto); + } + + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody ProjectInformationDto dto) { + return ProjectInformationService.update(dto); + } + + @ApiOperation("根据sid查询") + @GetMapping("/getProjectBySid/{sid}") + public ResultBean getWarehouse(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + ProjectInformationVo ProjectInformationVo=ProjectInformationService.getProjectBySid(sid); + return rb.success().setData(ProjectInformationVo); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid) { + return ProjectInformationService.delete(sid); + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java new file mode 100644 index 00000000..f1e04722 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java @@ -0,0 +1,59 @@ +package com.yxt.supervise.crm.biz.projectinformation; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.projectinformation.ProjectInformation; +import com.yxt.supervise.crm.api.projectinformation.ProjectInformationDto; +import com.yxt.supervise.crm.api.projectinformation.ProjectInformationQuery; +import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/4/12 17:10 + */ +@Service +public class ProjectInformationService extends MybatisBaseService { + public PagerVo listPageVo(PagerQuery pq) { + ProjectInformationQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getEntryName())){ + qw.like("info.entryName",query.getEntryName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean save(ProjectInformationDto dto) { + ResultBean rb=new ResultBean(); + ProjectInformation entity=new ProjectInformation(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("保存项目信息成功"); + } + public ResultBean update(ProjectInformationDto dto) { + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + ProjectInformation entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改项目信息成功"); + } + public ProjectInformationVo getProjectBySid(String sid){ + ProjectInformationVo bank=baseMapper.getProjectBySid(sid); + return bank; + } + public ResultBean delete(String sid) { + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除项目信息成功"); + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.java new file mode 100644 index 00000000..c20365fe --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.crm.biz.projecttypedictionary; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionary; +import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionaryVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/12 17:09 + */ +@Mapper +public interface ProjectTypeDictionaryMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + List typeList(); + ProjectTypeDictionaryVo getProjectTypeBySid( @Param("sid") String sid); + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.xml new file mode 100644 index 00000000..181a1e52 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryRest.java new file mode 100644 index 00000000..409e0e25 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryRest.java @@ -0,0 +1,64 @@ +package com.yxt.supervise.crm.biz.projecttypedictionary; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionaryDto; +import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionaryFeign; +import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionaryQuery; +import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionaryVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/12 17:10 + */ +@Api(tags = "仓库位置信息") +@RestController +@RequestMapping("v1/projtypedictionary") +public class ProjectTypeDictionaryRest implements ProjectTypeDictionaryFeign { + @Autowired + ProjectTypeDictionaryService ProjectTypeDictionaryService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = ProjectTypeDictionaryService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("查询项目类型字典") + @PostMapping("/list") + public ResultBean> listPage() { + ResultBean rb = ResultBean.fireFail(); + List pv = ProjectTypeDictionaryService.typeList(); + return rb.success().setData(pv); + } + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectTypeDictionaryDto dto) { + return ProjectTypeDictionaryService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody ProjectTypeDictionaryDto dto) { + return ProjectTypeDictionaryService.update(dto); + } + @ApiOperation("根据sid查询") + @GetMapping("/getProjTypeBySid/{sid}") + public ResultBean getWarehouse(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + ProjectTypeDictionaryVo ProjectTypeDictionaryVo=ProjectTypeDictionaryService.getProjectTypeBySid(sid); + return rb.success().setData(ProjectTypeDictionaryVo); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid) { + return ProjectTypeDictionaryService.delete(sid); + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java new file mode 100644 index 00000000..965eb287 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java @@ -0,0 +1,68 @@ +package com.yxt.supervise.crm.biz.projecttypedictionary; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionary; +import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionaryDto; +import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionaryQuery; +import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionaryVo; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/12 17:10 + */ +@Service +public class ProjectTypeDictionaryService extends MybatisBaseService { + public PagerVo listPageVo(PagerQuery pq) { + ProjectTypeDictionaryQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); +// if(StringUtils.isNotBlank(query.getEnterpriseName())){ +// qw.like("enterpriseName",query.getEnterpriseName()); +// } +// if(StringUtils.isNotBlank(query.getTelephone())){ +// qw.like("telephone",query.getTelephone()); +// } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List typeList() { + List pagging = baseMapper.typeList(); + return pagging; + } + public ResultBean save(ProjectTypeDictionaryDto dto) { + ResultBean rb=new ResultBean(); + ProjectTypeDictionary entity=new ProjectTypeDictionary(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("保存仓库信息成功"); + } + public ResultBean update(ProjectTypeDictionaryDto dto) { + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + ProjectTypeDictionary entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改仓库信息成功"); + } + public ProjectTypeDictionaryVo getProjectTypeBySid(String sid){ + ProjectTypeDictionaryVo bank=baseMapper.getProjectTypeBySid(sid); + return bank; + } + public ResultBean delete(String sid) { + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除仓库信息成功"); + } +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml index e154d646..dcee55aa 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml @@ -129,6 +129,12 @@ 0.0.1-SNAPSHOT compile + + com.yxt.supervise + supervise-report-biz + 0.0.1 + compile + diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java index 8a277c4f..1275287a 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java @@ -54,7 +54,23 @@ public class GdInstorageGdRest implements GdInstorageGdFeign { } @PostMapping("/uploadRkmxb") public ResultBean uploadGdData(@RequestParam("file") MultipartFile file) { - return gdInstorageGdService.uploadAndInsert(file); + ResultBean rb = ResultBean.fireFail(); + GdInstorageLog gdInstorageLog=gdInstorageGdService.uploadAndInsert(file); + gdInstorageLog.getOrderDate(); + rb.success().setData(gdInstorageLog); + return rb; } + public class GdSalesThread extends Thread{ + String orderDate; + public GdSalesThread(String orderDate) { + this.orderDate = orderDate; + } + public void run(){ + + System.out.println("excel线程开启"); + gdInstorageGdService.uploadAndInsert(null); + System.out.println("excel线程结束"); + } + } } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java index 5e5d916d..9b4e825e 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java @@ -37,6 +37,8 @@ import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService; import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLog; import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLogDto; import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLogVo; +import com.yxt.supervise.report.biz.reportsalesdaygather.ReportSalesDayGatherService; +import com.yxt.supervise.report.biz.reportsalesdaylog.ReportSalesDayLogService; import lombok.experimental.Accessors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -77,6 +79,10 @@ public class GdInstorageGdService extends MybatisBaseService listPageVo(PagerQuery pq) { @@ -139,29 +145,9 @@ public class GdInstorageGdService extends MybatisBaseService pagging = baseMapper.exportExcel(qw); return pagging; } - public class GdSalesThread extends Thread{ - String orderDate; - public GdSalesThread(String orderDate) { - this.orderDate = orderDate; - } - public void run(){ - System.out.println("excel线程开启"); - synchronized (orderDate){ - ReportSalesDayLogVo reportLog=baseMapper.getReportLog(orderDate); - ReportSalesDayLog ReportSalesDayLog=new ReportSalesDayLog(); - if(reportLog.equals(null)|| reportLog.equals("")){ - ReportSalesDayLogDto dto=new ReportSalesDayLogDto(); - BeanUtil.copyProperties(dto, ReportSalesDayLog, "sid"); - baseMapper.insertReportLog(ReportSalesDayLog); - } - BeanUtil.copyProperties(reportLog, ReportSalesDayLog, "sid"); - baseMapper.udpateReportLog(ReportSalesDayLog); - } - System.out.println("excel线程结束"); - } - } - public ResultBean uploadAndInsert(MultipartFile file) { + + public GdInstorageLog uploadAndInsert(MultipartFile file) { ResultBean rb = ResultBean.fireFail(); ResultBean fub = fileUploadComponent.uploadFile(file, "rkmxb"); @@ -175,7 +161,7 @@ public class GdInstorageGdService extends MybatisBaseService