Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -517,7 +517,7 @@
         bvm.brandName as brand,
         bvm.carBrand as brandSid,
         ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid = bmc.sid AND
-        lockedState = '0004' ) AS nowCarNum,
+        lockedState = '03' ) AS nowCarNum,
         ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvc.modelSid and bvad.configSid =
         bmc.sid) AS produceCarNum
         FROM base_vehmodel_config bvc

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -182,6 +182,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 				}
 			}
 			entity.setUseOrgSid(orgSidPath);
+			entity.setCreateBySid(dto.getStaffSid());
 			save(entity);
 			for (BaseOutsourcingApplicationVehicleDto baseOutsourcingApplicationVehicleDto : baseOutsourcingApplicationVehicleDtos) {
 				BaseOutsourcingApplicationVehicle baseOutsourcingApplicationVehicle = new BaseOutsourcingApplicationVehicle();

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

@@ -493,8 +493,8 @@
         bvm.gearboxTypeValue,
         bvc.priceValidity,
         bvc.guidedPrice,
-        (SELECT count(*) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid) AS configNum,
-        (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
+        (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid) AS configNum,
+        (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03') AS nowCarNum,
         (SELECT count(*)
         FROM bus_vehicle_apply_detail bvad
         WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -78,8 +78,8 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         ResultBean<PagerVo<BaseVehicleModelVo>> rb = ResultBean.fireFail();
         IPage<BaseVehicleModelVo> page = baseVehicleModelService.pagerList(pagerQuery);
         List<BaseVehicleModelVo> records = page.getRecords();
-        List<String> strings = new ArrayList<>();
         for (BaseVehicleModelVo record : records) {
+            List<String> strings = new ArrayList<>();
             String sid = record.getSid();
             String path = "";
             List<BaseVehicleModelAppendixVo> baseVehicleModelAppendixVos = baseVehicleModelAppendixService.fetchByVehModelSid(sid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -109,7 +109,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
                 qw.eq("bvm.fuelType", pagerQuery.getFuelType());
             }
             if (StringUtils.isNotBlank(pagerQuery.getVehicleTypeCode())) {//车型编码
-                qw.eq("bvm.vehicleTypeCode", pagerQuery.getVehicleTypeCode());
+                qw.like("bvm.vehicleTypeCode", pagerQuery.getVehicleTypeCode());
             }
             if (StringUtils.isNotBlank(pagerQuery.getGearboxType())) {//变速箱key值
                 qw.eq("bvm.gearboxType", pagerQuery.getGearboxType());
@@ -124,7 +124,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
                 qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments());
             }
             if (StringUtils.isNotBlank(pagerQuery.getSpecifications())) {//规格型号
-                qw.eq("bvm.specifications", pagerQuery.getSpecifications());
+                qw.like("bvm.specifications", pagerQuery.getSpecifications());
             }
         }
         return qw;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java

@@ -61,6 +61,8 @@ import java.util.List;
 public class BusSalesOrderDetailsVo implements Vo {
 
     private static final long serialVersionUID = -7574451321354327831L;
+    @ApiModelProperty("销售订单编号")
+    private String billNo;
     @ApiModelProperty("销售部门sid")
     private String orgSid;
     @ApiModelProperty("销售部门")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorder;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
@@ -233,6 +234,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         BusSalesOrderDetailsVo vo = new BusSalesOrderDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        vo.setCreateDate(DateUtil.formatDate(entity.getCreateDate()));
         //查询主车车型信息
         BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid());
         if (busSalesOrderModelDetailsVo != null) {