diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsNewVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsNewVo.java index 5697bb1b22..86a1a49e28 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsNewVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsNewVo.java @@ -31,9 +31,9 @@ public class BaseVehicleOutDetailsNewVo implements Vo { @ApiModelProperty("合同编号") private String concatNo; @ApiModelProperty("实际购车人电话") - private String buyerTypeKey; + private String realityBuyCarPhone; @ApiModelProperty("实际购车人名称") - private String buyerTypeValue; + private String realityBuyCarName; @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("手机号") 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 746c8877d7..1ee41728c8 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 @@ -75,9 +75,9 @@ public class BaseVehicleOutApplyVoNew implements Vo { @ApiModelProperty("合同编号") private String concatNo; @ApiModelProperty("实际购车人电话") - private String buyerTypeKey; + private String realityBuyCarPhone; @ApiModelProperty("实际购车人名称") - private String buyerTypeValue; + private String realityBuyCarName; @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("手机号码") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml index cb822a5247..0cdd9e81bc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml @@ -179,7 +179,8 @@ bvoa.saleDate, bvo.`price`, bvoa.`contractNo` as concatNo, - bvoa.`buyerTypeValue`, + bvo.`realityBuyCarPhone`, + bvo.`realityBuyCarName`, bvoa.`customerName`, bvoa.`mobile`, bvo.`giftsDescription`, 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 e97e920257..5b7a9ad5ba 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 @@ -1812,7 +1812,7 @@ public class BaseVehicleOutService extends MybatisBaseService detailsNew(String sid) { ResultBean rb = ResultBean.fireFail(); BaseVehicleOutDetailsNewVo baseVehicleOutDetailsNewVo = baseMapper.detailsNew(sid); - baseVehicleOutDetailsNewVo.setBuyerTypeValue(baseVehicleOutDetailsNewVo.getBuyerTypeValue() + baseVehicleOutDetailsNewVo.getBuyerTypeKey()); + baseVehicleOutDetailsNewVo.setRealityBuyCarName(baseVehicleOutDetailsNewVo.getRealityBuyCarName() + baseVehicleOutDetailsNewVo.getRealityBuyCarPhone()); return rb.success().setData(baseVehicleOutDetailsNewVo); } 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 fc1005cb48..ad6c515dc5 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 @@ -17,8 +17,8 @@ bvoa.`orgName`, bvoa.`staffName`, bvoa.`contractNo` AS concatNo, - bvoa.buyerTypeKey, - bvoa.buyerTypeValue, + bvo.realityBuyCarPhone, + bvo.realityBuyCarName, bvoa.customerName, bvoa.mobile, bvo.materialName, 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 95190d365a..5e78766f57 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 @@ -125,7 +125,6 @@ public class BaseVehicleOutApplyService extends MybatisBaseService