问题优化

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 =
+        LEFT JOIN base_vehmodel_config bvc
-        bvc.configurationItemsSid AND bv.createOrgSid = bvc.useOrgSid
+        ON bv.modelSid = bvc.modelSid
+        AND bv.modelConfigSid = bvc.configurationItemsSid
+        AND bv.createOrgSid = bvc.useOrgSid
         <where>
             ${ew.sqlSegment}
         </where>

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<BaseVehicleOu
 				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.getMaterialCode())) {
@@ -78,34 +78,34 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
 			}
 			//销售类型
 			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')").
+			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 (bvo.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%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;