From 4a9b273f359da5016b5dd9e18349998f5620e778 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 19 May 2022 17:22:48 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E7=BC=96=E8=BE=91=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrderAllDto.java | 2 ++ .../api/bussalesorder/BusSalesOrderDetailsVo.java | 8 ++++++++ .../BusSalesOrderMakeupDetailsVo.java | 1 + .../bussalesordermakeup/BusSalesOrderMakeupDto.java | 1 + .../biz/bussalesorder/BusSalesOrderService.java | 11 +++++++++++ .../bussalesordermakeup/BusSalesOrderMakeupMapper.xml | 2 +- 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java index 78ffce061c..74331eaf6f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java @@ -118,4 +118,6 @@ public class BusSalesOrderAllDto implements Dto { private List vehicleList = new ArrayList<>(); @ApiModelProperty(value = "优惠包价值") private List priceList = new ArrayList<>(); + + private String remarks; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index 752b18a7ea..01a4c3294c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java @@ -121,4 +121,12 @@ public class BusSalesOrderDetailsVo implements Vo { @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 + @ApiModelProperty(value = "保险备注") + private String remarks; + @ApiModelProperty(value = "客户类型key") + private String customerClassKey; + @ApiModelProperty(value = "客户类型") + private String customerClass; + @ApiModelProperty(value = "客户头像") + private String customerPhoto; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java index 8b9571c113..b940870715 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java @@ -72,5 +72,6 @@ public class BusSalesOrderMakeupDetailsVo implements Vo { private String moreConfig; @ApiModelProperty("合同上传") private String contractPath; + private String remarks; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java index df40a18ee9..e7e61220fb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java @@ -69,5 +69,6 @@ public class BusSalesOrderMakeupDto implements Dto { private String moreConfig; @ApiModelProperty("合同上传") private String contractPath; + private String remarks; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index e570cb6d51..a23b273199 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -87,6 +87,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; @@ -157,6 +158,8 @@ public class BusSalesOrderService extends MybatisBaseService busDepositFictitiousDtoList = dto.getBusDepositFictitiousList(); BusSalesOrder busSalesOrder = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, busSalesOrder, "sid"); + if(dto.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())){ + busSalesOrder.setCustomerPhoto(dto.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(),"")); + } baseMapper.updateById(busSalesOrder); //主车车型信息保存 busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml index 6094bcd6ec..41d521b7dd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml @@ -43,7 +43,7 @@ announcementModel, topPrice, moreConfig, - contractPath + contractPath,remarks from bus_sales_order_makeup where salesOrderSid = #{sid} From 3522fc15ba91510ab4c283ea0ddc85f2b69df463 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Thu, 19 May 2022 19:52:06 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E5=AE=A2=E6=88=B7bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseOutsourcingApplicationService.java | 3 ++- .../crm/biz/crmvehicledemand/CrmVehicledemandService.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 5773c097d7..4edb1e1b49 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -115,8 +115,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService Date: Fri, 20 May 2022 09:12:49 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4=E6=97=B6=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=88=A9=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/databases/bus-center_tables.sql | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/doc/databases/bus-center_tables.sql b/doc/databases/bus-center_tables.sql index 5998162959..aa97ba9a45 100644 --- a/doc/databases/bus-center_tables.sql +++ b/doc/databases/bus-center_tables.sql @@ -554,3 +554,33 @@ CREATE TABLE `bus_sales_order_insurance` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='销售订单-保险信息'; + +DROP TABLE IF EXISTS `bus_sales_order_submit`; +CREATE TABLE `bus_sales_order_submit` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注：返利备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `salesOrderSid` VARCHAR(64) DEFAULT NULL COMMENT '销售订单sid', + `priceRemarks` varchar(500) DEFAULT NULL COMMENT '价格说明', + `discountRemarks` varchar(500) DEFAULT NULL COMMENT '优惠说明', + `distributorName` varchar(64) DEFAULT NULL COMMENT '中介名称:即经销商名称', + `distributorMobile` varchar(64) DEFAULT NULL COMMENT '联系电话', + `distributorSid` varchar(64) DEFAULT NULL COMMENT '中介单位sid', + `distributorPrice` decimal(10, 2) DEFAULT NULL COMMENT '单车中介服务费', + `distributorPriceAll` decimal(10, 2) DEFAULT NULL COMMENT '返利合计', + `name` varchar(64) DEFAULT NULL COMMENT '内部引荐人：本分公司的用户', + `userSid` varchar(64) DEFAULT NULL COMMENT '内部引荐人sid', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='销售订单-订单提交时补充的返利信息'; + From 69092ed36354dbc1c25a5ba22376f9865dfd852c Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 19 May 2022 17:22:48 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E7=BC=96=E8=BE=91=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrderAllDto.java | 2 ++ .../api/bussalesorder/BusSalesOrderDetailsVo.java | 8 ++++++++ .../BusSalesOrderMakeupDetailsVo.java | 1 + .../bussalesordermakeup/BusSalesOrderMakeupDto.java | 1 + .../biz/bussalesorder/BusSalesOrderService.java | 11 +++++++++++ .../bussalesordermakeup/BusSalesOrderMakeupMapper.xml | 2 +- 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java index 78ffce061c..74331eaf6f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java @@ -118,4 +118,6 @@ public class BusSalesOrderAllDto implements Dto { private List vehicleList = new ArrayList<>(); @ApiModelProperty(value = "优惠包价值") private List priceList = new ArrayList<>(); + + private String remarks; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index 752b18a7ea..01a4c3294c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java @@ -121,4 +121,12 @@ public class BusSalesOrderDetailsVo implements Vo { @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 + @ApiModelProperty(value = "保险备注") + private String remarks; + @ApiModelProperty(value = "客户类型key") + private String customerClassKey; + @ApiModelProperty(value = "客户类型") + private String customerClass; + @ApiModelProperty(value = "客户头像") + private String customerPhoto; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java index 8b9571c113..b940870715 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java @@ -72,5 +72,6 @@ public class BusSalesOrderMakeupDetailsVo implements Vo { private String moreConfig; @ApiModelProperty("合同上传") private String contractPath; + private String remarks; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java index df40a18ee9..e7e61220fb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java @@ -69,5 +69,6 @@ public class BusSalesOrderMakeupDto implements Dto { private String moreConfig; @ApiModelProperty("合同上传") private String contractPath; + private String remarks; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index e570cb6d51..a23b273199 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -87,6 +87,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; @@ -157,6 +158,8 @@ public class BusSalesOrderService extends MybatisBaseService busDepositFictitiousDtoList = dto.getBusDepositFictitiousList(); BusSalesOrder busSalesOrder = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, busSalesOrder, "sid"); + if(dto.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())){ + busSalesOrder.setCustomerPhoto(dto.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(),"")); + } baseMapper.updateById(busSalesOrder); //主车车型信息保存 busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml index 6094bcd6ec..41d521b7dd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml @@ -43,7 +43,7 @@ announcementModel, topPrice, moreConfig, - contractPath + contractPath,remarks from bus_sales_order_makeup where salesOrderSid = #{sid} From 0017a9fe6b422376faba4b083fd9085a8f6e3e3a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 20 May 2022 09:12:49 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4=E6=97=B6=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=88=A9=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/databases/bus-center_tables.sql | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/doc/databases/bus-center_tables.sql b/doc/databases/bus-center_tables.sql index 5998162959..aa97ba9a45 100644 --- a/doc/databases/bus-center_tables.sql +++ b/doc/databases/bus-center_tables.sql @@ -554,3 +554,33 @@ CREATE TABLE `bus_sales_order_insurance` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='销售订单-保险信息'; + +DROP TABLE IF EXISTS `bus_sales_order_submit`; +CREATE TABLE `bus_sales_order_submit` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注：返利备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `salesOrderSid` VARCHAR(64) DEFAULT NULL COMMENT '销售订单sid', + `priceRemarks` varchar(500) DEFAULT NULL COMMENT '价格说明', + `discountRemarks` varchar(500) DEFAULT NULL COMMENT '优惠说明', + `distributorName` varchar(64) DEFAULT NULL COMMENT '中介名称:即经销商名称', + `distributorMobile` varchar(64) DEFAULT NULL COMMENT '联系电话', + `distributorSid` varchar(64) DEFAULT NULL COMMENT '中介单位sid', + `distributorPrice` decimal(10, 2) DEFAULT NULL COMMENT '单车中介服务费', + `distributorPriceAll` decimal(10, 2) DEFAULT NULL COMMENT '返利合计', + `name` varchar(64) DEFAULT NULL COMMENT '内部引荐人：本分公司的用户', + `userSid` varchar(64) DEFAULT NULL COMMENT '内部引荐人sid', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='销售订单-订单提交时补充的返利信息'; + From f2c04ebc3cc8510b7ed931f1d2747a23fc774b91 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 20 May 2022 11:56:15 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4=E6=97=B6=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=88=A9=E4=BF=A1=E6=81=AF=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderModel.java | 2 + .../BusSalesOrderModelDetailsVo.java | 4 ++ .../BusSalesOrderSubmit.java | 41 +++++++++++++++++++ .../BusSalesOrderSubmitDto.java | 38 +++++++++++++++++ .../bussalesorder/BusSalesOrderService.java | 28 +++++++++---- .../BusSalesOrderModelMapper.xml | 4 +- .../BusSalesOrderSubmitMapper.java | 14 +++++++ .../BusSalesOrderSubmitService.java | 14 +++++++ 8 files changed, 135 insertions(+), 10 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java index 532ab60281..dd51606d25 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java @@ -52,6 +52,8 @@ public class BusSalesOrderModel extends BaseEntity { @ApiModelProperty("销售订单sid") private String salesOrderSid; + @ApiModelProperty(value = "品牌sid") + private String brandSid; @ApiModelProperty(value = "品牌") private String brandName; @ApiModelProperty("车型sid") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java index 510eb2a158..899c145aa1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java @@ -70,5 +70,9 @@ public class BusSalesOrderModelDetailsVo implements Vo { @ApiModelProperty("单台成交价") @JsonSerialize(using = ToStringSerializer.class) private String finalPrice; + @ApiModelProperty(value = "品牌sid") + private String brandSid; + @ApiModelProperty(value = "品牌") + private String brandName; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java new file mode 100644 index 0000000000..81b0c87738 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java @@ -0,0 +1,41 @@ +package com.yxt.anrui.buscenter.api.bussalesordersubmit; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/5/20 9:20 + * @Description + */ +@Data +public class BusSalesOrderSubmit extends BaseEntity { + private static final long serialVersionUID = 1919809277011946278L; + @ApiModelProperty(value = "销售订单sid") + private String salesOrderSid; + @ApiModelProperty(value = "价格说明") + private String priceRemarks; + + @ApiModelProperty(value = "优惠说明") + private String discountRemarks; + @ApiModelProperty(value = "中介名称") + private String distributorName; + @ApiModelProperty(value = "联系电话") + private String distributorMobile; + + @ApiModelProperty(value = "中介单位sid") + private String distributorSid; + @ApiModelProperty(value = "单车中介服务费") + private BigDecimal distributorPrice; + @ApiModelProperty(value = "返利合计") + private BigDecimal distributorPriceAll; + @ApiModelProperty(value = "内部引荐人") + private String name; + @ApiModelProperty(value = "内部引荐人sid") + private String userSid; + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java new file mode 100644 index 0000000000..37622c9265 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.buscenter.api.bussalesordersubmit; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/20 9:29 + * @Description + */ +@Data +public class BusSalesOrderSubmitDto implements Dto { + private static final long serialVersionUID = 4276394815492406556L; + + @ApiModelProperty(value = "价格说明") + private String priceRemarks; + + @ApiModelProperty(value = "优惠说明") + private String discountRemarks; + @ApiModelProperty(value = "中介名称") + private String distributorName; + @ApiModelProperty(value = "联系电话") + private String distributorMobile; + + @ApiModelProperty(value = "中介单位sid") + private String distributorSid; + @ApiModelProperty(value = "单车中介服务费") + private String distributorPrice; + @ApiModelProperty(value = "返利合计") + private String distributorPriceAll; + @ApiModelProperty(value = "内部引荐人") + private String name; + @ApiModelProperty(value = "内部引荐人sid") + private String userSid; + + +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index a23b273199..0743f063cd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -238,9 +238,9 @@ public class BusSalesOrderService extends MybatisBaseService0){ + if (depositBig.compareTo(new BigDecimal(depositAll)) > 0) { return rb.setMsg("本次结转金额之和已超订金合计金额"); } if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) { @@ -462,8 +472,8 @@ public class BusSalesOrderService extends MybatisBaseService busDepositFictitiousDtoList = dto.getBusDepositFictitiousList(); BusSalesOrder busSalesOrder = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, busSalesOrder, "sid"); - if(dto.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())){ - busSalesOrder.setCustomerPhoto(dto.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(),"")); + if (dto.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())) { + busSalesOrder.setCustomerPhoto(dto.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(), "")); } baseMapper.updateById(busSalesOrder); //主车车型信息保存 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml index 5c63af3123..22273ef677 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml @@ -41,7 +41,9 @@ moreConfig, specialConfig, guildPrice, - finalPrice + finalPrice, + brandName, + brandSid from bus_sales_order_model where salesOrderSid = #{sid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java new file mode 100644 index 0000000000..3057a8d9b4 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.buscenter.biz.bussalesordersubmit; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author dimengzhe + * @Date 2022/5/20 9:35 + * @Description + */ +@Mapper +public interface BusSalesOrderSubmitMapper extends BaseMapper { +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java new file mode 100644 index 0000000000..1eeae8e694 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.buscenter.biz.bussalesordersubmit; + +import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +/** + * @Author dimengzhe + * @Date 2022/5/20 9:31 + * @Description + */ +@Service +public class BusSalesOrderSubmitService extends MybatisBaseService { +} From 1c8d781869c295b49f2cf0fb3aa7a593a76565dd Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 20 May 2022 14:35:25 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E4=B8=8A=E8=A3=85=E5=8F=8A?= =?UTF-8?q?=E4=BF=9D=E9=99=A9=E4=BF=A1=E6=81=AF=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedistributor/BaseDistributorFeign.java | 9 ++++++++ .../BaseDistributorFeignFallback.java | 5 ++++ .../PcBaseDistributorQuery.java | 16 +++++++++++++ .../basedistributor/PcBaseDistributorVo.java | 22 ++++++++++++++++++ .../BaseDistributorMapper.java | 7 ++++++ .../basedistributor/BaseDistributorMapper.xml | 3 +++ .../basedistributor/BaseDistributorRest.java | 10 +++++--- .../BaseDistributorService.java | 19 +++++++++++++++ .../bussalesorder/BusSalesOrderAllDto.java | 2 -- .../bussalesorder/BusSalesOrderDetailsVo.java | 2 -- .../BusSalesOrderInsuranceDetailsVo.java | 3 +++ .../BusSalesOrderInsuranceDto.java | 3 +++ .../bussalesorder/BusSalesOrderService.java | 23 +++++++++++++++---- .../BusSalesOrderInsuranceMapper.java | 2 ++ .../BusSalesOrderInsuranceMapper.xml | 12 +++++++++- .../BusSalesOrderInsuranceService.java | 4 ++++ 16 files changed, 130 insertions(+), 12 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java index 544f76ada3..642e829506 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -57,4 +58,12 @@ public interface BaseDistributorFeign { @ApiOperation("Pc端分页查询中介单位（经销商）") @GetMapping("/getPcDistributorList") ResultBean>> getPcDistributorList(@RequestParam(value = "name", required = false) String name); + + + @ApiOperation("销售订单-中介单位下拉框") + @GetMapping("/getPcDistributorList") + ResultBean> getBaseDistributorList(@SpringQueryMap PcBaseDistributorQuery query); + + + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java index a425926d19..e46c2c5d5c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java @@ -56,5 +56,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign { return null; } + @Override + public ResultBean> getBaseDistributorList(PcBaseDistributorQuery query) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorQuery.java new file mode 100644 index 0000000000..3bb5e111c5 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.base.api.basedistributor; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/20 10:21 + * @Description + */ +@Data +public class PcBaseDistributorQuery implements Query { + private static final long serialVersionUID = -819696590662230234L; + + private String staffSid; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorVo.java new file mode 100644 index 0000000000..e9501c31b3 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.base.api.basedistributor; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/20 10:16 + * @Description + */ +@Data +public class PcBaseDistributorVo implements Vo { + private static final long serialVersionUID = 7712204411963730062L; + + @ApiModelProperty(value = "中介单位") + private String distributorName; + @ApiModelProperty(value = "中介单位联系电话") + private String businessMobile; + @ApiModelProperty(value = "中介单位sid") + private String distributorSid; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java index 77ae2352aa..3cece5805b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java @@ -79,4 +79,11 @@ public interface BaseDistributorMapper extends BaseMapper { @Update("update base_distributor set isDelete = 1 where sid = #{sid}") int updateBySidIsDelete(String sid); + + /** + * 查询中介单位 + * @param query 查询条件 + * @return + */ + List getBaseDistributorList(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index 45ba9237a2..07d3350e8e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -106,4 +106,7 @@ ${ew.customSqlSegment} + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java index d4f62e879e..94d31de6cd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basedistributor.*; import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo; import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonVo; -import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff; -import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerExportVo; import com.yxt.anrui.base.biz.basedistributorlegal.BaseDistributorLegalService; import com.yxt.anrui.base.biz.basedistributorperson.BaseDistributorPersonService; import com.yxt.anrui.base.biz.basedistributorstaff.BaseDistributorStaffService; @@ -24,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -173,4 +170,11 @@ public class BaseDistributorRest implements BaseDistributorFeign { List> stringList = baseDistributorService.namesDown(name); return new ResultBean>>().success().setData(stringList); } + + @Override + public ResultBean> getBaseDistributorList(PcBaseDistributorQuery query) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseDistributorService.getBaseDistributorList(query); + return rb.success().setData(list); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 6e03e4b918..96bcfe0943 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalDto; import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonDto; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.service.MybatisBaseService; @@ -50,6 +51,8 @@ public class BaseDistributorService extends MybatisBaseService getBaseDistributorList(PcBaseDistributorQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if(query != null){ + if (StringUtils.isNotBlank(query.getStaffSid())) { + String orgSid = ""; + ResultBean stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(query.getStaffSid()); + if (stringResultBean.getSuccess()) { + orgSid = stringResultBean.getData(); + } + qw.lambda().apply("FIND_IN_SET ('" + orgSid + "',useOrg)"); + } + } + List voList = baseMapper.getBaseDistributorList(qw); + return voList; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java index 74331eaf6f..78ffce061c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java @@ -118,6 +118,4 @@ public class BusSalesOrderAllDto implements Dto { private List vehicleList = new ArrayList<>(); @ApiModelProperty(value = "优惠包价值") private List priceList = new ArrayList<>(); - - private String remarks; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index 01a4c3294c..99c223f291 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java @@ -121,8 +121,6 @@ public class BusSalesOrderDetailsVo implements Vo { @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 - @ApiModelProperty(value = "保险备注") - private String remarks; @ApiModelProperty(value = "客户类型key") private String customerClassKey; @ApiModelProperty(value = "客户类型") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java index 22e2926cf0..411e5c43cd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java @@ -59,4 +59,7 @@ public class BusSalesOrderInsuranceDetailsVo implements Vo { @ApiModelProperty("公司入保期数") private Integer insuranceNum; + @ApiModelProperty(value = "保险备注") + private String remarks; + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java index 94d4067775..51acbc7230 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java @@ -56,4 +56,7 @@ public class BusSalesOrderInsuranceDto implements Dto { @ApiModelProperty("公司入保期数") private Integer insuranceNum; + @ApiModelProperty(value = "备注") + private String remarks; + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 0743f063cd..d8d47df026 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -49,6 +49,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDeta import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo; @@ -369,14 +370,14 @@ public class BusSalesOrderService extends MybatisBaseService select insuranceName, insuranceCarMoney, - insuranceNum + insuranceNum, + remarks from bus_sales_order_insurance where salesOrderSid = #{sid} + + + update bus_sales_order_insurance + set insuranceNum = NULL, + insuranceCarMoney=NULL, + insuranceName=NULL, + remarks = #{remarks} + where salesOrderSid = #{sid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java index 0c552e32ef..b209f90184 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java @@ -103,4 +103,8 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService Date: Fri, 20 May 2022 14:49:53 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-?= =?UTF-8?q?=E4=B8=AD=E4=BB=8B=E5=8D=95=E4=BD=8D=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/api/basedistributor/BaseDistributorFeign.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java index 642e829506..2a80cb07c5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java @@ -61,7 +61,7 @@ public interface BaseDistributorFeign { @ApiOperation("销售订单-中介单位下拉框") - @GetMapping("/getPcDistributorList") + @GetMapping("/getBaseDistributorList") ResultBean> getBaseDistributorList(@SpringQueryMap PcBaseDistributorQuery query); From 6b29015662855b938e0d68636ae6db96dc88fdb6 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Fri, 20 May 2022 16:09:31 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=8A=A5=E4=BB=B7?= =?UTF-8?q?=EF=BC=8C=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseModelConfigService.java | 22 +++++++++----- .../biz/basevehicle/BaseVehicleMapper.xml | 3 +- .../biz/basevehicle/BaseVehicleService.java | 30 ++++++++++++------- .../BaseVehicleAppendixService.java | 4 +++ .../AppCrmVehicledemandVo.java | 5 ++-- .../crmvehicledemand/CrmVehicledemand.java | 2 +- .../CrmVehicledemandMapper.java | 2 ++ .../CrmVehicledemandMapper.xml | 14 +++++++-- .../CrmVehicledemandService.java | 9 ++++-- .../crm/biz/crmvisit/CrmVisitMapper.java | 4 +-- .../anrui/crm/biz/crmvisit/CrmVisitMapper.xml | 9 ++---- .../crm/biz/crmvisit/CrmVisitService.java | 6 ++++ 12 files changed, 74 insertions(+), 36 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java index 3ccb3f88e8..67d21f604d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java @@ -3,12 +3,13 @@ package com.yxt.anrui.base.biz.basemodelconfig; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemodelconfig.*; -import com.yxt.anrui.base.api.basevehicle.AppCurrentCarByPageListQuery; -import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo; -import com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo; -import com.yxt.anrui.base.api.basevehicle.ConfigInfo; +import com.yxt.anrui.base.api.basevehicle.*; +import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix; +import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; +import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -39,6 +40,12 @@ public class BaseModelConfigService extends MybatisBaseService modelImages = new ArrayList<>(); - modelImages.add("123123"); - modelImages.add("324"); - modelImages.add("345"); + String type = "0002"; + String path = fileUploadComponent.getUrlPrefix(); + List modelImages = baseVehicleAppendixService.selectBySid(type, modelSid, path); vo.setModelImage(modelImages); //基础配置拼接 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index ef103cd1aa..2de315cbde 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -489,7 +489,8 @@ bvm.fuelTypeValue, bvm.gearboxTypeValue, bvc.priceValidity, - bvc.guidedPrice, + (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)) FROM base_vehmodel_config bvc WHERE bvc.modelSid + = bvm.sid) AS guidedPrice, (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid) AS configNum, (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03') AS nowCarNum, (SELECT count(*) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 1cac5b726e..29b9940de2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -6,6 +6,7 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; import com.yxt.anrui.base.api.basevehicle.*; +import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendix; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; @@ -749,7 +750,16 @@ public class BaseVehicleService extends MybatisBaseService iPage = baseMapper.getModelList(page, qw); // 3、 查询更多配置（其它分公司） for (AppVehicleModelPriceVo record : iPage.getRecords()) { - record.setModelImage("http//:192.168.1.101:8111/aaa.com"); + String sid = record.getModelSid(); + String type = "0002"; + String path = fileUploadComponent.getUrlPrefix(); + List list = baseVehicleAppendixService.selectBySid(type, sid, path); + if (list.size() > 0) { + String s = list.get(0); + record.setModelImage(s); + }else { + record.setModelImage(""); + } String useOrg = data.getSid(); List moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), useOrg); for (AppMoreConfigVo moreConfigVo : moreConfigVos) { @@ -767,31 +777,31 @@ public class BaseVehicleService extends MybatisBaseService { * @return */ IPage getWantCarList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + void updateByPrice(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index aedcc769b9..6a54e4c4e5 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -32,9 +32,9 @@ cvcd.modelName, cvcd.modelSid, cvcd.comonConfigSid, - cvcd.saleReferencePrice AS vehicleModelOffer, + cvcd.saleReferencePrice AS guidancePrice, cvcd.createTime, - cvcd.purchaseMethodValue AS purchaseMethod + cvcd.purchaseMethodValue AS purchaseType FROM crm_vehicledemand cvcd WHERE cvcd.customerSid = #{customerSid} AND cvcd.states = 1 @@ -107,7 +107,7 @@ resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicleDemandParticularsVo"> SELECT cv.purchaseMethodValue AS type, cv.modelSid, - cv.modelName AS model, + cv.modelName, cv.brandName AS brand, cv.saleReferencePrice AS price, cv.vehicleModelOffer AS quotation, @@ -136,4 +136,12 @@ cv.createTime from crm_vehicledemand cv ${ew.customSqlSegment} + + + update + crm_vehicledemand + set vehicleModelOffer = NULL + where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index c9f1feef8f..3e79660782 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -355,11 +356,13 @@ public class CrmVehicledemandService extends MybatisBaseService { List selVisitMaterials(@Param("sid") String sid, @Param("staffSid") String staffSid); - int fetchByVisitSid(String sid); + int fetchByVisitSid(@Param("sid") String sid); @Update("UPDATE crm_visit SET visit_witness_materials = #{s} WHERE sid = #{sid}") - void updateAppendixUrl(@Param("s")String s,@Param("sid")String sid); + void updateAppendixUrl(@Param("s") String s, @Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml index afc42f59e2..b75e693b5f 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml @@ -57,7 +57,7 @@ cv.remind_day, cv.remind_day_key FROM crm_visit cv - LEFT JOIN crm_customer_temp cct ON cct.sid = cv.customerSid + LEFT JOIN crm_customer_temp cct ON cct.sid = cv.customerSid where cv.sid = #{sid} @@ -99,11 +99,8 @@ + select sso.staffSid,si.name from sys_staff_org sso + left join sys_staffinfo si on sso.staffSid = si.sid + where find_in_set(#{orgSid},replace(sso.orgSidPath,'/',',')) + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java index aec9b92dd7..bef147f7d2 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -165,5 +165,10 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { return new ResultBean>().success().setData(pv_result); } + @Override + public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { + return sysStaffinfoService.selectStaffList(pcSysStaffQuery); + } + } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 7618529ef1..709f5d472f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -500,4 +500,19 @@ public class SysStaffinfoService extends MybatisBaseService> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { + ResultBean> rb = ResultBean.fireFail(); + //根据当前staffSid查询分公司sid + String orgSid = ""; + List list = new ArrayList<>(); + ResultBean stringResultBean = sysStaffOrgService.selectSidPathByStaffSid(pcSysStaffQuery.getStaffSid()); + if (stringResultBean.getSuccess()) { + orgSid = stringResultBean.getData(); + } + if(StringUtils.isNotBlank(orgSid)){ + list = baseMapper.selectStaffList(orgSid); + } + return rb.success().setData(list); + } } \ No newline at end of file From eb6b5421fc86df7030aeab6d797d8757f7c0c09a Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Fri, 20 May 2022 16:44:29 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java | 2 +- .../anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml | 1 + .../anrui/base/biz/basemodelconfig/BaseModelConfigService.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java index 9277c15b76..c6b1f1f212 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java @@ -183,7 +183,7 @@ public interface BaseModelConfigMapper extends BaseMapper { AppModelConfigDetailsVo getAppProductionSchedulingDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid); //查询车型信息 - AppModelConfigVo getModelConfigList(String modelSid); + AppModelConfigVo getModelConfigList(@Param("modelSid") String modelSid,@Param("useOrgSid") String useOrgSid); List getModelConfigPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index ecee9ea395..b13664bf4b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -485,6 +485,7 @@ FROM base_vehicle_model bvm LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid where bvm.sid = #{modelSid} + and bvc.useOrgSid = #{useOrgSid}