From a2a97b4a41dbc5995d390319e5da2fa3051ef3e0 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 17 May 2023 10:55:56 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index dc83c48afe..0801269f61 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -398,11 +398,12 @@ From 3ebc99da77c6be84c6bb44760910cb053c5bd38b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 17 May 2023 11:12:13 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusArrearsCarryVehicleApplyService.java | 10 +- .../src/main/resources/ftl/gd2.ftl | 1275 +++++++++++++++++ 2 files changed, 1281 insertions(+), 4 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 9dba46884d..11ead8d349 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -769,7 +769,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService map) { String url = ""; - Map map = new HashMap<>(); - String ftl = "gd"; + String ftl = "gd2"; InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); //生成word文件名 String targetPath = docPdfComponent.getUploadTemplateUrl(); @@ -1011,6 +1010,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService stringLists = Arrays.asList(commitmentMoneyDate.split("-")); @@ -1269,6 +1270,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); if (invoicingDetailsVoResultBean.getData() != null) { map.put("orgName", invoicingDetailsVoResultBean.getData().getName()); + map.put("useOrgName",invoicingDetailsVoResultBean.getData().getName()); } } map.put("mobile", appOrderDetailsVo.getPhone()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl new file mode 100644 index 0000000000..2d11720fcb --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl @@ -0,0 +1,1275 @@ + + + + + Administrator + 孟哲 底 + 2 + 0 + 2023-05-17T03:04:00Z + 2023-05-17T03:04:00Z + 1 + 56 + 321 + 2 + 1 + 376 + 16 + + + wqlLaW5nc29mdCBQREYgdG8gV1BTIDgw + 2023-05-17T11:01:14Z + 2052-11.1.0.14309 + BCA06B95B3094C66B326482CD9041023_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 公 + + + + + + + + + + 司股东会对外担保决议 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 一、时间： + + + + + + + + + + + + + + + + + + + + + + + 二 + + + + + + + + + + + 、地点： + + + + + + + + + + + + + + + + + + + + + + 三、议题：关于 + + + + + + + + + + 是 + + + + + + + + + + 否同意本公司在 + + + + + + + + + + + + + + + + + + + + + + ${contractName!} + + + + + + + + + + + (合同) + + + + + + + + + + 中 + + + + + + + + + + + + + + + + + + + 为 + + + + + + + + + + + + + + + + + + + + + + ${customerName!} + + + + + + + + + + + + + + + + + + + + + 向 + + + + + + + + + + + + + + + + + + + + + + ${useOrgName!} + + + + + + + + + + + + + + + + + + + + + 提供 (反) 担 + + + + + + + + + + 保 + + + + + + + + + 事宜。 + + + + + + + + + + + + + + + + + + + + + + 四、根据《公 + + + + + + + + + + 司 + + + + + + + + + + 法》和公司章程规定，股东会会议应到股东 + + + + + + + + + + + + + + + + + + + + + 名，实 + + + + + + + + + + + + + + + + + + + 到 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 名，所持股份占公司全部股份 + + + + + + + + + + + + + + + + + + + + + %。本次股东会召集与 + + + + + + + + + + + + + + + + + + + 所作决议符合公司章程和《公司法》的规定，所作决议合法有效。与会股东经 + + + + + + + + + + 审 + + + + + + + + + + + + + + + + + + + 议 + + + + + + + + + + 、表决，一致通过以下决议： + + + + + + + + + + + + + + + + + + + + + + + 同意 + + + + + + + + + + + 本 + + + + + + + + + + + 公司在上述合同中提供 (反) 担保事宜。 + + + + + + + + + + + + + + + + + + + + + + 股东签字 + + + + + + + + + + ： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 公司 + + + + + + + + + + + + + + + + + + + + (公章) + + + + + + + + + + + + + + + + + + + 年 + + + + + + + + + + + + + + + + + + + + 月 日 + + + + + + + + + \ No newline at end of file From d7ce3fce93d85aa1facbc5027732399928c4e158 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 17 May 2023 11:35:11 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/commoncontract/CommonContractService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 8c0e8b7fa0..043e8b7b8c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2677,6 +2677,10 @@ public class CommonContractService extends MybatisBaseService> busList = busSalesOrderFeign.selectBusinessSid(params.getUserSid(), params.getOrgPath()); if (!busList.getData().isEmpty()) { qw.in("busSid", busList.getData()); + }else{ + IPage page = PagerUtil.queryToPage(query); + page.setRecords(new ArrayList<>()); + return page; } if (StringUtils.isNotBlank(params.getName())) { qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); From 4a7f75a64e6598219b610ca2fe218b72b9eee458 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 17 May 2023 11:51:56 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleOutApplyFeign.java | 2 +- .../BaseVehicleOutApplyFeignFallback.java | 6 +- .../BaseVehicleOutApplyQueryNew.java | 76 +++++++++++++ .../BaseVehicleOutApplyVoNew.java | 104 ++++++++++++++++++ .../BaseVehinstallmodel.java | 4 + .../BaseVehinstallmodelDetailsVo.java | 4 + .../BaseVehinstallmodelDto.java | 4 + .../BaseVehicleOutApplyMapper.java | 3 +- .../BaseVehicleOutApplyMapper.xml | 60 ++++++++-- .../BaseVehicleOutApplyRest.java | 11 +- .../BaseVehicleOutApplyService.java | 82 +++++++++++--- 11 files changed, 318 insertions(+), 38 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java index 2f76a20557..c71271e53f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java @@ -59,7 +59,7 @@ public interface BaseVehicleOutApplyFeign { @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("新增或修改") @PostMapping("/save") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java index c02f74e2a6..5f7f4770a8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java @@ -48,10 +48,10 @@ import java.util.List; @Component public class BaseVehicleOutApplyFeignFallback implements BaseVehicleOutApplyFeign { + @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-base/basevehicleoutapply/listPage无法访问"); + public ResultBean> listPage(PagerQuery pq) { + return null; } @Override diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java new file mode 100644 index 0000000000..f94ef06b39 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basevehicleoutapply; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(销售出库单)
+ * File: BaseVehicleOutApplyQuery.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery
+ * Description: 车辆出库单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆出库单 查询条件", description = "车辆出库单 查询条件") +public class BaseVehicleOutApplyQueryNew implements Query { + + @ApiModelProperty("物料编码") + private String materialCode; + @ApiModelProperty("销售类型key") + private String typeKey; + @ApiModelProperty("销售日期开始时间") + private String saleDateStart; + @ApiModelProperty("销售日期结束时间") + private String saleDateEnd; + @ApiModelProperty("合同编号") + private String concatNo; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("销售部门") + private String orgDeptSid; + @ApiModelProperty("销售专员") + private String staffSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("内部编码") + private String insideCode; + @ApiModelProperty("分公司sid") + private String orgSid; + @ApiModelProperty(value = "组织全路径") + private String orgSidPath; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java new file mode 100644 index 0000000000..eafbbec01f --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java @@ -0,0 +1,104 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basevehicleoutapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(销售出库单)
+ * File: BaseVehicleOutApplyVo.java
+ * Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo
+ * Description: 车辆出库单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-12 08:54:50
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆出库单 视图数据对象", description = "车辆出库单 视图数据对象") +public class BaseVehicleOutApplyVoNew implements Vo { + + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("分公司sid") + private String createOrgSid; + @ApiModelProperty("分公司名称") + private String createOrgName; + @ApiModelProperty("简述配置") + private String modelConfig; + @ApiModelProperty("内部编码") + private String insideCode; + @ApiModelProperty("销售类型") + private String type; + @ApiModelProperty("采购类型") + private String manPurOrderTypeValue; + @ApiModelProperty("销售日期") + private String saleDate; + @ApiModelProperty("成交价") + private String price; + @ApiModelProperty("销售部门") + private String orgName; + @ApiModelProperty("销售专员") + private String staffName; + @ApiModelProperty("合同编号") + private String concatNo; + @ApiModelProperty("是否为终端客户") + private String isTerminal; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("手机号码") + private String mobile; + @ApiModelProperty("物料名称") + private String materialName; + @ApiModelProperty("物料编码") + private String materialCode; + @ApiModelProperty("赠品价值") + private String giftsDescription; + @ApiModelProperty("销售折让") + private String salesAllowance; + @ApiModelProperty("中介人1") + private String middleOne; + @ApiModelProperty("返利金额1") + private String rebateMoneyOne; + @ApiModelProperty("中介人2") + private String middleTwo; + @ApiModelProperty("返利金额2") + private String rebateMoneyTwo; + @ApiModelProperty("内部引荐人姓名") + private String innerName; + + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java index 44734a34fe..b46272dd53 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java @@ -106,5 +106,9 @@ public class BaseVehinstallmodel extends BaseEntity { private String useOrgSid; // 使用组织 @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 + @ApiModelProperty("冷机品牌") + private String coolerBrand; + @ApiModelProperty("冷机型号") + private String coolerModel; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java index 6f9c0fd579..03c45b4890 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java @@ -104,6 +104,10 @@ public class BaseVehinstallmodelDetailsVo implements Vo { private String useOrgSid; // 使用组织 @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 + @ApiModelProperty("冷机品牌") + private String coolerBrand; + @ApiModelProperty("冷机型号") + private String coolerModel; @ApiModelProperty("销售订单中上装价格") private String topPrice; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java index 60f384ed05..76d1f5b353 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java @@ -114,5 +114,9 @@ public class BaseVehinstallmodelDto implements Dto { private String useOrgSid; // 使用组织 @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 + @ApiModelProperty("冷机品牌") + private String coolerBrand; + @ApiModelProperty("冷机型号") + private String coolerModel; } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java index 38679d354a..8e26c4395f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -56,7 +57,7 @@ public interface BaseVehicleOutApplyMapper extends BaseMapper voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml index 0df014cd83..72922f2afc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml @@ -1,13 +1,55 @@ - - - - - + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java index da3cbcb284..d4b90f3271 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.base.biz.basevehicleoutapply; +import com.yxt.anrui.base.api.basevehicleoutapply.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDetailsVo; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDto; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign; /** * Project: anrui-base(销售出库单)
@@ -65,9 +60,9 @@ public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign { @Override @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseVehicleOutApplyService.listPageVo(pq); + PagerVo pv = baseVehicleOutApplyService.listPageVo(pq); return rb.success().setData(pv); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java index ee93caec59..09d18b2094 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java @@ -28,22 +28,18 @@ package com.yxt.anrui.base.biz.basevehicleoutapply; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; +import com.yxt.anrui.base.api.basevehicleoutapply.*; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDetailsVo; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDto; -import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign; - +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; /** * Project: anrui-base(销售出库单)
@@ -60,19 +56,73 @@ import java.util.List; */ @Service public class BaseVehicleOutApplyService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(BaseVehicleOutApplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + + private QueryWrapper createQueryWrapper(BaseVehicleOutApplyQueryNew params) { QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + String orgSidPath = params.getOrgSidPath(); + SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); + String orgLevelKey = data.getOrgLevelKey(); + if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, 73); + qw.like("so.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + qw.eq("bvo.createOrgSid", params.getCreateOrgSid()); + } + //车架号 + if (StringUtils.isNotBlank(params.getMaterialCode())) { + qw.like("bvo.materialCode", params.getMaterialCode()); + } + //销售类型 + if (StringUtils.isNotBlank(params.getTypeKey())) { + qw.eq("bvo.typeKey", params.getTypeKey()); + } + //销售日期开始-销售日期结束 + qw.apply(StringUtils.isNotBlank(params.getSaleDateStart()), "date_format (bvo.saleDate,'%Y-%m-%d') >= date_format('" + params.getSaleDateStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(params.getSaleDateEnd()), "date_format (bvo.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%Y-%m-%d')" + ); + //合同编号 + if (StringUtils.isNotBlank(params.getConcatNo())) { + qw.like("bvo.concatNo", params.getConcatNo()); + } + //客户名称 + if (StringUtils.isNotBlank(params.getCustomerName())) { + qw.like("bvo.customerName", params.getCustomerName()); + } + //销售部门 + if (StringUtils.isNotBlank(params.getOrgDeptSid())) { + qw.eq("bvo.orgSid", params.getOrgDeptSid()); + } + //销售人员 + if (StringUtils.isNotBlank(params.getStaffSid())) { + qw.eq("bvo.staffSid", params.getStaffSid()); + } + //内部编码 + if (StringUtils.isNotBlank(params.getInsideCode())) { + qw.like("bv.insideCode", params.getInsideCode()); + } + if (StringUtils.isNotBlank(params.getOrgSid())) { + qw.eq("bvo.createOrgSid", params.getOrgSid()); + } + } return qw; } - public PagerVo listPageVo(PagerQuery pq) { - BaseVehicleOutApplyQuery query = pq.getParams(); + public PagerVo listPageVo(PagerQuery pq) { + BaseVehicleOutApplyQueryNew query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage pagging = baseMapper.selectPageVo(page, qw); + for (BaseVehicleOutApplyVoNew record : pagging.getRecords()) { + String createOrgSid = record.getCreateOrgSid(); + String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName(); + record.setMaterialCode(record.getMaterialCode().substring(record.getMaterialCode().length() - 8)); + record.setCreateOrgName(createorgName); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } From bd5f32f042505d79f956d74bd1b41713e9df315b Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 17 May 2023 14:04:28 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=AF=81=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinVehicleInvoiceDetailsVo.java | 2 ++ .../FinVehicleInvoiceMapper.xml | 1 + .../FinVehicleInvoiceService.java | 26 +++++++++++++++---- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java index 38507920a9..86b560a074 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java @@ -27,6 +27,8 @@ public class FinVehicleInvoiceDetailsVo implements Vo { private String customerName; @ApiModelProperty("车架号") private String vinNo; + @ApiModelProperty("车辆sid") + private String vehicleSid; @ApiModelProperty("发票类别") private String invoiceType; @ApiModelProperty("开票类型Key") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index 1729e8a0ab..b0fa0bb3e9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -159,6 +159,7 @@ v.contractNo, v.customerName, v.VIN as vinNo, + v.vehicleSid, v.invoiceType, v.invoiceTypeKey, v.invoiceAmount, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 8ebadc524d..aff9d0b689 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -3,7 +3,11 @@ package com.yxt.anrui.fin.biz.finvehicleinvoice; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.fin.api.finbillfile.FinBillFile; @@ -57,6 +61,12 @@ public class FinVehicleInvoiceService extends MybatisBaseService listPage(PagerQuery pq) { FinVehicleInvoiceQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); @@ -239,17 +249,23 @@ public class FinVehicleInvoiceService extends MybatisBaseService certificatePaths = new ArrayList<>(); //查询合格证 先判断是主车还是挂车 - if (StringUtils.isNotBlank(finVehicleInvoice.getVehicleType()) && StringUtils.isNotBlank(finVehicleInvoice.getBillingSid())) { + if (StringUtils.isNotBlank(finVehicleInvoice.getVehicleType()) && StringUtils.isNotBlank(finVehicleInvoice.getVehicleSid())) { if ("主车".equals(finVehicleInvoice.getVehicleType())) { - List vehicleAppendixList = baseVehicleAppendixFeign.selectBySid(finVehicleInvoice.getBillingSid()).getData(); - vo.setCertificatePaths(vehicleAppendixList); + BaseVehicleCertificateVo certificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finVehicleInvoice.getVehicleSid()).getData(); + if (null != certificateVo) { + String certificateVoSid = certificateVo.getSid(); + List vehicleAppendixList = baseVehicleAppendixFeign.selectBySid(certificateVoSid).getData(); + vo.setCertificatePaths(vehicleAppendixList); + } } else { - List commonAppendixVos = commonAppendixFeign.selByLinkSid(finVehicleInvoice.getBillingSid()).getData(); + List commonAppendixVos = commonAppendixFeign.selByLinkSid(finVehicleInvoice.getVehicleSid()).getData(); if (null != commonAppendixVos) { for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { if (null != commonAppendixVo) { if (StringUtils.isNotBlank(commonAppendixVo.getFileUrl())) { - certificatePaths.add(commonAppendixVo.getFileUrl()); + if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) { + certificatePaths.add(commonAppendixVo.getFileUrl()); + } } } } From 3c81b236a9494bc08288b2e2b76e17cb65864a25 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 17 May 2023 14:36:45 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index af1664d284..9e368d3386 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -3156,6 +3156,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); //查询该收款单已选款项中该合同号的所有车架号不为空的明细 String contractNo = v.getContractNo(); String uncollSid = ""; @@ -3240,6 +3241,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); //查询该收款单已选款项中该合同号的所有车架号不为空的明细 String contractNo = v.getContractNo(); String uncollSid = ""; @@ -3314,7 +3316,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService voListv = finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "订金"); finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null)); @@ -3325,6 +3326,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); //查询该收款单已选款项中该合同号的所有车架号不为空的明细 String contractNo = v.getContractNo(); List vinListVo = finSelectedReceivablesDetailedService.selectVinListVo_1(sid, 1, "订金", contractNo); @@ -3397,7 +3399,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); String uncollSid = ""; freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); //结算方式 @@ -3454,7 +3455,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); String uncollSid = ""; freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); //结算方式 @@ -3511,7 +3511,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); String uncollSid = ""; freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); //结算方式 From 874abf0c60acad15adbe9f41f036fba238fdfea2 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 17 May 2023 14:54:42 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/crmcustomerfile/CrmCustomerFileService.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java index 814d3d944b..b0bc86f11b 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java @@ -50,6 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -203,6 +204,7 @@ public class CrmCustomerFileService extends MybatisBaseService dataVos = baseMapper.selectByCustomerSid(customerSid); + dataVos.removeAll(Collections.singleton(null)); if (dataVos.size() > 0) { for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) { String createTime = appCustomerArchivesDataVo.getCreateTime(); @@ -212,10 +214,15 @@ public class CrmCustomerFileService extends MybatisBaseService listVo = baseMapper.selArchivesFileImageBySid(sid); + listVo.removeAll(Collections.singleton(null)); List list = new ArrayList<>(); - for (CrmFile crmFile : listVo) { - String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath(); - list.add(url); + if(!listVo.isEmpty()){ + for (CrmFile crmFile : listVo) { + if(StringUtils.isNotBlank(crmFile.getFilePath())){ + String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath(); + list.add(url); + } + } } appCustomerArchivesDataVo.setFiles(list); } From 13f27cd1eaf0ec64429009009391d8a8eff9d752 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 17 May 2023 15:00:08 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleOutApplyVoNew.java | 13 ++++++-- .../BaseVehinstallmodelDto.java | 5 ---- .../BaseVehinstallmodelVo.java | 6 ++++ .../BaseVehicleOutApplyService.java | 4 ++- .../BaseVehinstallmodelRest.java | 30 ++++++++++--------- .../BaseVehinstallmodelService.java | 17 ++++++----- .../BusSalesOrderVehicleService.java | 6 ++-- .../AppBusAdvanceGinvoiceapplyService.java | 12 ++++---- 8 files changed, 55 insertions(+), 38 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java index eafbbec01f..135d393575 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java @@ -84,6 +84,8 @@ public class BaseVehicleOutApplyVoNew implements Vo { private String materialName; @ApiModelProperty("物料编码") private String materialCode; + @ApiModelProperty("物料sid") + private String materialSid; @ApiModelProperty("赠品价值") private String giftsDescription; @ApiModelProperty("销售折让") @@ -98,7 +100,12 @@ public class BaseVehicleOutApplyVoNew implements Vo { private String rebateMoneyTwo; @ApiModelProperty("内部引荐人姓名") private String innerName; - - - + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String modelConfigSid; + @ApiModelProperty("车型与配置关联sid") + private String vehModelConfigSid; + @ApiModelProperty("车型配置简称") + private String modelName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java index 76d1f5b353..3ad0c035c6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java @@ -76,23 +76,18 @@ public class BaseVehinstallmodelDto implements Dto { @ApiModelProperty("颜色value") private String colorValue; // 颜色value @ApiModelProperty("外廓尺寸_长") - @NotBlank(message = "外廓尺寸长不能为空") private String wk_long; // 外廓尺寸_长 @ApiModelProperty("外廓尺寸_宽") - @NotBlank(message = "外廓尺寸宽不能为空") private String wk_wide; // 外廓尺寸_宽 @ApiModelProperty("外廓尺寸_高") - @NotBlank(message = "外廓尺寸高不能为空") private String wk_high; // 外廓尺寸_高 @ApiModelProperty("板材材质key") private String plateMaterialKey; // 板材材质key @ApiModelProperty("板材材质value") private String plateMaterialValue; // 板材材质value @ApiModelProperty("板材厚度_底") - @NotBlank(message = "板材厚度底不能为空") private String plateThicknessBottom; // 板材厚度_底 @ApiModelProperty("板材厚度_边") - @NotBlank(message = "板材厚度边不能为空") private String plateThicknessEdge; // 板材厚度_边 @ApiModelProperty("篷布滑道key") private String tarpaulinSlideKey; // 篷布滑道key diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java index eba8c1f88f..13e8c928b4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java @@ -55,6 +55,8 @@ public class BaseVehinstallmodelVo implements Vo { @ApiModelProperty("车辆功能value") private String vehicleTypeValue; // 车辆功能value + @ApiModelProperty("上装名称key") + private String installNameKey; // 上装名称key @ApiModelProperty("上装名称value") private String installNameValue; // 上装名称value @ApiModelProperty("委改方式value") @@ -91,4 +93,8 @@ public class BaseVehinstallmodelVo implements Vo { private String floorHeating; // 底板加热 @ApiModelProperty("更多配置") private String moreConfig; // 更多配置 + @ApiModelProperty("冷机品牌") + private String coolerBrand; + @ApiModelProperty("冷机型号") + private String coolerModel; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java index 09d18b2094..fb3b8507a5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java @@ -119,7 +119,9 @@ public class BaseVehicleOutApplyService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java index 3fab2652e5..8ce146c4c5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java @@ -78,20 +78,22 @@ public class BaseVehinstallmodelRest implements BaseVehinstallmodelFeign { String wk_high = dto.getWk_high(); String plateThicknessBottom = dto.getPlateThicknessBottom(); String plateThicknessEdge = dto.getPlateThicknessEdge(); - if (StringUtils.isBlank(wk_long)){ - return rb.setMsg("外廓尺寸长不能为空"); - } - if (StringUtils.isBlank(wk_wide)){ - return rb.setMsg("外廓尺寸宽不能为空"); - } - if (StringUtils.isBlank(wk_high)){ - return rb.setMsg("外廓尺寸高不能为空"); - } - if (StringUtils.isBlank(plateThicknessBottom)){ - return rb.setMsg("板材厚度底不能为空"); - } - if (StringUtils.isBlank(plateThicknessEdge)){ - return rb.setMsg("板材厚度边不能为空"); + if (!"08".equals(dto.getInstallNameKey())){ + if (StringUtils.isBlank(wk_long)){ + return rb.setMsg("外廓尺寸长不能为空"); + } + if (StringUtils.isBlank(wk_wide)){ + return rb.setMsg("外廓尺寸宽不能为空"); + } + if (StringUtils.isBlank(wk_high)){ + return rb.setMsg("外廓尺寸高不能为空"); + } + if (StringUtils.isBlank(plateThicknessBottom)){ + return rb.setMsg("板材厚度底不能为空"); + } + if (StringUtils.isBlank(plateThicknessEdge)){ + return rb.setMsg("板材厚度边不能为空"); + } } baseVehinstallmodelService.saveOrUpdateDto(dto); return rb.success(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java index 27f2b972be..38a7809498 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java @@ -85,13 +85,16 @@ public class BaseVehinstallmodelService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); List records = pagging.getRecords(); for (BaseVehinstallmodelVo record : records) { - String wk_long = record.getWk_long(); - String wk_wide = record.getWk_wide(); - String wk_high = record.getWk_high(); - record.setWk("长"+wk_long+"mm,宽"+wk_wide+"mm,高"+wk_high+"mm"); - String plateThicknessBottom = record.getPlateThicknessBottom(); - String plateThicknessEdge = record.getPlateThicknessEdge(); - record.setPlateThickness("底"+plateThicknessBottom+"mm,边"+plateThicknessEdge+"mm"); + String installNameKey = record.getInstallNameKey(); + if (!"08".equals(installNameKey)){ + String wk_long = record.getWk_long(); + String wk_wide = record.getWk_wide(); + String wk_high = record.getWk_high(); + record.setWk("长"+wk_long+"mm,宽"+wk_wide+"mm,高"+wk_high+"mm"); + String plateThicknessBottom = record.getPlateThicknessBottom(); + String plateThicknessEdge = record.getPlateThicknessEdge(); + record.setPlateThickness("底"+plateThicknessBottom+"mm,边"+plateThicknessEdge+"mm"); + } } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index dd7aeec720..0d920814c0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -287,8 +287,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService trailerVos = traliveredVo.getList(); if (trailerVos != null && trailerVos.size() > 0) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 5dd37fe90a..f0be39b7ef 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -422,7 +422,7 @@ public class AppBusAdvanceGinvoiceapplyService { finBillApplicationDto.setSaleTypeValue(dto.getSaleType()); finBillApplicationDto.setSaleDeptName(dto.getSellerName()); finBillApplicationDto.setStaffName(dto.getSellerName()); - finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName()); + finBillApplicationDto.setOpenTickUnitName(dto.getInvoicingUnit()); finBillApplicationDto.setCustomerName(dto.getName()); finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney()); finBillApplicationDto.setOpenTickName(dto.getOpenTickName()); @@ -530,7 +530,7 @@ public class AppBusAdvanceGinvoiceapplyService { finBillApplicationDto.setSaleTypeValue(dto.getSaleType()); finBillApplicationDto.setSaleDeptName(dto.getSellerName()); finBillApplicationDto.setStaffName(dto.getSellerName()); - finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName()); + finBillApplicationDto.setOpenTickUnitName(dto.getInvoicingUnit()); finBillApplicationDto.setCustomerName(dto.getName()); finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney()); finBillApplicationDto.setOpenTickName(dto.getOpenTickName()); @@ -610,9 +610,9 @@ public class AppBusAdvanceGinvoiceapplyService { submitAdvanceInvoiceDto.setIsLQOrigInvoice(dto.getGetOriginalValue()); submitAdvanceInvoiceDto.setOrgSidPath(dto.getOrgPath()); submitAdvanceInvoiceDto.setSaleTypeValue(dto.getSaleType()); - submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerName()); + submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerDept()); submitAdvanceInvoiceDto.setStaffName(dto.getSellerName()); - submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getOpenTickName()); + submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getInvoicingUnit()); submitAdvanceInvoiceDto.setCustomerName(dto.getName()); submitAdvanceInvoiceDto.setOneBillMoney(dto.getInvoiceMoney()); submitAdvanceInvoiceDto.setOpenTickSid(dto.getOpenTickSid()); @@ -1084,9 +1084,9 @@ public class AppBusAdvanceGinvoiceapplyService { submitAdvanceInvoiceDto.setIsLQOrigInvoice(dto.getGetOriginalValue()); submitAdvanceInvoiceDto.setOrgSidPath(dto.getOrgPath()); submitAdvanceInvoiceDto.setSaleTypeValue(dto.getSaleType()); - submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerName()); + submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerDept()); submitAdvanceInvoiceDto.setStaffName(dto.getSellerName()); - submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getOpenTickName()); + submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getInvoicingUnit()); submitAdvanceInvoiceDto.setCustomerName(dto.getName()); submitAdvanceInvoiceDto.setOneBillMoney(dto.getInvoiceMoney()); submitAdvanceInvoiceDto.setOpenTickSid(dto.getOpenTickSid()); From 46fdfd550c5dca526dd91aef30b364714f1f351a Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 17 May 2023 15:08:27 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBusDeliveredApplyService.java | 76 ++++++++++++------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index 4115b902b8..f1463fcf18 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -428,35 +428,53 @@ public class AppBusDeliveredApplyService { //成交价2个格 String topPrice = baseVehinstallmodelDetailsVo.getTopPrice(); configVoList.add(getConfigValueSpanSize("成交价", topPrice, 2)); - //车辆功能 - String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue(); - configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1)); - //上装名称 - String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue(); - configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1)); - //委改方式 - String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue(); - configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1)); - //委改厂 - configVoList.add(getConfigValueSpanSize("委改厂", baseVehinstallmodelDetailsVo.getRefitFactory(), 1)); - //外廓尺寸 - configVoList.add(getConfigValueSpanSize("外廓尺寸", baseVehinstallmodelDetailsVo.getWk_long() + "*" + baseVehinstallmodelDetailsVo.getWk_wide() + "*" + baseVehinstallmodelDetailsVo.getWk_high(), 1)); - //颜色 - configVoList.add(getConfigValueSpanSize("颜色", baseVehinstallmodelDetailsVo.getColorValue(), 1)); - //板材材质 - configVoList.add(getConfigValueSpanSize("板材材质", baseVehinstallmodelDetailsVo.getPlateMaterialValue(), 1)); - //板材厚度 - configVoList.add(getConfigValueSpanSize("板材厚度", baseVehinstallmodelDetailsVo.getPlateThicknessBottom() + "*" + baseVehinstallmodelDetailsVo.getPlateThicknessEdge(), 1)); - //篷布滑道 - configVoList.add(getConfigValueSpanSize("篷布滑道", baseVehinstallmodelDetailsVo.getTarpaulinSlide(), 1)); - //冷藏冷机 - configVoList.add(getConfigValueSpanSize("冷藏冷机", baseVehinstallmodelDetailsVo.getRefrigerator(), 1)); - //自卸液压盖版 - configVoList.add(getConfigValueSpanSize("自卸液压盖版", baseVehinstallmodelDetailsVo.getSelfUnHyCoPl(), 1)); - //底板加热 - configVoList.add(getConfigValueSpanSize("底板加热", baseVehinstallmodelDetailsVo.getFloorHeating(), 1)); - //更多配置2个格 - configVoList.add(getConfigValueSpanSize("更多配置", baseVehinstallmodelDetailsVo.getMoreConfig(), 2)); + String installNameKey = baseVehinstallmodelDetailsVo.getInstallNameKey(); + if("08".equals(installNameKey)){ + //车辆功能 + String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue(); + configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1)); + //上装名称 + String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue(); + configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1)); + //委改方式 + String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue(); + configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1)); + //委改厂 + configVoList.add(getConfigValueSpanSize("供应商", baseVehinstallmodelDetailsVo.getRefitFactory(), 1)); + configVoList.add(getConfigValueSpanSize("冷机品牌", baseVehinstallmodelDetailsVo.getCoolerBrand(), 1)); + configVoList.add(getConfigValueSpanSize("冷机型号", baseVehinstallmodelDetailsVo.getCoolerModel(), 1)); + }else{ + //车辆功能 + String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue(); + configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1)); + //上装名称 + String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue(); + configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1)); + //委改方式 + String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue(); + configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1)); + //委改厂 + configVoList.add(getConfigValueSpanSize("供应商", baseVehinstallmodelDetailsVo.getRefitFactory(), 1)); + //外廓尺寸 + configVoList.add(getConfigValueSpanSize("外廓尺寸", baseVehinstallmodelDetailsVo.getWk_long() + "*" + baseVehinstallmodelDetailsVo.getWk_wide() + "*" + baseVehinstallmodelDetailsVo.getWk_high(), 1)); + //颜色 + configVoList.add(getConfigValueSpanSize("颜色", baseVehinstallmodelDetailsVo.getColorValue(), 1)); + //板材材质 + configVoList.add(getConfigValueSpanSize("板材材质", baseVehinstallmodelDetailsVo.getPlateMaterialValue(), 1)); + //板材厚度 + configVoList.add(getConfigValueSpanSize("板材厚度", baseVehinstallmodelDetailsVo.getPlateThicknessBottom() + "*" + baseVehinstallmodelDetailsVo.getPlateThicknessEdge(), 1)); + //篷布滑道 + configVoList.add(getConfigValueSpanSize("篷布滑道", baseVehinstallmodelDetailsVo.getTarpaulinSlide(), 1)); + //冷藏冷机 + configVoList.add(getConfigValueSpanSize("冷藏冷机", baseVehinstallmodelDetailsVo.getRefrigerator(), 1)); + //自卸液压盖版 + configVoList.add(getConfigValueSpanSize("自卸液压盖版", baseVehinstallmodelDetailsVo.getSelfUnHyCoPl(), 1)); + //底板加热 + configVoList.add(getConfigValueSpanSize("底板加热", baseVehinstallmodelDetailsVo.getFloorHeating(), 1)); + //更多配置2个格 + configVoList.add(getConfigValueSpanSize("更多配置", baseVehinstallmodelDetailsVo.getMoreConfig(), 2)); + } + handCarInfo.add(configVoList); } From f9c881b7c17ee69f4c2076851eb05b08b71994e4 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 17 May 2023 15:17:06 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 9e368d3386..aada5de159 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -3399,6 +3399,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); String uncollSid = ""; freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); //结算方式 @@ -3455,6 +3456,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); String uncollSid = ""; freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); //结算方式 @@ -3511,6 +3513,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); String uncollSid = ""; freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); //结算方式 From 8050aca0f46c9e573e0ad1fdd562a517f5789796 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 17 May 2023 16:43:37 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AC=A0=E6=AC=BE?= =?UTF-8?q?=E6=8F=90=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/SolutionsDetailsssVo.java | 7 +++++++ .../biz/bussalesorder/BusSalesOrderService.java | 8 ++++++++ .../BusSalesOrderVehicleService.java | 15 +++++++++++++++ .../FinUncollectedReceivablesDetailedFeign.java | 7 +++++++ ...collectedReceivablesDetailedFeignFallback.java | 10 ++++++++++ .../FinUncollectedReceivablesDetailedMapper.java | 4 ++++ .../FinUncollectedReceivablesDetailedMapper.xml | 10 ++++++++++ .../FinUncollectedReceivablesDetailedRest.java | 10 ++++++++++ .../FinUncollectedReceivablesDetailedService.java | 14 +++++++++++++- 9 files changed, 84 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java index 6a671dc9a1..805fa62282 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java @@ -151,4 +151,11 @@ public class SolutionsDetailsssVo { @ApiModelProperty("名义留购价") private String nominalPrice; + @ApiModelProperty("单台成交价") + private String finalPrice; + @ApiModelProperty("挂车价格") + private String gcPrice; + @ApiModelProperty("上装成交价") + private String szPrice; + } 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 b854904fca..76f922df04 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 @@ -306,6 +306,8 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByCreateBySidOne(userSid); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bv.sid",listResultBean.getData()); + } List stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw); stringList.removeAll(Collections.singleton(null)); return rb.success().setData(stringList); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 0d920814c0..1de2e7f802 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -49,6 +49,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -93,6 +94,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list, String sid) { if (list.size() > 0) { @@ -331,6 +334,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(query.getContractNo()); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bv.sid",listResultBean.getData()); + } List list = baseMapper.getCanUseCars(qw); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { @@ -390,6 +399,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo()); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bv.sid",listResultBean.getData()); + } IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); List list = pagging.getRecords(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index 809f56a9e4..a7e55d19ba 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -108,4 +108,11 @@ public interface FinUncollectedReceivablesDetailedFeign { @GetMapping("/receivedSelect") ResultBean receivedSelect(@RequestParam("busVinSid") String busVinSid, @RequestParam("vinSid") String vinSid); + @ApiOperation("查询车辆的应收未收款项") + @GetMapping("/selectByContractNoOne") + ResultBean> selectByContractNoOne(@RequestParam("contractNo") String contractNo); + + @ApiOperation("查询车辆的应收未收款项") + @GetMapping("/selectByCreateBySidOne") + ResultBean> selectByCreateBySidOne(@RequestParam("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index 7b64b63449..2b1b65e2ee 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java @@ -116,4 +116,14 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll return null; } + @Override + public ResultBean> selectByContractNoOne(String contractNo) { + return null; + } + + @Override + public ResultBean> selectByCreateBySidOne(String userSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index bccb894868..2b1c5f621e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -95,4 +95,8 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper fetchYsSidByOrderVehSid(String sid); + + List selectByContractNoOne(String contractNo); + + List selectByCreateBySidOne(String userSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 722df241af..af838f15be 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -148,4 +148,14 @@ WHERE furd.busVinSid = #{busVinSid} + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index 546ea34428..c957941b69 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -137,6 +137,16 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece return finUncollectedReceivablesDetailedService.receivedSelect(busVinSid, vinSid); } + @Override + public ResultBean> selectByContractNoOne(String contractNo) { + return finUncollectedReceivablesDetailedService.selectByContractNoOne(contractNo); + } + + @Override + public ResultBean> selectByCreateBySidOne(String userSid) { + return finUncollectedReceivablesDetailedService.selectByCreateBySidOne(userSid); + } + @Override public ResultBean> selectByContractNo(String contractNo) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 91526b0cea..f9c5c04e55 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -210,7 +210,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } else { if ("2".equals(v.getPayTypeKey())) { v.setVIN(temporaryNo.substring(temporaryNo.length() - 2)); - }else{ + } else { v.setVIN(temporaryNo); } } @@ -779,4 +779,16 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService public List fetchYsSidByOrderVehSid(String sid) { return baseMapper.fetchYsSidByOrderVehSid(sid); } + + public ResultBean> selectByContractNoOne(String contractNo) { + ResultBean> rb = ResultBean.fireFail(); + List stringList = baseMapper.selectByContractNoOne(contractNo); + return rb.success().setData(stringList); + } + + public ResultBean> selectByCreateBySidOne(String userSid) { + ResultBean> rb = ResultBean.fireFail(); + List stringList = baseMapper.selectByCreateBySidOne(userSid); + return rb.success().setData(stringList); + } } \ No newline at end of file