Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java

@@ -166,4 +166,6 @@ public class BaseVehicleDto implements Dto {
 
     @ApiModelProperty(value = "组织全路径")
     private String orgSidPath;
+    @ApiModelProperty("厂家开票日期")
+    private String manDate;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java

@@ -59,6 +59,9 @@ public class BaseVehicleExportQuery implements Query {
     @ApiModelProperty(value = "买断结束日期")
     private String solidEndDate;
 
+    private String manDateStart;
+    private String manDateEnd;
+
     @ApiModelProperty(value = "分公司名称")
     private String orgName;
     private String userSid;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java

@@ -139,6 +139,8 @@ public class BaseVehicleExportVo implements Vo {
     @ExportEntityMap(CnName = "买断日期", EnName = "solidDate")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String solidDate;
+    @ExportEntityMap(CnName = "厂家开票日期",EnName = "manDate")
+    private String manDate;
     @ExportEntityMap(CnName = "全款销售指导价", EnName = "guidedPrice")
     private String guidedPrice;
     @ExportEntityMap(CnName = "贷款销售指导价", EnName = "manufactorSettlementPrice")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java

@@ -64,6 +64,10 @@ public class BaseVehicleQuery implements Query {
     private String solidStartDate;
     @ApiModelProperty(value = "买断结束日期")
     private String solidEndDate;
+    @ApiModelProperty("厂家开票日期开始")
+    private String manDateStart;
+    @ApiModelProperty("厂家开票日期结束")
+    private String manDateEnd;
 
     @ApiModelProperty(value = "买断状态")
     private String settlementStatus;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java

@@ -158,4 +158,7 @@ public class BaseVehicleSelectVo implements Vo {
     private String orgPriceDate;
     @ApiModelProperty(value = "组织全路径")
     private String orgSidPath;
+
+    @ApiModelProperty("厂家开票日期")
+    private String manDate;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java

@@ -270,4 +270,7 @@ public class BaseVehicleVo implements Vo {
     private String totalDealPrice;
     @ApiModelProperty(value = "公司入库日期")
     private String orgPriceDate;
+
+    @ApiModelProperty("厂家开票日期")
+    private String manDate;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -128,7 +128,8 @@
         bvcf.carModel,
         bvm.modelName AS modelNameQuan,
         bvm.`brandName` AS vehModelBrandName,
-        bvc.guidedPrice
+        bvc.guidedPrice,
+        bv.manDate
         FROM
         base_vehicle bv
         LEFT JOIN base_vehicle_model bvm
@@ -1678,6 +1679,7 @@
         bv.priceDate,
         bv.solidDate,
         bv.salePrice,
+        bv.manDate,
         bv.createOrgSid,
         bv.createOrgName,
         bv.useOrgName,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -732,8 +732,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//常用配置名称
                 qw.eq("bmc.configName", pagerQuery.getConfigName());
             }
+            //厂家开票日期
+            qw.apply(StringUtils.isNotEmpty(pagerQuery.getManDateStart()), "date_format (bv.manDate,'%Y-%m-%d') >= date_format('" + pagerQuery.getManDateStart() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotEmpty(pagerQuery.getManDateEnd()), "date_format (bv.manDate,'%Y-%m-%d') <= date_format('" + pagerQuery.getManDateEnd() + "','%Y-%m-%d')"
+                    );
             qw.orderByDesc("bv.createOrgSid");
             qw.orderByDesc("bv.priceDate");
+
         }
         List<BaseVehicleExportVo> baseVehicleExportVoList = baseMapper.selByExcel(qw);
         int id = 1;
@@ -4133,6 +4138,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         qw.apply(StringUtils.isNotEmpty(pricestartDate), "date_format (bv.priceDate,'%Y-%m-%d') >= date_format('" + pricestartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(priceEndDate), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + priceEndDate + "','%Y-%m-%d')"
                 );
+        //厂家开票日期
+        qw.apply(StringUtils.isNotEmpty(pagerQuery.getManDateStart()), "date_format (bv.manDate,'%Y-%m-%d') >= date_format('" + pagerQuery.getManDateStart() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(pagerQuery.getManDateEnd()), "date_format (bv.manDate,'%Y-%m-%d') <= date_format('" + pagerQuery.getManDateEnd() + "','%Y-%m-%d')"
+                );
         //销售日期
         String salesStartDate = pagerQuery.getSalesStartDate();
         String salesEndDate = pagerQuery.getSalesEndDate();