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 c9e0fb1580..4b9f76351b 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
@@ -39,8 +39,10 @@
ON bvoa.`sid` = bvo.`mainSid`
LEFT JOIN base_vehicle bv
ON bv.sid = bvo.vinSid
- LEFT JOIN base_vehmodel_config bvc ON bv.modelSid = bvc.modelSid AND bv.modelConfigSid =
- bvc.configurationItemsSid AND bv.createOrgSid = bvc.useOrgSid
+ LEFT JOIN base_vehmodel_config bvc
+ ON bv.modelSid = bvc.modelSid
+ AND bv.modelConfigSid = bvc.configurationItemsSid
+ AND bv.createOrgSid = bvc.useOrgSid
${ew.sqlSegment}
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 fb3b8507a5..26c782a07c 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
@@ -70,7 +70,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService= 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())) {
qw.like("bv.insideCode", params.getInsideCode());
}
if (StringUtils.isNotBlank(params.getOrgSid())) {
- qw.eq("bvo.createOrgSid", params.getOrgSid());
+ qw.eq("bvoa.createOrgSid", params.getOrgSid());
}
}
return qw;