From d7a2f75d59ba5296b4894efa2222f96ac5cd87f0 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 24 May 2023 14:51:16 +0800 Subject: [PATCH 1/3] =?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 --- .../basevehicleoutapply/BaseVehicleOutApplyQueryNew.java | 2 ++ .../basevehicleoutapply/BaseVehicleOutApplyMapper.xml | 2 +- .../basevehicleoutapply/BaseVehicleOutApplyService.java | 9 +++++---- 3 files changed, 8 insertions(+), 5 deletions(-) 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 index f94ef06b39..1eccc6362c 100644 --- 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 @@ -50,6 +50,8 @@ public class BaseVehicleOutApplyQueryNew implements Query { @ApiModelProperty("物料编码") private String materialCode; + @ApiModelProperty("车架号") + private String vinNo; @ApiModelProperty("销售类型key") private String typeKey; @ApiModelProperty("销售日期开始时间") 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 4b9f76351b..9dcc56ba32 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 @@ -10,7 +10,7 @@ bvoa.`createOrgSid`, bv.configName AS modelConfig, bv.insideCode, - bvo.type, + bvoa.saleTypeValue AS `type`, bvo.manPurOrderTypeValue, bvoa.`saleDate`, bvo.`price`, 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 26c782a07c..b9e875f52b 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 @@ -72,10 +72,14 @@ public class BaseVehicleOutApplyService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); From a4d96bb3b0224079cb7f85a1f5a0c007aec8b5e0 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 24 May 2023 15:02:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9A=8F=E8=BD=A6=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E7=AE=A1=E7=90=86dto=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BD=A6=E5=9E=8Bsid=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busvehicleinformation/BusVehicleInformation.java | 5 ++++- .../busvehicleinformation/BusVehicleInformationDto.java | 8 ++++---- .../BusVehicleInformationHandover.java | 5 +++++ .../BusVehicleInformationHandoverDto.java | 4 ++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java index d0a7f2a0b9..131117a50c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java @@ -36,5 +36,8 @@ public class BusVehicleInformation extends BaseEntity { private Integer gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有 @ApiModelProperty("随车资料交接表sid") private String handoverSid; // 随车资料交接表sid - + @ApiModelProperty("交接次数") + private Integer handoverNum; // 交接次数 + @ApiModelProperty("是否是燃气车 0不是1是") + private Integer isFuelVehicle; // 是否是燃气车 0不是1是 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationDto.java index cb87a23821..6eaafdd072 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationDto.java @@ -13,10 +13,6 @@ import lombok.Data; public class BusVehicleInformationDto implements Dto { @ApiModelProperty("车钥匙个数") private Integer vehicleKeyNum; // 车钥匙个数 -// @ApiModelProperty("发票0无1有") -// private Integer invoice; // 发票 -// @ApiModelProperty("合格证0无1有") -// private Integer credential; // 合格证0无1有 @ApiModelProperty("一致性证书0无1有") private Integer certificate; // 一致性证书0无1有 @ApiModelProperty("申请表0无1有") @@ -31,4 +27,8 @@ public class BusVehicleInformationDto implements Dto { private Integer gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有 @ApiModelProperty("随车资料交接表sid") private String handoverSid; // 随车资料交接表sid + @ApiModelProperty("交接次数") + private Integer handoverNum; // 交接次数 + @ApiModelProperty("是否是燃气车 0不是1是") + private Integer isFuelVehicle; // 是否是燃气车 0不是1是 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java index cefbfc7aa6..886e802ea0 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java @@ -29,6 +29,8 @@ public class BusVehicleInformationHandover extends BaseEntity { private String customerName; // 客户名称 @ApiModelProperty("车型名") private String model; // 车型名 + @ApiModelProperty("车型sid") + private String modelSid; @ApiModelProperty("合同号") private String contractNo; // 合同号 @ApiModelProperty("接收人") @@ -43,4 +45,7 @@ public class BusVehicleInformationHandover extends BaseEntity { private String useOrgName; @ApiModelProperty("关联业务sid") private String busSid; + @ApiModelProperty("是否是燃气车 0不是1是") + private Integer isFuelVehicle; // 是否是燃气车 0不是1是 + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java index 4c3fe84d84..1bb1578422 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java @@ -31,6 +31,8 @@ public class BusVehicleInformationHandoverDto implements Dto { private String customerName; // 客户名称 @ApiModelProperty("车型名") private String model; // 车型名 + @ApiModelProperty("车型sid") + private String modelSid; @ApiModelProperty("合同号") private String contractNo; // 合同号 @ApiModelProperty("接收人") @@ -49,4 +51,6 @@ public class BusVehicleInformationHandoverDto implements Dto { private BusVehicleInformationDto busVehicleInformation; @ApiModelProperty("备注信息") private String remarks; + @ApiModelProperty("是否是燃气车 0不是1是") + private Integer isFuelVehicle; // 是否是燃气车 0不是1是 } From fbc2aabb646f11a4d5982490ec8bda7dc6ab2c2d Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 24 May 2023 15:02:38 +0800 Subject: [PATCH 3/3] =?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 --- .../anrui/base/biz/basevehicleout/BaseVehicleOutService.java | 3 +-- .../biz/basevehicleoutapply/BaseVehicleOutApplyService.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index c029d0b7f0..6e1c3f32ff 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -1496,7 +1496,7 @@ public class BaseVehicleOutService extends MybatisBaseService