|
|
@ -6,9 +6,12 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.*; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; |
|
|
|
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; |
|
|
|
import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; |
|
|
|
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; |
|
|
|
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; |
|
|
|
import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery; |
|
|
@ -54,6 +57,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba |
|
|
|
@Autowired |
|
|
|
private BaseModelConfigService baseModelConfigService; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleModelService baseVehicleModelService; |
|
|
|
@Autowired |
|
|
|
private CommonAppendixService commonAppendixService; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleAppendixService baseVehicleAppendixService; |
|
|
@ -1204,8 +1209,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba |
|
|
|
public AppBaseConfigNowCarVo getModelNowCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) { |
|
|
|
AppBaseConfigNowCarQuery query = pagerQuery.getParams(); |
|
|
|
SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(query.getUserSid()).getData(); |
|
|
|
String useOrg = data.getSid(); |
|
|
|
AppBaseConfigNowCarVo appBaseConfigNowCarVo = new AppBaseConfigNowCarVo(); |
|
|
|
query.setUseOrg(data.getSid()); |
|
|
|
AppBaseConfigNowCarVo appBaseConfigNowCarVo = baseMapper.selectByModelSidAndConfigSid(query.getModelSid(), query.getConfigSid(), query.getUseOrg()); |
|
|
|
List<AppBaseVinNowCarVo> vinNowCarVos = new ArrayList<>(); |
|
|
|
QueryWrapper<AppBaseVinNowCarVo> qw = modelNowCarWrapper(query); |
|
|
|
IPage<AppBaseVinNowCarVo> page = PagerUtil.queryToPage(pagerQuery); |
|
|
@ -1214,6 +1219,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba |
|
|
|
vinNowCarVos.add(record); |
|
|
|
} |
|
|
|
appBaseConfigNowCarVo.setRecords(vinNowCarVos); |
|
|
|
long pages = pagging.getPages(); |
|
|
|
appBaseConfigNowCarVo.setPages(pages); |
|
|
|
return appBaseConfigNowCarVo; |
|
|
|
} |
|
|
|
|
|
|
@ -1221,23 +1228,66 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba |
|
|
|
QueryWrapper<AppBaseVinNowCarVo> qw = new QueryWrapper<>(); |
|
|
|
if (query != null) { |
|
|
|
if (StringUtils.isNotBlank(query.getNames())) { |
|
|
|
qw.eq("bv.modelSid", query.getModelSid());//车型sid
|
|
|
|
qw.like("bv.vinNo", query.getNames());//车架号
|
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getNames())) { |
|
|
|
qw.eq("bv.modelConfigSid", query.getConfigSid());//配置sid
|
|
|
|
qw.like("bv.vehicleStateValue", query.getNames());//状态
|
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getNames())) { |
|
|
|
qw.like("bv.vinNo", query.getNames());//车架号
|
|
|
|
qw.like("bmc.carColor", query.getNames());//车身颜色
|
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getNames())) { |
|
|
|
qw.like("bv.location", query.getNames());//存放地点
|
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrg())) { |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
|
|
|
|
qw.eq("bv.useOrg", query.getUseOrg()); |
|
|
|
} |
|
|
|
} |
|
|
|
return qw; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 手机端-配置列表获取排产列表 |
|
|
|
* |
|
|
|
* @param pagerQuery |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public AppBaseConfigOrderCarVo getModelOrderCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) { |
|
|
|
AppBaseConfigNowCarQuery query = pagerQuery.getParams(); |
|
|
|
SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(query.getUserSid()).getData(); |
|
|
|
query.setUseOrg(data.getSid()); |
|
|
|
AppBaseConfigOrderCarVo appBaseConfigOrderCarVo = baseMapper.getModelSidAndConfigSid(query.getModelSid(), query.getConfigSid(), query.getUseOrg()); |
|
|
|
List<AppBaseNowProduceCarVo> vinNowCarVos = new ArrayList<>(); |
|
|
|
QueryWrapper<AppBaseNowProduceCarVo> qw = nowProduceWrapper(query); |
|
|
|
IPage<AppBaseNowProduceCarVo> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
IPage<AppBaseNowProduceCarVo> pagging = baseMapper.getModelOrderCarList(page, qw); |
|
|
|
List<AppBaseNowProduceCarVo> records = pagging.getRecords(); |
|
|
|
for (AppBaseNowProduceCarVo record : records) { |
|
|
|
vinNowCarVos.add(record); |
|
|
|
} |
|
|
|
appBaseConfigOrderCarVo.setRecords(vinNowCarVos); |
|
|
|
long pages = pagging.getPages(); |
|
|
|
appBaseConfigOrderCarVo.setPages(pages); |
|
|
|
return appBaseConfigOrderCarVo; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private QueryWrapper<AppBaseNowProduceCarVo> nowProduceWrapper(AppBaseConfigNowCarQuery query) { |
|
|
|
QueryWrapper<AppBaseNowProduceCarVo> qw = new QueryWrapper<>(); |
|
|
|
if (query != null) { |
|
|
|
if (StringUtils.isNotBlank(query.getNames())) { |
|
|
|
qw.like("bvo.orderStatus", query.getNames());//订单状态
|
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
|
|
|
|
qw.eq("bvo.useOrg", query.getUseOrg()); |
|
|
|
} |
|
|
|
} |
|
|
|
return qw; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 根据车型及车型配置查询 |
|
|
|
* |
|
|
|
* @param query 查询条件 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|