问题优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExeclNew.java

@@ -39,8 +39,10 @@ public class BaseVehicleOutVoExeclNew {
     private String staffName;
     @ExportEntityMap(CnName = "合同编号", EnName = "concatNo")
     private String concatNo;
-    @ExportEntityMap(CnName = "实际购车人", EnName = "buyerTypeValue")
-    private String buyerTypeValue;
+    @ExportEntityMap(CnName = "实际购车人电话", EnName = "realityBuyCarPhone")
+    private String realityBuyCarPhone;
+    @ExportEntityMap(CnName = "实际购车人名称", EnName = "realityBuyCarName")
+    private String realityBuyCarName;
     @ExportEntityMap(CnName = "客户名称", EnName = "customerName")
     private String customerName;
     @ExportEntityMap(CnName = "手机号码", EnName = "mobile")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@@ -204,13 +204,14 @@
         RIGHT(bvo.vinNo,8) AS vinNo,
         bv.modelName AS modelConfig,
         bv.insideCode,
-        bvo.type,
+        bvoa.saleTypeValue as `type`,
         bvoa.saleDate,
         bvo.price,
         bvoa.orgName,
         bvoa.staffName,
         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

@@ -1826,7 +1826,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 orgSidPath = orgSidPath.substring(0, 73);
                 qw.like("so.orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
-                qw.eq("bvo.createOrgSid", params.getCreateOrgSid());
+                qw.eq("bvoa.createOrgSid", params.getCreateOrgSid());
             }
             //车架号
             if (StringUtils.isNotBlank(params.getVinNo())) {
@@ -1834,27 +1834,27 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
             //销售类型
             if (StringUtils.isNotBlank(params.getTypeKey())) {
-                qw.eq("bvo.typeKey", params.getTypeKey());
+                qw.eq("bvoa.saleTypeKey", 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')"
+            qw.apply(StringUtils.isNotBlank(params.getSaleDateStart()), "date_format (bvoa.saleDate,'%Y-%m-%d') >= date_format('" + params.getSaleDateStart() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(params.getSaleDateEnd()), "date_format (bvoa.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%Y-%m-%d')"
                     );
             //合同编号
             if (StringUtils.isNotBlank(params.getConcatNo())) {
-                qw.like("bvo.concatNo", params.getConcatNo());
+                qw.like("bvoa.contractNo", params.getConcatNo());
             }
             //客户名称
             if (StringUtils.isNotBlank(params.getCustomerName())) {
-                qw.like("bvo.customerName", params.getCustomerName());
+                qw.like("bvoa.customerName", params.getCustomerName());
             }
             //销售部门
             if (StringUtils.isNotBlank(params.getOrgDeptSid())) {
-                qw.eq("bvo.orgSid", params.getOrgDeptSid());
+                qw.eq("bvoa.orgSid", params.getOrgDeptSid());
             }
             //销售人员
             if (StringUtils.isNotBlank(params.getStaffSid())) {
-                qw.eq("bvo.staffSid", params.getStaffSid());
+                qw.eq("bvoa.staffSid", params.getStaffSid());
             }
             //内部编码
             if (StringUtils.isNotBlank(params.getInsideCode())) {
@@ -1862,7 +1862,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
             //分公司
             if (StringUtils.isNotBlank(params.getOrgSid())) {
-                qw.eq("bvo.createOrgSid", params.getOrgSid());
+                qw.eq("bvoa.createOrgSid", params.getOrgSid());
             }
         }
         List<BaseVehicleOutVoExeclNew> baseVehicleOutVoExeclNews = baseMapper.listExcelNew(qw);