问题优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java

@@ -50,6 +50,8 @@ public class BaseVehicleOutApplyQueryNew implements Query {
 
     @ApiModelProperty("物料编码")
     private String materialCode;
+    @ApiModelProperty("车架号")
+    private String vinNo;
     @ApiModelProperty("销售类型key")
     private String typeKey;
     @ApiModelProperty("销售日期开始时间")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@@ -10,7 +10,7 @@
         bvoa.`createOrgSid`,
         bv.configName AS modelConfig,
         bv.insideCode,
-        bvo.type,
+        bvoa.saleTypeValue AS `type`,
         bvo.manPurOrderTypeValue,
         bvoa.`saleDate`,
         bvo.`price`,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@@ -72,10 +72,14 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
 			} else if ("3".equals(orgLevelKey)) {
 				qw.eq("bvoa.createOrgSid", params.getCreateOrgSid());
 			}
-			//车架号
+			//物料编码
 			if (StringUtils.isNotBlank(params.getMaterialCode())) {
 				qw.like("bvo.materialCode", params.getMaterialCode());
 			}
+			//车架号
+			if (StringUtils.isNotBlank(params.getVinNo())) {
+				qw.like("bvo.vinNo", params.getVinNo());
+			}
 			//销售类型
 			if (StringUtils.isNotBlank(params.getTypeKey())) {
 				qw.eq("bvoa.saleTypeKey", params.getTypeKey());
@@ -119,9 +123,6 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
 		for (BaseVehicleOutApplyVoNew record : pagging.getRecords()) {
 			String createOrgSid = record.getCreateOrgSid();
 			String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
-			if (StringUtils.isNotBlank(record.getMaterialCode())){
-				record.setMaterialCode(record.getMaterialCode().substring(record.getMaterialCode().length() - 8));
-			}
 			record.setCreateOrgName(createorgName);
 		}
 		PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);