问题优化

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("手机号")

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("手机号码")

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`,

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<BaseVehicleOutMapp
     public ResultBean<BaseVehicleOutDetailsNewVo> 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);
     }
 

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,

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<BaseVehicleOu
 			String createOrgSid = record.getCreateOrgSid();
 			String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
 			record.setCreateOrgName(createorgName);
-			record.setBuyerTypeValue(record.getBuyerTypeValue() + record.getBuyerTypeKey());
 			if (!"主车".equals(record.getMaterialName())){
 				record.setModelName("");
 				record.setInsideCode("");