From b3af44868d0b5816d3c864d941e592898c6d6dc1 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Tue, 17 May 2022 18:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=8A=A5=E4=BB=B7=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=87=8C=E7=9A=84=20=E6=8E=92=E4=BA=A7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=8E=B0=E8=BD=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=BD=A6=E5=9E=8B=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=93=81=E7=89=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/AppBaseConfigNowCarVo.java | 3 + .../basevehicle/AppBaseConfigOrderCarVo.java | 28 +++ .../basevehicle/AppBaseNowProduceCarVo.java | 31 +++ .../basevehicle/AppCarConfigSummaryDto.java | 31 +++ .../api/basevehicle/BaseVehicleFeign.java | 8 + .../basevehicle/BaseVehicleFeignFallback.java | 5 + .../BaseVehicleBrandDictionariesVo.java | 18 ++ .../BaseVehicleBrandFeign.java | 5 + .../BaseVehicleBrandFeignFallback.java | 5 + .../busvehicleinquiry/BusVehicleInquiry.java | 6 + .../biz/basevehicle/BaseVehicleMapper.java | 30 +++ .../biz/basevehicle/BaseVehicleMapper.xml | 52 ++++- .../base/biz/basevehicle/BaseVehicleRest.java | 18 ++ .../biz/basevehicle/BaseVehicleService.java | 82 +++++-- .../BaseVehicleBrandMapper.java | 2 + .../BaseVehicleBrandMapper.xml | 7 + .../BaseVehicleBrandRest.java | 6 + .../BaseVehicleBrandService.java | 27 ++- .../BusVehicleInquiryService.java | 202 +++++++++++------- 19 files changed, 463 insertions(+), 103 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseNowProduceCarVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDictionariesVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java index e8ade060a7..d54fd8e430 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java @@ -20,4 +20,7 @@ public class AppBaseConfigNowCarVo implements Vo { @ApiModelProperty("常用配置") private String commonlyConfig; + + @ApiModelProperty("页数") + private Long pages; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java new file mode 100644 index 0000000000..e8239906d7 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + + +@Data +public class AppBaseConfigOrderCarVo implements Vo { + + @ApiModelProperty("车型名称") + private String modelName; + + @ApiModelProperty("销售指导价") + private String price; + + @ApiModelProperty("排产列表") + private List records; + + @ApiModelProperty("常用配置") + private String commonlyConfig; + + @ApiModelProperty("页数") + private Long pages; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseNowProduceCarVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseNowProduceCarVo.java new file mode 100644 index 0000000000..a1a922c39e --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseNowProduceCarVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBaseNowProduceCarVo implements Vo { + + @ApiModelProperty("订单编号") + private String orderId; + + @ApiModelProperty("状态") + private String state; + + @ApiModelProperty("订单日期") + private String date; + + @ApiModelProperty("预计上线日期") + private String forecastDate; + + @ApiModelProperty("上线日期") + private String upDate; + + @ApiModelProperty("下线日期") + private String downDate; + + @ApiModelProperty("采购数量") + private String number; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java new file mode 100644 index 0000000000..6cc102ee1b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppCarConfigSummaryDto implements Dto { + + @ApiModelProperty("车型sid") + private String modelSid; + + @ApiModelProperty("配置sid") + private String configSid; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("其他配置说明") + private String otherConfig; + + @ApiModelProperty("常用配置") + private String config; + + @ApiModelProperty("更多配置") + private String moreConfig; + + @ApiModelProperty("车型名称") + private String model; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 65b4811465..2f1e831c88 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -241,4 +241,12 @@ public interface BaseVehicleFeign { @ApiOperation("手机端-配置列表获取现车列表") @PostMapping("/getModelNowCarList") public ResultBean getModelNowCarList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("手机端-配置列表获取排产列表") + @PostMapping("/getModelOrderCarList") + public ResultBean getModelOrderCarList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("手机端-保存 询价 其他配置说明") + @PostMapping("/saveCarConfigSummaryInfo") + public ResultBean saveCarConfigSummaryInfo(@Valid @RequestBody AppCarConfigSummaryDto dto); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index d52015d984..dee0978b32 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -169,4 +169,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean getModelOrderCarList(PagerQuery pagerQuery) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDictionariesVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDictionariesVo.java new file mode 100644 index 0000000000..9a443c10cc --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDictionariesVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.base.api.basevehiclebrand; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BaseVehicleBrandDictionariesVo implements Vo { + + @ApiModelProperty("品牌sid") + private String sid; + + @ApiModelProperty("品牌key") + private String dictKey; + + @ApiModelProperty("品牌value") + private String dictValue; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java index 6b9222a9e0..379c7268f9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java @@ -108,4 +108,9 @@ public interface BaseVehicleBrandFeign { @ApiOperation("手机端根据厂商sid查询品牌列表") @GetMapping("/selectAppListByManufacturerSid") ResultBean> selectAppListByManufacturerSid(@RequestParam(value = "manufacturerSid",required = false) String manufacturerSid); + + @ApiOperation("手机端-获取品牌数据字典") + @GetMapping("/selectAppListByUserSid/{userSid}") + ResultBean> selectAppListByUserSid(@PathVariable("userSid") String userSid); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java index 197f9e43e6..8c8d308611 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java @@ -76,5 +76,10 @@ public class BaseVehicleBrandFeignFallback implements BaseVehicleBrandFeign { return ResultBean.fireFail().setMsg("接口anrui-base/basevehiclebrand/selectAppListByManufacturerSid无法访问"); } + @Override + public ResultBean> selectAppListByUserSid(String userSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java index 08a7aea638..f9e01289e5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java @@ -68,4 +68,10 @@ public class BusVehicleInquiry extends BaseEntity { private String customerSid; @ApiModelProperty("品牌名称") private String brandName; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("更多配置") + private String moreConfig; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 24d05a8c3f..d4c8d8773f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -327,8 +327,38 @@ public interface BaseVehicleMapper extends BaseMapper { /** * 根据车型配置及车型查询现车的数量 + * * @param qw 查询条件 * @return */ Integer selectVehicleCount(@Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * 根据车型sid配置sid分公司sid查询车型名称等 + * + * @param modelSid + * @param configSid + * @param useOrg + * @return + */ + AppBaseConfigNowCarVo selectByModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg); + + /** + * 根据车型sid配置sid分公司sid查询车型名称等 + * + * @param modelSid + * @param configSid + * @param useOrg + * @return + */ + AppBaseConfigOrderCarVo getModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg); + + /** + * 手机端-配置列表获取现车列表 + * + * @param page + * @param qw + * @return + */ + IPage getModelOrderCarList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index bc35ba31af..718e3ea424 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -663,17 +663,63 @@ + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index a33d536e96..572b1f5d84 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; +import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -73,6 +74,9 @@ public class BaseVehicleRest implements BaseVehicleFeign { @Autowired private BaseModelConfigService baseModelConfigService; + @Autowired + private BusVehicleInquiryService busVehicleInquiryService; + @Override public ResultBean> pagerList(@RequestBody PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -547,5 +551,19 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(vo); } + @Override + public ResultBean getModelOrderCarList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + AppBaseConfigOrderCarVo vo = baseVehicleService.getModelOrderCarList(pagerQuery); + return rb.success().setData(vo); + } + + @Override + public ResultBean saveCarConfigSummaryInfo(AppCarConfigSummaryDto dto) { + ResultBean rb = ResultBean.fireFail(); + busVehicleInquiryService.saveCarConfigSummaryInfo(dto); + return rb.success(); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index fa8407ac80..d77c05b248 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -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 0) { qw.notIn("bv.sid", query.getSidList()); } - if(StringUtils.isNotBlank(query.getLinkNo())){ - qw.like("bv.vinNo",query.getLinkNo()); + if (StringUtils.isNotBlank(query.getLinkNo())) { + qw.like("bv.vinNo", query.getLinkNo()); } } return qw; } - public ResultBean fetchVehicle(String vehicleSid,String modelSid) { + public ResultBean fetchVehicle(String vehicleSid, String modelSid) { ResultBean rb = ResultBean.fireFail(); - QueryWrapper qw = vehicleActualWrapper1(vehicleSid,modelSid); + QueryWrapper qw = vehicleActualWrapper1(vehicleSid, modelSid); BaseVehicleVo baseVehicleVo = baseMapper.fetchVehicle(qw); return rb.success().setData(baseVehicleVo); } - private QueryWrapper vehicleActualWrapper1(String vehicleSid,String modelSid) { + private QueryWrapper vehicleActualWrapper1(String vehicleSid, String modelSid) { QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(vehicleSid)){ + if (StringUtils.isNotBlank(vehicleSid)) { String[] split = vehicleSid.split(","); for (String s : split) { - qw.ne("sid",s); + qw.ne("sid", s); } } - qw.eq("modelSid",modelSid); - qw.eq("vehicleState",0005); - qw.eq("lockedState",03); + qw.eq("modelSid", modelSid); + qw.eq("vehicleState", 0005); + qw.eq("lockedState", 03); return qw; } @@ -1204,8 +1209,8 @@ public class BaseVehicleService extends MybatisBaseService 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 vinNowCarVos = new ArrayList<>(); QueryWrapper qw = modelNowCarWrapper(query); IPage page = PagerUtil.queryToPage(pagerQuery); @@ -1214,6 +1219,8 @@ public class BaseVehicleService extends MybatisBaseService 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.getUseOrg())) { + if (StringUtils.isNotBlank(query.getNames())) { + qw.like("bv.location", query.getNames());//存放地点 + } + if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司 qw.eq("bv.useOrg", query.getUseOrg()); } } return qw; } + /** + * 手机端-配置列表获取排产列表 + * + * @param pagerQuery + * @return + */ + public AppBaseConfigOrderCarVo getModelOrderCarList(PagerQuery 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 vinNowCarVos = new ArrayList<>(); + QueryWrapper qw = nowProduceWrapper(query); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.getModelOrderCarList(page, qw); + List records = pagging.getRecords(); + for (AppBaseNowProduceCarVo record : records) { + vinNowCarVos.add(record); + } + appBaseConfigOrderCarVo.setRecords(vinNowCarVos); + long pages = pagging.getPages(); + appBaseConfigOrderCarVo.setPages(pages); + return appBaseConfigOrderCarVo; + } + + + private QueryWrapper nowProduceWrapper(AppBaseConfigNowCarQuery query) { + QueryWrapper 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 */ diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java index 2947e5cf16..7d2178793e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java @@ -122,4 +122,6 @@ public interface BaseVehicleBrandMapper extends BaseMapper { @Select("select brandShortName from base_vehicle_brand where sid=#{sid}") String getBrandShortName(@Param("sid") String sid); + + List selectAppListByUserSid(@Param("useOrg") String useOrg); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml index ee56177c3a..26ed144d4c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml @@ -98,4 +98,11 @@ FROM base_vehicle_brand bvb where bvb.manufacturerSid = #{manufacturerSid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java index e14492cce1..93a252314f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java @@ -170,4 +170,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign { List resultData = baseVehicleBrandService.selectAppListByManufacturerSid(manufacturerSid); return new ResultBean>().success().setData(resultData); } + + @Override + public ResultBean> selectAppListByUserSid(String userSid) { + List list = baseVehicleBrandService.selectAppListByUserSid(userSid); + return new ResultBean>().success().setData(list); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java index e80aa5714a..d5fc925d6c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java @@ -60,7 +60,7 @@ public class BaseVehicleBrandService extends MybatisBaseService buildQueryWrapper(BaseVehicleBrandQuery pagerQuery) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("bvb.isDelete",0); + qw.eq("bvb.isDelete", 0); if (pagerQuery != null) { if (StringUtils.isNotBlank(pagerQuery.getBrandName())) {//品牌名称 qw.like("bvb.brandName", pagerQuery.getBrandName()); @@ -123,8 +123,8 @@ public class BaseVehicleBrandService extends MybatisBaseService selectAppListByUserSid(String userSid) { + String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); + List list = baseMapper.selectAppListByUserSid(useOrg); + return list; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java index da0413b040..e15057e90a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java @@ -28,15 +28,26 @@ package com.yxt.anrui.base.biz.busvehicleinquiry; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicle.AppCarConfigSummaryDto; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.busvehicleinquiry.*; +import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.xml.crypto.Data; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; /** @@ -54,83 +65,118 @@ import java.util.List; */ @Service public class BusVehicleInquiryService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pq) { - BusVehicleInquiryQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public List listAll(BusVehicleInquiryQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); - } - private QueryWrapper createQueryWrapper(BusVehicleInquiryQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - - - if (StringUtils.isNotBlank(query.getInquiryDate())) { - qw.eq("inquiryDate", query.getInquiryDate()); - } - - if (StringUtils.isNotBlank(query.getInquirer())) { - qw.eq("inquirer", query.getInquirer()); - } - - if (StringUtils.isNotBlank(query.getCreateOrgSid())) { - qw.eq("createOrgSid", query.getCreateOrgSid()); - } - - if (StringUtils.isNotBlank(query.getBrandSid())) { - qw.eq("brandSid", query.getBrandSid()); - } - - if (StringUtils.isNotBlank(query.getModelName())) { - qw.eq("modelName", query.getModelName()); - } - - if (StringUtils.isNotBlank(query.getModelBriefConfiguration())) { - qw.eq("modelBriefConfiguration", query.getModelBriefConfiguration()); - } - - if (StringUtils.isNotBlank(query.getOtherConfig())) { - qw.eq("otherConfig", query.getOtherConfig()); - } - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - BusVehicleInquiryQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public List listAllVo(BusVehicleInquiryQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectListAllVo(qw); - } - - public List listVo() { - return baseMapper.selectListVo(); - } - - public void saveOrUpdateDto(BusVehicleInquiryDto dto){ - BusVehicleInquiry entity = new BusVehicleInquiry(); - dto.fillEntity(entity); - this.saveOrUpdate(entity); - } - - public BusVehicleInquiryVo fetchByIdVo(String id){ - BusVehicleInquiry entity = this.fetchById(id); - BusVehicleInquiryVo vo = new BusVehicleInquiryVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + @Autowired + SysUserFeign sysUserFeign; + + @Autowired + BaseVehicleModelService baseVehicleModelService; + + public PagerVo listPage(PagerQuery pq) { + BusVehicleInquiryQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAll(BusVehicleInquiryQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(BusVehicleInquiryQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getInquiryDate())) { + qw.eq("inquiryDate", query.getInquiryDate()); + } + + if (StringUtils.isNotBlank(query.getInquirer())) { + qw.eq("inquirer", query.getInquirer()); + } + + if (StringUtils.isNotBlank(query.getCreateOrgSid())) { + qw.eq("createOrgSid", query.getCreateOrgSid()); + } + + if (StringUtils.isNotBlank(query.getBrandSid())) { + qw.eq("brandSid", query.getBrandSid()); + } + + if (StringUtils.isNotBlank(query.getModelName())) { + qw.eq("modelName", query.getModelName()); + } + + if (StringUtils.isNotBlank(query.getModelBriefConfiguration())) { + qw.eq("modelBriefConfiguration", query.getModelBriefConfiguration()); + } + + if (StringUtils.isNotBlank(query.getOtherConfig())) { + qw.eq("otherConfig", query.getOtherConfig()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusVehicleInquiryQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAllVo(BusVehicleInquiryQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(BusVehicleInquiryDto dto) { + BusVehicleInquiry entity = new BusVehicleInquiry(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public BusVehicleInquiryVo fetchByIdVo(String id) { + BusVehicleInquiry entity = this.fetchById(id); + BusVehicleInquiryVo vo = new BusVehicleInquiryVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + /** + * 车型报价点击询价保存询价数据 + * + * @param dto + */ + @Transactional(rollbackFor = Exception.class) + public void saveCarConfigSummaryInfo(AppCarConfigSummaryDto dto) { + BusVehicleInquiry busVehicleInquiry = new BusVehicleInquiry(); + busVehicleInquiry.setModelSid(dto.getModelSid()); + busVehicleInquiry.setConfigSid(dto.getConfigSid()); + busVehicleInquiry.setModelName(dto.getModel()); + busVehicleInquiry.setOtherConfig(dto.getOtherConfig()); + busVehicleInquiry.setModelBriefConfiguration(dto.getConfig()); + busVehicleInquiry.setMoreConfig(dto.getMoreConfig()); + String userSid = dto.getUserSid(); + AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData(); + busVehicleInquiry.setInquirer(data.getStaffName()); + busVehicleInquiry.setCreateOrgSid(data.getOrgSid()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String format = simpleDateFormat.format(new Date()); + busVehicleInquiry.setInquiryDate(format); + BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(dto.getModelSid()); + busVehicleInquiry.setBrandSid(baseVehicleModel.getCarBrand()); + busVehicleInquiry.setBrandName(baseVehicleModel.getBrandName()); + save(busVehicleInquiry); + } } \ No newline at end of file