From 8b0ca0a6fa2a7cb4f98eab8e5c015254faeb27e2 Mon Sep 17 00:00:00 2001 From: yxt_njy <119782786@qq.com> Date: Fri, 3 Mar 2023 16:46:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B1=87=E8=9E=8D=E9=93=B6?= =?UTF-8?q?=E8=A1=8C=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/layout/components/Navbar.vue | 9 +- .../layout/components/Sidebar/SidebarItem.vue | 16 +-- supervise-customer-ui/src/settings.js | 2 +- supervise-customer-ui/src/styles/index.scss | 47 ++++---- .../supplierbankinfo/supplierbankinfo.vue | 29 ++--- .../supplierbankinfo/supplierbankinfoAdd.vue | 11 +- supervise-customer-ui/vue.config.js | 2 +- .../CustomerSupplierFeign.java | 13 -- .../CustomerSupplierFeignFallback.java | 7 -- .../CustomerSupplierIndex.java | 25 ---- .../CustomerSupplierIndexDto.java | 22 ---- .../CustomerSupplierIndexFeign.java | 13 -- .../CustomerSupplierIndexFeignFallback.java | 7 -- .../CustomerSupplierIndexVo.java | 22 ---- .../supervise/rms/api/supplier/Supplier.java | 57 +++++++++ .../rms/api/supplier/SupplierDetailsVo.java | 59 ++++++++++ .../rms/api/supplier/SupplierDto.java | 42 +++++++ .../rms/api/supplier/SupplierFeign.java | 32 +++++ .../api/supplier/SupplierFeignFallback.java | 7 ++ .../rms/api/supplier/SupplierQuery.java | 51 ++++++++ .../rms/api/supplier/SupplierVo.java | 42 +++++++ .../SupplierIndex.java} | 4 +- .../SupplierIndexDto.java} | 4 +- .../api/supplierindex/SupplierIndexFeign.java | 13 ++ .../SupplierIndexFeignFallback.java | 7 ++ .../SupplierIndexVo.java} | 4 +- .../CustomerSupplierRest.java | 4 - .../CustomerSupplierService.java | 20 ---- .../CustomerSupplierIndexService.java | 11 -- .../rms/biz/supplier/SupplierMapper.java | 37 ++++++ .../rms/biz/supplier/SupplierMapper.xml | 28 +++++ .../rms/biz/supplier/SupplierRest.java | 45 +++++++ .../rms/biz/supplier/SupplierService.java | 111 ++++++++++++++++++ .../SupplierIndexMapper.java} | 4 +- .../SupplierIndexMapper.xml} | 3 +- .../SupplierIndexRest.java} | 4 +- .../supplierindex/SupplierIndexService.java | 11 ++ 37 files changed, 616 insertions(+), 209 deletions(-) delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeign.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeignFallback.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndex.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexDto.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeignFallback.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexVo.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/Supplier.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierDetailsVo.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierDto.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeign.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierQuery.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierVo.java rename yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/{customersupplier/CustomerSupplier.java => supplierindex/SupplierIndex.java} (89%) rename yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/{customersupplier/CustomerSupplierDto.java => supplierindex/SupplierIndexDto.java} (87%) create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexFeign.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexFeignFallback.java rename yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/{customersupplier/CustomerSupplierVo.java => supplierindex/SupplierIndexVo.java} (87%) delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplier/CustomerSupplierRest.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplier/CustomerSupplierService.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexService.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierMapper.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierMapper.xml create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierRest.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierService.java rename yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/{customersupplierindex/CustomerSupplierIndexMapper.java => supplierindex/SupplierIndexMapper.java} (92%) rename yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/{customersupplierindex/CustomerSupplierIndexMapper.xml => supplierindex/SupplierIndexMapper.xml} (63%) rename yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/{customersupplierindex/CustomerSupplierIndexRest.java => supplierindex/SupplierIndexRest.java} (75%) create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexService.java diff --git a/supervise-customer-ui/src/layout/components/Navbar.vue b/supervise-customer-ui/src/layout/components/Navbar.vue index 5dba1cfd..d4bf2d24 100644 --- a/supervise-customer-ui/src/layout/components/Navbar.vue +++ b/supervise-customer-ui/src/layout/components/Navbar.vue @@ -1,9 +1,8 @@ @@ -73,7 +72,7 @@ display: flex; align-items: center; color: #fff; - font-size: 26px; + font-size: 22px; line-height: 60px; margin: 0; float: left; diff --git a/supervise-customer-ui/src/layout/components/Sidebar/SidebarItem.vue b/supervise-customer-ui/src/layout/components/Sidebar/SidebarItem.vue index 9545e6d6..ebfa553f 100644 --- a/supervise-customer-ui/src/layout/components/Sidebar/SidebarItem.vue +++ b/supervise-customer-ui/src/layout/components/Sidebar/SidebarItem.vue @@ -99,19 +99,19 @@ export default { diff --git a/supervise-customer-ui/src/settings.js b/supervise-customer-ui/src/settings.js index d29191e3..0dc7efda 100644 --- a/supervise-customer-ui/src/settings.js +++ b/supervise-customer-ui/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '汇融银行供应链贷后监管平台', + title: '汇融供应链贷后监管平台 /** * @type {boolean} true | false diff --git a/supervise-customer-ui/src/styles/index.scss b/supervise-customer-ui/src/styles/index.scss index ce380903..01b3bbf4 100644 --- a/supervise-customer-ui/src/styles/index.scss +++ b/supervise-customer-ui/src/styles/index.scss @@ -168,13 +168,36 @@ div:focus { font-weight: bold; } // 设置了搜索条件里的样式 + + +// 隐藏显示按钮 +.main-content { + .searchcon { + .searchbtn { + margin: 5px 0; + border: #2cab69 1px solid; + color: #2cab69; + } + } +} + +.search .btn { + padding: 5px 0; + border: 1px solid #e0e3eb; + text-align: center; + margin-bottom: 5px; +} + .search { .tab-header { .el-form-item { margin-right: 16px; + .el-form-item__input{ + height: 22px; + } .el-form-item__label { - font-size: 16px; - font-weight: 500; + font-size: 14px; + // font-weight: 500; } } } @@ -391,26 +414,6 @@ div:focus { width: 600px; } -//.searchcon{margin: 0px 0 10px 0;} -//.searchcon .searchbtn{margin: 10px 0;border: #2cab69 1px solid;color: #2cab69;} -// 隐藏显示按钮 -.main-content { - .searchcon { - .searchbtn { - margin: 5px 0; - border: #2cab69 1px solid; - color: #2cab69; - } - } -} - - -.search .btn { - padding: 5px 0; - border: 1px solid #e0e3eb; - text-align: center; - margin-bottom: 5px; -} // 弹出窗口按钮 diff --git a/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfo.vue b/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfo.vue index 32bf4825..785ceeb4 100644 --- a/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfo.vue +++ b/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfo.vue @@ -18,10 +18,10 @@ - + - +
查询 @@ -48,26 +48,27 @@ - - - - + + - > + - - + + + +
diff --git a/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfoAdd.vue b/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfoAdd.vue index 0974262a..1a91f795 100644 --- a/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfoAdd.vue +++ b/supervise-customer-ui/src/views/supervise/supplierbankinfo/supplierbankinfoAdd.vue @@ -172,6 +172,9 @@ diff --git a/supervise-customer-ui/vue.config.js b/supervise-customer-ui/vue.config.js index 4664272b..b81ec633 100644 --- a/supervise-customer-ui/vue.config.js +++ b/supervise-customer-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title +const name = defaultSettings.title || '汇融供应链贷后监管平台// page title // 如果端口设置为80, // 使用管理员权限执行命令行。 diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeign.java deleted file mode 100644 index e2c6c02c..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeign.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervise.rms.api.customersupplier; - -import io.swagger.annotations.Api; -import org.springframework.cloud.openfeign.FeignClient; - -@Api(tags = "风险表") -@FeignClient( - contextId = "yxt-supervise-CustomerSupplier", - name = "yxt-supervise", - path = "v1/risk", - fallback = CustomerSupplierFeignFallback.class) -public interface CustomerSupplierFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeignFallback.java deleted file mode 100644 index 145364bd..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeignFallback.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.supervise.rms.api.customersupplier; - -import org.springframework.stereotype.Component; - -@Component -public class CustomerSupplierFeignFallback implements CustomerSupplierFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndex.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndex.java deleted file mode 100644 index 932749bf..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndex.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.supervise.rms.api.customersupplierindex; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel(value = "风险表", description = "风险表") -@TableName("risk") -public class CustomerSupplierIndex extends BaseEntity { - @ApiModelProperty("风险指标Sid") - private String riskIndicatorsSid; - @ApiModelProperty("风险处理状态0.待处理1.处理中2.完成") - private Integer riskTreatmentStatus; - @ApiModelProperty("风险消除程度0.未消除1.已消除") - private Integer riskEliminationDegree; - @ApiModelProperty("客户Sid") - private String customerSid; - @ApiModelProperty("风险处于位置1.供应商2.一类仓3.门店仓") - private Integer riskInPositionNum; - @ApiModelProperty("风险处于位置Sid") - private String riskInPositionSid; -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexDto.java deleted file mode 100644 index 3889ea78..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.supervise.rms.api.customersupplierindex; - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class CustomerSupplierIndexDto implements Dto { - private String sid; - @ApiModelProperty("风险指标Sid") - private String riskIndicatorsSid; - @ApiModelProperty("风险处理状态0.待处理1.处理中2.完成") - private Integer riskTreatmentStatus; - @ApiModelProperty("风险消除程度0.未消除1.已消除") - private Integer riskEliminationDegree; - @ApiModelProperty("客户Sid") - private String customerSid; - @ApiModelProperty("风险处于位置1.供应商2.一类仓3.门店仓") - private Integer riskInPositionNum; - @ApiModelProperty("风险处于位置Sid") - private String riskInPositionSid; -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java deleted file mode 100644 index a547bd52..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervise.rms.api.customersupplierindex; - -import io.swagger.annotations.Api; -import org.springframework.cloud.openfeign.FeignClient; - -@Api(tags = "风险表") -@FeignClient( - contextId = "yxt-supervise-CustomerSupplierIndex", - name = "yxt-supervise", - path = "v1/risk", - fallback = CustomerSupplierIndexFeignFallback.class) -public interface CustomerSupplierIndexFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeignFallback.java deleted file mode 100644 index 4c705fbd..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeignFallback.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.supervise.rms.api.customersupplierindex; - -import org.springframework.stereotype.Component; - -@Component -public class CustomerSupplierIndexFeignFallback implements CustomerSupplierIndexFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexVo.java deleted file mode 100644 index c2b8a750..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.supervise.rms.api.customersupplierindex; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class CustomerSupplierIndexVo implements Vo { - private String sid; - @ApiModelProperty("风险指标Sid") - private String riskIndicatorsSid; - @ApiModelProperty("风险处理状态0.待处理1.处理中2.完成") - private Integer riskTreatmentStatus; - @ApiModelProperty("风险消除程度0.未消除1.已消除") - private Integer riskEliminationDegree; - @ApiModelProperty("客户Sid") - private String customerSid; - @ApiModelProperty("风险处于位置1.供应商2.一类仓3.门店仓") - private Integer riskInPositionNum; - @ApiModelProperty("风险处于位置Sid") - private String riskInPositionSid; -} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/Supplier.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/Supplier.java new file mode 100644 index 00000000..8e05455e --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/Supplier.java @@ -0,0 +1,57 @@ +package com.supervise.rms.api.supplier; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +/** + * Project: yxt_supervise(宇信通监管)
+ * File: SupplierInfo.java
+ * Class: com.supervise.api.supplierinfo.SupplierInfo
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "风险表", description = "风险表") +@TableName("supplier") +public class Supplier extends BaseEntity { + @ApiModelProperty("名称") + private String name; // 名称 + @ApiModelProperty("统一编码") + private String codeUnified; // 统一编码 + @ApiModelProperty("联系人") + private String contacts; // 联系人 + @ApiModelProperty("电话") + private String telephone; // 电话 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("银行帐户") + private String bankAccount; // 银行帐户 + @ApiModelProperty("帐号") + private String bankAccountNumber; // 帐号 + @ApiModelProperty("开户行名称") + private String bankName; // 开户行名称 + @ApiModelProperty("法人") + private String legalRepresentative; // 法人 + @ApiModelProperty("营业执照号") + private String businessLicenseNo; // 营业执照号 + @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝") + private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝 + @ApiModelProperty("监管审批意见") + private String purchaseRemarks; // 监管审批意见 + @ApiModelProperty("银行0未审核,1审核通过,2审核不通过") + private Integer bankState; // 银行0未审核,1审核通过,2审核不通过 + @ApiModelProperty("银行审批意见") + private String bankRemarks; // 银行审批意见 + @ApiModelProperty("锁定状态1.锁定2.未锁定 ") + private Integer lockingStatus; + @ApiModelProperty("锁定原因") + private String lockingReason; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierDetailsVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierDetailsVo.java new file mode 100644 index 00000000..7ef57107 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierDetailsVo.java @@ -0,0 +1,59 @@ +package com.supervise.rms.api.supplier; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(supervise)
+ * File: SupplierBankInfoVo.java
+ * Class: com.yxt.supervise.portal.api.supplierbankinfo.SupplierBankInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-12 22:02:22
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 视图数据详情", description = "供应商信息 视图数据详情") +public class SupplierDetailsVo implements Vo { + + @ApiModelProperty("名称") + private String name; // 名称 + @ApiModelProperty("统一编码") + private String codeUnified; // 统一编码 + @ApiModelProperty("联系人") + private String contacts; // 联系人 + @ApiModelProperty("电话") + private String telephone; // 电话 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("银行帐户") + private String bankAccount; // 银行帐户 + @ApiModelProperty("帐号") + private String bankAccountNumber; // 帐号 + @ApiModelProperty("开户行名称") + private String bankName; // 开户行名称 + @ApiModelProperty("法人") + private String legalRepresentative; // 法人 + @ApiModelProperty("营业执照号") + private String businessLicenseNo; // 营业执照号 + @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝") + private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝 + @ApiModelProperty("监管审批意见") + private String purchaseRemarks; // 监管审批意见 + @ApiModelProperty("银行0未审核,1审核通过,2审核不通过") + private Integer bankState; // 银行0未审核,1审核通过,2审核不通过 + @ApiModelProperty("银行审批意见") + private String bankRemarks; // 银行审批意见 + @ApiModelProperty("营业执照附件") + private String[] businessLicenseFiles; // 营业执照附件 + @ApiModelProperty("合同照片") + private String[] contractFiles; // 合同照片 +// @ApiModelProperty("合同信息") +// private SupplierContractInfoDto supplierContractInfoDto; // 合同信息 +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierDto.java new file mode 100644 index 00000000..dfcb7b56 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierDto.java @@ -0,0 +1,42 @@ +package com.supervise.rms.api.supplier; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SupplierDto implements Dto { + private String sid; + @ApiModelProperty("名称") + private String name; // 名称 + @ApiModelProperty("统一编码") + private String codeUnified; // 统一编码 + @ApiModelProperty("联系人") + private String contacts; // 联系人 + @ApiModelProperty("电话") + private String telephone; // 电话 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("银行帐户") + private String bankAccount; // 银行帐户 + @ApiModelProperty("帐号") + private String bankAccountNumber; // 帐号 + @ApiModelProperty("开户行名称") + private String bankName; // 开户行名称 + @ApiModelProperty("法人") + private String legalRepresentative; // 法人 + @ApiModelProperty("营业执照号") + private String businessLicenseNo; // 营业执照号 + @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝") + private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝 + @ApiModelProperty("监管审批意见") + private String purchaseRemarks; // 监管审批意见 + @ApiModelProperty("银行0未审核,1审核通过,2审核不通过") + private Integer bankState; // 银行0未审核,1审核通过,2审核不通过 + @ApiModelProperty("银行审批意见") + private String bankRemarks; // 银行审批意见 + @ApiModelProperty("锁定状态1.锁定2.未锁定 ") + private Integer lockingStatus; + @ApiModelProperty("锁定原因") + private String lockingReason; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeign.java new file mode 100644 index 00000000..10905a6e --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeign.java @@ -0,0 +1,32 @@ +package com.supervise.rms.api.supplier; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Api(tags = "供应商表") +@FeignClient( + contextId = "yxt-supervise-Supplier", + name = "yxt-supervise", + path = "v1/risk", + fallback = SupplierFeignFallback.class) +public interface SupplierFeign { + @ApiOperation("保存供应商") + @PostMapping("/saveSupplier") + ResultBean saveSupplier(SupplierDto supplierDto); + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java new file mode 100644 index 00000000..b510d84d --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java @@ -0,0 +1,7 @@ +package com.supervise.rms.api.supplier; + +import org.springframework.stereotype.Component; + +@Component +public class SupplierFeignFallback implements SupplierFeign { +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierQuery.java new file mode 100644 index 00000000..fe6f5df2 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierQuery.java @@ -0,0 +1,51 @@ +package com.supervise.rms.api.supplier; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +/** + * Project: supervise(supervise)
+ * File: SupplierBankInfoQuery.java
+ * Class: com.yxt.supervise.portal.api.supplierbankinfo.SupplierBankInfoQuery
+ * Description: 供应商信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-12 22:02:22
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 查询条件", description = "供应商信息 查询条件") +public class SupplierQuery implements Query { + @ApiModelProperty("名称") + private String name; // 名称 + @ApiModelProperty("统一编码") + private String codeUnified; // 统一编码 + @ApiModelProperty("联系人") + private String contacts; // 联系人 + @ApiModelProperty("电话") + private String telephone; // 电话 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("银行帐户") + private String bankAccount; // 银行帐户 + @ApiModelProperty("帐号") + private String bankAccountNumber; // 帐号 + @ApiModelProperty("开户行名称") + private String bankName; // 开户行名称 + @ApiModelProperty("法人") + private String legalRepresentative; // 法人 + @ApiModelProperty("营业执照号") + private String businessLicenseNo; // 营业执照号 + @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝") + private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝 + @ApiModelProperty("监管审批意见") + private String purchaseRemarks; // 监管审批意见 + @ApiModelProperty("银行0未审核,1审核通过,2审核不通过") + private Integer bankState; // 银行0未审核,1审核通过,2审核不通过 + @ApiModelProperty("银行审批意见") + private String bankRemarks; // 银行审批意见 +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierVo.java new file mode 100644 index 00000000..61622098 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierVo.java @@ -0,0 +1,42 @@ +package com.supervise.rms.api.supplier; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SupplierVo implements Vo { + private String sid; + @ApiModelProperty("名称") + private String name; // 名称 + @ApiModelProperty("统一编码") + private String codeUnified; // 统一编码 + @ApiModelProperty("联系人") + private String contacts; // 联系人 + @ApiModelProperty("电话") + private String telephone; // 电话 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("银行帐户") + private String bankAccount; // 银行帐户 + @ApiModelProperty("帐号") + private String bankAccountNumber; // 帐号 + @ApiModelProperty("开户行名称") + private String bankName; // 开户行名称 + @ApiModelProperty("法人") + private String legalRepresentative; // 法人 + @ApiModelProperty("营业执照号") + private String businessLicenseNo; // 营业执照号 + @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝") + private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝 + @ApiModelProperty("监管审批意见") + private String purchaseRemarks; // 监管审批意见 + @ApiModelProperty("银行0未审核,1审核通过,2审核不通过") + private Integer bankState; // 银行0未审核,1审核通过,2审核不通过 + @ApiModelProperty("银行审批意见") + private String bankRemarks; // 银行审批意见 + @ApiModelProperty("锁定状态1.锁定2.未锁定 ") + private Integer lockingStatus; + @ApiModelProperty("锁定原因") + private String lockingReason; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplier.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndex.java similarity index 89% rename from yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplier.java rename to yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndex.java index 10b3c2db..f4d12f8b 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplier.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndex.java @@ -1,4 +1,4 @@ -package com.supervise.rms.api.customersupplier; +package com.supervise.rms.api.supplierindex; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; @@ -9,7 +9,7 @@ import lombok.Data; @Data @ApiModel(value = "风险表", description = "风险表") @TableName("risk") -public class CustomerSupplier extends BaseEntity { +public class SupplierIndex extends BaseEntity { @ApiModelProperty("风险指标Sid") private String riskIndicatorsSid; @ApiModelProperty("风险处理状态0.待处理1.处理中2.完成") diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexDto.java similarity index 87% rename from yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierDto.java rename to yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexDto.java index aac652a3..4e08b56d 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierDto.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexDto.java @@ -1,11 +1,11 @@ -package com.supervise.rms.api.customersupplier; +package com.supervise.rms.api.supplierindex; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class CustomerSupplierDto implements Dto { +public class SupplierIndexDto implements Dto { private String sid; @ApiModelProperty("风险指标Sid") private String riskIndicatorsSid; diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexFeign.java new file mode 100644 index 00000000..5c18334e --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexFeign.java @@ -0,0 +1,13 @@ +package com.supervise.rms.api.supplierindex; + +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + +@Api(tags = "风险表") +@FeignClient( + contextId = "yxt-supervise-SupplierIndex", + name = "yxt-supervise", + path = "v1/risk", + fallback = SupplierIndexFeignFallback.class) +public interface SupplierIndexFeign { +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexFeignFallback.java new file mode 100644 index 00000000..42ee5eb5 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexFeignFallback.java @@ -0,0 +1,7 @@ +package com.supervise.rms.api.supplierindex; + +import org.springframework.stereotype.Component; + +@Component +public class SupplierIndexFeignFallback implements SupplierIndexFeign { +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexVo.java similarity index 87% rename from yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierVo.java rename to yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexVo.java index 7b69cc86..0605f597 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierVo.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplierindex/SupplierIndexVo.java @@ -1,11 +1,11 @@ -package com.supervise.rms.api.customersupplier; +package com.supervise.rms.api.supplierindex; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class CustomerSupplierVo implements Vo { +public class SupplierIndexVo implements Vo { private String sid; @ApiModelProperty("风险指标Sid") private String riskIndicatorsSid; diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplier/CustomerSupplierRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplier/CustomerSupplierRest.java deleted file mode 100644 index cd47a607..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplier/CustomerSupplierRest.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.supervise.rms.biz.customersupplier; - -public class CustomerSupplierRest { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplier/CustomerSupplierService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplier/CustomerSupplierService.java deleted file mode 100644 index 24618265..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplier/CustomerSupplierService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.supervise.rms.biz.customersupplier; - -import org.springframework.stereotype.Service; - -/** - * Project: yxt-supervise(宇信通监管)
- * File: RestrictedBrandService.java
- * Class: com.yxt.supervise.rms.biz.auditingsupplier.CustomerSupplierService
- * Description: 供应商审核 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-22 21:47:10
- * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Service -public class CustomerSupplierService { - -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexService.java deleted file mode 100644 index 1623437a..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.supervise.rms.biz.customersupplierindex; - -import com.supervise.rms.api.risk.Risk; -import com.yxt.common.base.service.MybatisBaseService; -import org.springframework.stereotype.Service; - -@Service -public class CustomerSupplierIndexService extends MybatisBaseService { - - -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierMapper.java new file mode 100644 index 00000000..319e6e8a --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierMapper.java @@ -0,0 +1,37 @@ +package com.supervise.rms.biz.supplier; +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.supervise.rms.api.risk.Risk; +import com.supervise.rms.api.supplier.Supplier; +import com.supervise.rms.api.supplier.SupplierVo; +import org.apache.ibatis.annotations.*; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface SupplierMapper extends BaseMapper { + + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from supplier_bank_info") + List selectListVo(); + int delBySids(@Param("list") String[] split); + @Delete("delete from supplier_files where mainSid=#{mainSid} and type=#{type}") + void deleteSupplierFiles(@Param("mainSid")String sid, @Param("type") String type); + + void insertSupplierFiles(List> maps); + @Select("select * from supplier_bank_info where sid=#{sid}") + Supplier selectBySid(@Param("sid")String sid); + @Select("select GROUP_CONCAT(url) url from supplier_files where mainSid=#{mainSid} and type=#{type}") + String selectSupplierFiles(@Param("mainSid")String mainSid, @Param("type") String type); + @Select("select * from supplier_bank_info where codeUnified=#{codeUnified}") + Supplier selectByCode(@Param("codeUnified") String codeUnified); + @Insert("insert INTO supplier_index(code, name,PSid) values (#{code},#{name},#{sid})") + void insertSUpplierIndex( @Param("code")String code,@Param("name") String name,@Param("sid")String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierMapper.xml new file mode 100644 index 00000000..3e0a7f31 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + delete from supplier where sid in + + #{item} + + + + insert into supplier_files ( sid, url, mainSid, type) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.mainSid,jdbcType=VARCHAR}, + #{item.type,jdbcType=VARCHAR} + ) + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierRest.java new file mode 100644 index 00000000..1452da6b --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierRest.java @@ -0,0 +1,45 @@ +package com.supervise.rms.biz.supplier; + +import com.supervise.rms.api.supplier.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "供应商表") +@RestController("com.supervise.rms.biz.supplier.SupplierRest") +@RequestMapping("v1/supplier") +public class SupplierRest implements SupplierFeign { + @Autowired + private SupplierService supplierService; + + @Override + @ApiOperation("保存供应商") + @PostMapping("/saveSupplier") + public ResultBean saveSupplier(SupplierDto supplierDto) { + return supplierService.saveSupplier(supplierDto); + } + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = supplierService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + SupplierDetailsVo vo = supplierService.fetchDetailsVoBySid(sid); +// SupplierContractInfoDto supplierContractInfo=supplierContractInfoService.fetchByMainSid(sid); +// vo.setSupplierContractInfoDto(supplierContractInfo); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierService.java new file mode 100644 index 00000000..1ae10a96 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplier/SupplierService.java @@ -0,0 +1,111 @@ +package com.supervise.rms.biz.supplier; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.supervise.rms.api.supplier.*; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: RestrictedBrandService.java
+ * Class: com.yxt.supervise.rms.biz.auditingsupplier.SupplierService
+ * Description: 供应商 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SupplierService extends MybatisBaseService { + + public ResultBean saveSupplier(SupplierDto supplierDto) { + ResultBean rb = ResultBean.fireFail(); + String sid = supplierDto.getSid(); + if(StringUtils.isBlank(sid)){ + //新增 + Supplier supplier = new Supplier(); + BeanUtils.copyProperties(supplierDto, supplier,"sid"); + boolean isSave = save(supplier); + if(!isSave){ + return rb.setMsg("保存失败"); + } + sid = supplier.getSid(); + }else{ + //更新 + Supplier supplier = fetchBySid(supplierDto.getSid()); + if(supplier == null){ + return rb.setMsg("该条记录不存在"); + } + BeanUtils.copyProperties(supplierDto, supplier); + boolean isUpdate = updateById(supplier); + if(!isUpdate){ + return rb.setMsg("更新失败"); + } + } + return rb.success().setData(sid).setMsg("保存成功"); + } + + private QueryWrapper createQueryWrapper(SupplierQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + if (StringUtils.isNotBlank(query.getCodeUnified())) { + qw.like("codeUnified", query.getCodeUnified()); + } + if (StringUtils.isNotBlank(query.getName())) { + qw.like("name", query.getName()); + } + if (StringUtils.isNotBlank(query.getContacts())) { + qw.like("contacts", query.getContacts()); + } + if (StringUtils.isNotBlank(query.getLegalRepresentative())) { + qw.like("legalRepresentative", query.getLegalRepresentative()); + } + if (StringUtils.isNotBlank(query.getBusinessLicenseNo())) { + qw.like("businessLicenseNo", query.getBusinessLicenseNo()); + }if (StringUtils.isNotBlank(query.getBankAccountNumber())) { + qw.like("bankAccountNumber", query.getBankAccountNumber()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SupplierQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public SupplierDetailsVo fetchDetailsVoBySid(String sid){ + Supplier entity = baseMapper.selectBySid(sid); + SupplierDetailsVo vo = new SupplierDetailsVo(); + BeanUtil.copyProperties(entity, vo); + String s1=baseMapper.selectSupplierFiles(sid,"1"); + if(StringUtils.isNotBlank(s1)){ + vo.setBusinessLicenseFiles(s1.split(",")); + }else{ + vo.setBusinessLicenseFiles(new String[]{}); + } + + String s2=baseMapper.selectSupplierFiles(sid,"2"); + if(StringUtils.isNotBlank(s2)){ + vo.setContractFiles(s2.split(",")); + }else{ + vo.setContractFiles(new String[]{}); + } + return vo; + } + +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexMapper.java similarity index 92% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.java rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexMapper.java index a2e8c98a..dd837a7e 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexMapper.java @@ -23,13 +23,13 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.supervise.rms.biz.customersupplierindex; +package com.supervise.rms.biz.supplierindex; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.supervise.rms.api.risk.Risk; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface CustomerSupplierIndexMapper extends BaseMapper { +public interface SupplierIndexMapper extends BaseMapper { } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexMapper.xml similarity index 63% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.xml rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexMapper.xml index a3c8532b..2d4d7463 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexMapper.xml @@ -1,5 +1,6 @@ - + + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexRest.java similarity index 75% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexRest.java index 1d6763a3..f90c16c6 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexRest.java @@ -1,4 +1,4 @@ -package com.supervise.rms.biz.customersupplierindex; +package com.supervise.rms.biz.supplierindex; import com.supervise.rms.api.risk.RiskFeign; import io.swagger.annotations.Api; @@ -8,6 +8,6 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "风险名单表") @RestController("com.supervise.rmc.biz.customersupplierindex.CustomerSupplierIndexRest") @RequestMapping("v1/risk") -public class CustomerSupplierIndexRest implements RiskFeign { +public class SupplierIndexRest implements RiskFeign { } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexService.java new file mode 100644 index 00000000..ebf3bd9d --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/supplierindex/SupplierIndexService.java @@ -0,0 +1,11 @@ +package com.supervise.rms.biz.supplierindex; + +import com.supervise.rms.api.risk.Risk; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +@Service +public class SupplierIndexService extends MybatisBaseService { + + +}