Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
Zhao Qiqi 3 years ago
parent
commit
df5d98d3c9
  1. 11
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
  2. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  3. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  4. 33
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/AppBaseVehicleOrderVo.java
  5. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
  6. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java
  7. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java
  8. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java
  9. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java
  10. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java
  11. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java
  12. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  13. 207
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  14. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  15. 28
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  16. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java
  17. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml
  18. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
  19. 45
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
  20. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
  21. 18
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  22. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
  23. 38
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  24. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderInitModelInfoVo.java
  25. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppCarInfo.java
  26. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCarVo.java
  27. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfo.java
  28. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  29. 89
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  30. 1
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppOrderCrmVehicleDemandVo.java
  31. 20
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
  32. 3
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
  33. 11
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java
  34. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java
  35. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java
  36. 23
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
  37. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
  38. 7
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java
  39. 7
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java
  40. 11
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

11
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@ -34,6 +34,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
@ -80,19 +81,19 @@ public class BaseOutsourcingApplicationDto implements Dto {
@ApiModelProperty("常用配置名称")
private String configName; // 常用配置名称
@ApiModelProperty("采购价格")
private String purchasePrice; // 采购价格
private BigDecimal purchasePrice; // 采购价格
@ApiModelProperty("销售指导价")
private String guidedPrice; // 销售指导价
private BigDecimal guidedPrice; // 销售指导价
@ApiModelProperty("厂家合同价")
private String manufactorSettlementPrice; // 厂家合同价
private BigDecimal manufactorSettlementPrice; // 厂家合同价
@ApiModelProperty("台数")
private Integer num; // 台数
@ApiModelProperty("订金")
private String deposit; // 订金
private BigDecimal deposit; // 订金
@ApiModelProperty("费用名称")
private String expenseName; // 费用名称
@ApiModelProperty("费用金额合计")
private String totalExpenseAmount; // 费用金额合计
private BigDecimal totalExpenseAmount; // 费用金额合计
@ApiModelProperty("部门sid")
private String orgSid; // 部门sid
@ApiModelProperty("流程定义的id")

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

@ -1,6 +1,7 @@
package com.yxt.anrui.base.api.basevehicle;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -212,6 +213,10 @@ public interface BaseVehicleFeign {
@GetMapping("/selectCount")
ResultBean<Integer> selectCount(@SpringQueryMap PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery);
@ApiOperation("app销售订单-根据车型和配置sid查询现车列表")
@GetMapping("/selectAppList")
ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "configSid") String configSid);
/***************************************************** App接口 **********************************************************/
@ApiOperation("手机端现车分页列表")
@ -236,7 +241,7 @@ public interface BaseVehicleFeign {
@ApiOperation("获取车型配置总结(即常用配置一句话描述)")
@GetMapping("/carConfigSummary")
public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid,@RequestParam("userSid") String userSid);
public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid, @RequestParam("userSid") String userSid);
@ApiOperation("手机端-配置列表获取现车列表")
@PostMapping("/getModelNowCarList")

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

@ -1,6 +1,7 @@
package com.yxt.anrui.base.api.basevehicle;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -135,6 +136,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(String modelSid, String configSid) {
return null;
}
@Override
public ResultBean<PagerVo<AppCurrentCarModelByPageListVo>> getAppCurrentCarByPageList(PagerQuery<AppCurrentCarByPageListQuery> pagerQuery) {
return null;

33
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/AppBaseVehicleOrderVo.java

@ -0,0 +1,33 @@
package com.yxt.anrui.base.api.basevehicle.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/5/28 14:47
* @Description 根据车型及配置查询现车
*/
@Data
public class AppBaseVehicleOrderVo implements Vo {
private static final long serialVersionUID = 5928761684516901458L;
@ApiModelProperty(value = "车架号")
private String vin;
@ApiModelProperty(value = "是否有合格证")
private Boolean certificate;
@ApiModelProperty(value = "存放地点")
private String address;
@ApiModelProperty(value = "车辆sid")
private String carSid;
@ApiModelProperty(value = "是否是虚拟订单锁定的")
private Boolean virtual;
@ApiModelProperty(value = "mysql数据库中查询是否是虚拟订单锁定")
private Boolean isFictitious;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java

@ -34,7 +34,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -123,6 +122,6 @@ public interface BaseVehmodelConfigFeign {
@ApiOperation("获取车型配置总结(即常用配置一句话描述)(销售订单)")
@GetMapping("/selectCarConfigSummary/{modelSid}/{configSid}/{userSid}")
public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid, @RequestParam("userSid") String userSid);
public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("userSid") String userSid);
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java

@ -167,4 +167,6 @@ public class BaseVehmodelConfigVo implements Vo {
private Integer isDel;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "内部编码")
private String insideCode;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java

@ -27,4 +27,6 @@ public class BusVehicleApplyQuery implements Query {
private String applicationDateStart; // 申请开始日期
@ApiModelProperty("申请结束日期")
private String applicationDateEnd; // 申请结束日期
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java

@ -46,6 +46,8 @@ public class BusVehicleApplyVo implements Vo {
private String amountToBeUsedThisTime;
@ApiModelProperty("本次申请金额")
private String amountAppliedThisTime;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("sid")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java

@ -46,4 +46,6 @@ public class BusVehicleApplyDetail extends BaseEntity {
private String configName;
@ApiModelProperty("申请订金")
private BigDecimal applyForDeposit;
@ApiModelProperty("内部编码")
private String insideCode;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java

@ -35,7 +35,7 @@ public class BusVehicleApplyDetailDto implements Dto {
@ApiModelProperty("排产数量")
private String quantity;
@ApiModelProperty("使用订金")
private String useDeposit;
private BigDecimal useDeposit;
@ApiModelProperty("销售指导价")
private BigDecimal saleGuPrice;
@ApiModelProperty("常用配置sid")
@ -46,4 +46,6 @@ public class BusVehicleApplyDetailDto implements Dto {
private BigDecimal applyForDeposit;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("内部编码")
private String insideCode;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java

@ -45,4 +45,6 @@ public class BusVehicleApplyDetailVo implements Vo {
private String applyForDeposit;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("内部编码")
private String insideCode;
}

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

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.common.core.result.ResultBean;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -361,4 +362,13 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
* @return
*/
IPage<AppBaseNowProduceCarVo> getModelOrderCarList(IPage<AppBaseNowProduceCarVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBaseNowProduceCarVo> qw);
/**
* 根据车型sid和配置sid查询现车列表
*
* @param modelSid 车型sid
* @param configSid 配置sid
* @return
*/
List<AppBaseVehicleOrderVo> selectAppList(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
}

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

@ -12,12 +12,12 @@
<!--分页列表-->
<select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
SELECT bv.sid,
bv.modelName,
bv.vinNo,
bv.engineNo,
bv.vehicleStateValue,
bv.location,
bv.libraryAge
bv.modelName,
bv.vinNo,
bv.engineNo,
bv.vehicleStateValue,
bv.location,
bv.libraryAge
FROM base_vehicle bv
<where>
${ew.sqlSegment}
@ -69,10 +69,10 @@
<!--库龄(根据首次发车日期计算)-->
bv.libraryAge
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
${ew.customSqlSegment}
</select>
<!--删除或批量删除车辆信息-->
<delete id="deleteBySids" parameterType="java.util.List">
@ -158,16 +158,16 @@
bvm.isValidity,
bvm.isValidityValue
FROM base_vehicle_model bvm
LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
WHERE bvm.sid = #{modelSid}
AND bmc.sid = #{modelConfigSid}
AND bmc.sid = #{modelConfigSid}
</select>
<!--导入车辆信息-->
<insert id="saveList">
INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location,
vehicleState, firstStartDate, libraryAge)
vehicleState, firstStartDate, libraryAge)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(UUID(),<!--sid-->
@ -196,8 +196,8 @@
</select>
<select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
select bv.sid,
bv.modelSid,
bv.modelConfigSid,
bv.modelSid,
bv.modelConfigSid,
<!--车架号(VIN)-->
bv.vinNo,
<!--发动机号/许可证号-->
@ -256,13 +256,13 @@
<select id="getAppCurrentCarByPageList"
resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo">
SELECT bvm.sid AS modelSid,
bvm.vehicleAlias,
bvm.brandName,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue
bvm.vehicleAlias,
bvm.brandName,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
<where>
${ew.sqlSegment}
</where>
@ -373,9 +373,9 @@
<!--配置Sid-->
bv.modelConfigSid AS configSid
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
</select>
<select id="selectExiCarConfig" resultType="com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo">
@ -438,8 +438,8 @@
<!--销售指导价-->
bv.guidedPrice
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
WHERE bv.sid = #{sid}
</select>
@ -473,33 +473,42 @@
<!--配置Sid-->
bv.modelConfigSid AS configSid
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
ORDER BY
bv.priceDate desc
bv.priceDate desc
</select>
<select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppVehicleModelPriceVo">
SELECT DISTINCT
bvm.sid AS modelSid,
bvm.vehicleAlias AS modelName,
bvm.carBrand AS brandSid,
bvm.brandName,
bvm.vehicleVersionValue AS versionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
(SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)) FROM base_vehmodel_config bvc WHERE bvc.modelSid
= bvm.sid AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
(SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid AND bvc.useOrgSid = #{useOrgSid}) AS
configNum,
(SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03' AND bv.useOrg =
#{useOrgSid}) AS nowCarNum,
(SELECT SUM(cast(bvad.quantity as signed)) as quantity
FROM bus_vehicle_apply_detail bvad
WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
SELECT DISTINCT bvm.sid AS modelSid,
bvm.vehicleAlias AS modelName,
bvm.carBrand AS brandSid,
bvm.brandName,
bvm.vehicleVersionValue AS versionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
(SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
FROM base_vehmodel_config bvc
WHERE bvc.modelSid
= bvm.sid
AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
(SELECT count(*)
FROM base_vehmodel_config bvc
WHERE bvc.modelSid = bvm.sid
AND bvc.useOrgSid = #{useOrgSid}) AS
configNum,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvm.sid
AND lockedState = '03'
AND bv.useOrg =
#{useOrgSid}) AS nowCarNum,
(SELECT SUM(cast(bvad.quantity as signed)) as quantity
FROM bus_vehicle_apply_detail bvad
WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
FROM base_vehicle_model bvm
LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
<where>
${ew.sqlSegment}
</where>
@ -545,29 +554,28 @@
</select>
<select id="getNowModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVehicleNowModelVo">
SELECT DISTINCT
bvm.sid AS modelSid,
bvm.vehicleAlias AS modelName,
bvm.brandName,
bvm.carBrand AS brandSid,
bvm.vehicleVersionValue AS versionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
(SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
FROM base_vehmodel_config bvc
WHERE bvc.modelSid = bvm.sid
AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvm.sid
AND bv.useOrg = #{useOrgSid}) AS configNum,
(SELECT count(*)
SELECT DISTINCT bvm.sid AS modelSid,
bvm.vehicleAlias AS modelName,
bvm.brandName,
bvm.carBrand AS brandSid,
bvm.vehicleVersionValue AS versionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
(SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
FROM base_vehmodel_config bvc
WHERE bvc.modelSid = bvm.sid
AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvm.sid
AND bv.useOrg = #{useOrgSid}) AS configNum,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvm.sid
AND lockedState = '03') AS nowCarNum
FROM base_vehicle bv
WHERE bv.modelSid = bvm.sid
AND lockedState = '03') AS nowCarNum
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
${ew.customSqlSegment}
</select>
<select id="vehicleReturnPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleReturnVo">
@ -587,9 +595,9 @@
bmc.configName,
DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
</select>
<update id="updateByVinNo">
@ -644,9 +652,9 @@
DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
bv.priced
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
</select>
<!--根据车架号查询现车详情-->
<select id="getPurchaseDetails" resultType="com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo">
@ -661,11 +669,11 @@
</select>
<select id="selectVo" resultType="com.yxt.anrui.base.api.basevehicle.PcBaseVehicleOrderVo">
select bv.vinNo linkNo,
bv.location linkText,
bv.sid linkSid,
if(bv.lockedState = 1, 1, 0)
as isFictitious
select bv.vinNo linkNo,
bv.location linkText,
bv.sid linkSid,
if(bv.lockedState = 1, 1, 0)
as isFictitious
from base_vehicle bv
<where>
${ew.sqlSegment}
@ -686,7 +694,6 @@
FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
${ew.customSqlSegment}
</select>
<select id="selectVehicleCount" resultType="java.lang.Integer">
@ -721,19 +728,29 @@
AND bvc.useOrgSid = #{useOrg}
</select>
<select id="getModelOrderCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseNowProduceCarVo">
SELECT
bvo.orderNo AS orderId,
bvo.orderStatus AS state,
bvo.orderDate AS `date`,
bvo.expectLaunchDate AS forecastDate,
bvo.launchDate AS `upDate`,
bvo.offlineDate AS downDate,
bvad.quantity as `number`
FROM
bus_vehicle_order bvo
left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid
SELECT bvo.orderNo AS orderId,
bvo.orderStatus AS state,
bvo.orderDate AS `date`,
bvo.expectLaunchDate AS forecastDate,
bvo.launchDate AS `upDate`,
bvo.offlineDate AS downDate,
bvad.quantity as `number`
FROM bus_vehicle_order bvo
left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectAppList" resultType="com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo">
select bv.vinNo vin,
bv.location address,
bv.sid carSid,
if(bv.lockedState = 1, 1, 0)
as isFictitious
from base_vehicle bv
where bv.modelSid = #{modelSid}
and bv.modelConfigSid = #{configSid}
order by isFictitious desc
</select>
</mapper>

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

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
@ -348,6 +349,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return baseVehicleService.selectCount(pcBaseVehicleOrderCountQuery);
}
@Override
public ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(String modelSid, String configSid) {
return baseVehicleService.selectAppList(modelSid, configSid);
}
/**
* 手机端现车列表
*

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

@ -6,12 +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.basevehicleappendix.BaseVehicleAppendix;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
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.basevehiclecertificate.BaseVehicleCertificateService;
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;
@ -31,7 +31,6 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.xml.crypto.Data;
import java.util.*;
/**
@ -66,6 +65,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
private FileUploadComponent fileUploadComponent;
@Autowired
private PcBusMainDepositFeign pcBusMainDepositFeign;
@Autowired
private BaseVehicleCertificateService baseVehicleCertificateService;
/**
* 车辆信息分页列表
@ -1357,4 +1358,23 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
return rb.success().setData(count);
}
public ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(String modelSid, String configSid) {
ResultBean<List<AppBaseVehicleOrderVo>> rb = ResultBean.fireFail();
List<AppBaseVehicleOrderVo> orderVoList = new ArrayList<>();
orderVoList = baseMapper.selectAppList(modelSid, configSid);
if (orderVoList.isEmpty()) {
return rb.setData(orderVoList);
}
for (int i = 0; i < orderVoList.size(); i++) {
orderVoList.get(i).setVirtual(orderVoList.get(i).getIsFictitious());
BaseVehicleCertificate baseVehicleCertificate = baseVehicleCertificateService.selectByVehicleSid(orderVoList.get(i).getCarSid());
if (baseVehicleCertificate == null) {
orderVoList.get(i).setCertificate(false);
} else {
orderVoList.get(i).setCertificate(true);
}
}
return rb.success().setData(orderVoList);
}
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@ -83,4 +83,6 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
@Update("update base_vehicle_certificate set isDelete = 1 where sid = #{sid}")
int updateBySidIsDelete(String sid);
BaseVehicleCertificate selectByVehicleSid(String carSid);
}

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@ -26,7 +26,7 @@
bvc.remarks
FROM base_vehicle_certificate bvc
where isDelete = 0
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo">
@ -54,7 +54,7 @@
<!--备注-->
bvc.remarks
FROM base_vehicle_certificate bvc
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<!--跟据台账信息sid进行查询-->
<select id="selectBySid"
@ -133,14 +133,14 @@
<!-- 备注-->
bvc.remarks
from base_vehicle_certificate bvc
left join base_vehicle_brand bvb on bvc.carBrand = bvb.sid
left join base_vehicle_brand bvb on bvc.carBrand = bvb.sid
where bvc.sid =
#{sid}
#{sid}
</select>
<!--合格证台账导入-->
<insert id="saveList">
INSERT INTO base_vehicle_certificate(sid, certificationNo, vehicleSid, vinNo, certificateSituation,
certificateDate, toCardDate, receiveDate, seatingCapacity, remarks)
certificateDate, toCardDate, receiveDate, seatingCapacity, remarks)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(UUID(),<!--sid-->
@ -163,4 +163,10 @@
#{item}
</foreach>
</delete>
<select id="selectByVehicleSid" resultType="com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate">
select *
from base_vehicle_certificate
where vehicleSid = #{carSid}
</select>
</mapper>

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@ -135,4 +135,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
public int updateBySidIsDelete(String sid) {
return baseMapper.updateBySidIsDelete(sid);
}
public BaseVehicleCertificate selectByVehicleSid(String carSid) {
return baseMapper.selectByVehicleSid(carSid);
}
}

45
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@ -5,9 +5,9 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
SELECT bvc.*,
bvm.modelName,
bvm.`vehicleVersionValue`,
bvm.`vehicleTypeCode`,
bvm.modelName,
bvm.`vehicleVersionValue`,
bvm.`vehicleTypeCode`,
<!--车身颜色-->
bmc.carColor,
<!--驾驶室规格-->
@ -50,12 +50,13 @@
bmc.multimedia,
<!--保险杠(欧曼)-->
bmc.bumper,
bmc.configName
bmc.configName,
bvm.insideCode
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm
ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc
ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm
ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc
ON bvc.configurationItemsSid = bmc.sid
<where>
${ew.sqlSegment}
</where>
@ -72,14 +73,14 @@
<select id="getAppCommonlyUsedModelsByPageList"
resultType="com.yxt.anrui.base.api.basevehmodelconfig.AppCommonlyUsedModelsByPageListVo">
SELECT bvm.sid AS modelSid,
bvm.vehicleAlias,
bvm.brandName,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue
bvm.vehicleAlias,
bvm.brandName,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
<where>
${ew.sqlSegment}
</where>
@ -186,8 +187,8 @@
resultType="com.yxt.anrui.base.api.basevehmodelconfig.AppModelVeDetailVo">
SELECT bvm.vehicleAlias AS modelName,
bvm.brandName,
bvm.carBrand AS brandSid,
bvc.guidedPrice AS saleReferencePrice
bvm.carBrand AS brandSid,
bvc.guidedPrice AS saleReferencePrice
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
@ -249,14 +250,18 @@
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid LIKE concat('%', #{orgSid}, '%')
AND bvc.useOrgSid = #{orgSid}
</select>
<select id="getListByConfigSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
SELECT * FROM base_vehmodel_config WHERE configurationItemsSid = #{sid}
SELECT *
FROM base_vehmodel_config
WHERE configurationItemsSid = #{sid}
</select>
<select id="getVehModByModelSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
SELECT * FROM base_vehmodel_config WHERE modelSid = #{sid}
SELECT *
FROM base_vehmodel_config
WHERE modelSid = #{sid}
</select>
</mapper>

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java

@ -37,7 +37,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -160,8 +159,6 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
@Override
public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(String modelSid, String configSid, String userSid) {
ResultBean<AppCarConfigSummaryVo> rb = ResultBean.fireFail();
AppCarConfigSummaryVo vo = baseVehmodelConfigService.selectCarConfigSummary(modelSid, configSid,userSid);
return rb.success().setData(vo);
return baseVehmodelConfigService.selectCarConfigSummary(modelSid, configSid,userSid);
}
}

18
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@ -467,11 +467,19 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
return rb.success().setData(vo);
}
public AppCarConfigSummaryVo selectCarConfigSummary(String modelSid, String configSid, String userSid) {
String orgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid, orgSid);
AppCarConfigSummaryVo configSummaryVo = addConfigName(appModelConfigListVo);
return configSummaryVo;
public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(String modelSid, String configSid, String userSid) {
ResultBean<AppCarConfigSummaryVo> rb = ResultBean.fireFail();
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
if (!resultBean.getSuccess()) {
return rb.setData(new AppCarConfigSummaryVo());
}
AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid, resultBean.getData());
if (appModelConfigListVo != null) {
AppCarConfigSummaryVo configSummaryVo = addConfigName(appModelConfigListVo);
return rb.success().setData(configSummaryVo);
}
return rb.setData(new AppCarConfigSummaryVo());
}
/**

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml

@ -4,7 +4,10 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo">
SELECT * FROM bus_vehicle_apply <where> ${ew.sqlSegment} </where>
SELECT DISTINCT bva.* FROM bus_vehicle_apply bva
LEFT JOIN bus_vehicle_apply_detail bvad
ON bva.sid = bvad.`applySid`
<where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo">

38
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@ -12,10 +12,7 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService;
import com.yxt.anrui.base.biz.flow.FlowableService;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
import com.yxt.anrui.flowable.api.sysformlink.*;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@ -79,11 +76,12 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
String applicationDateStart = query.getApplicationDateStart();
String applicationDateEnd = query.getApplicationDateEnd();
qw.apply(StringUtils.isNotEmpty(applicationDateStart), "date_format (applicationDate,'%Y-%m-%d') >= date_format('" + applicationDateStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(applicationDateEnd), "date_format (applicationDate,'%Y-%m-%d') <= date_format('" + applicationDateEnd + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotEmpty(applicationDateStart), "date_format (bva.applicationDate,'%Y-%m-%d') >= date_format('" + applicationDateStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(applicationDateEnd), "date_format (bva.applicationDate,'%Y-%m-%d') <= date_format('" + applicationDateEnd + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getModelName())){
qw.like("bvad.vehicleName",query.getModelName());
}
return qw;
}
@ -100,8 +98,14 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
String name = sysUserVoResultBean.getData().getName();
record.setCreateByName(name);
String sid = record.getSid();
String nodeState = sysFormLinkFeign.selectStateByBusinessSid(sid).getData().getNodeState();
record.setNodeState(nodeState);
ResultBean<SysFormStateVo> sysFormStateVoResultBean = sysFormLinkFeign.selectStateByBusinessSid(sid);
SysFormStateVo data = sysFormStateVoResultBean.getData();
if (data != null){
String nodeState = data.getNodeState();
record.setNodeState(nodeState);
}else{
record.setNodeState("待提交");
}
}
return p;
}
@ -148,8 +152,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
busVehicleApplyDetail.setApplySid(sid);
busVehicleApplyDetailService.saveOrUpdate(busVehicleApplyDetail);
}
BigDecimal bigDecimal = new BigDecimal(dto.getCurrentAmount());
entity.setCurrentAmount(bigDecimal);
/*BigDecimal bigDecimal = new BigDecimal(dto.getCurrentAmount());
entity.setCurrentAmount(bigDecimal);*/
this.saveOrUpdate(entity);
return rb.success().setData(entity.getSid());
}
@ -166,16 +170,6 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
BusVehicleApply busVehicleApply = this.fetchBySid(sid);
BeanUtil.copyProperties(busVehicleApply,busVehicleApplyVo);
List<BusVehicleApplyDetailVo> busVehicleApplyDetailVos = busVehicleApplyDetailService.fetchByApplySid(sid);
BigDecimal useDeposit1 = BigDecimal.valueOf(0);
BigDecimal applyForDeposit1 = BigDecimal.valueOf(0);
for (BusVehicleApplyDetailVo busVehicleApplyDetailVo : busVehicleApplyDetailVos) {
BigDecimal useDeposit = new BigDecimal(busVehicleApplyDetailVo.getUseDeposit());
BigDecimal applyForDeposit = new BigDecimal(busVehicleApplyDetailVo.getApplyForDeposit());
useDeposit1 = useDeposit1.add(useDeposit);
applyForDeposit1 = applyForDeposit1.add(applyForDeposit);
}
busVehicleApplyVo.setAmountToBeUsedThisTime(useDeposit1.toString());
busVehicleApplyVo.setAmountAppliedThisTime(applyForDeposit1.toString());
busVehicleApplyVo.setBusVehicleApplyDetailVoList(busVehicleApplyDetailVos);
return busVehicleApplyVo;
}

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderInitModelInfoVo.java

@ -8,10 +8,10 @@ import lombok.Data;
public class AppBusSaleOrderInitModelInfoVo implements Vo {
private static final long serialVersionUID = 342793087650993718L;
@ApiModelProperty("")
@ApiModelProperty("选择的车型信息的数据")
private AppOrderInfo orderInfo;
@ApiModelProperty("")
@ApiModelProperty("根据车型查询出来的现车和采购订单数据")
private AppCarInfo carInfo;
@ApiModelProperty("订单sid")

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppCarInfo.java

@ -11,7 +11,7 @@ public class AppCarInfo implements Vo {
private static final long serialVersionUID = 4029925477789404414L;
@ApiModelProperty("销售订单-车型确认-现车")
private List<AppNowCar> nowCar;
private List<AppNowCarVo> nowCar;
@ApiModelProperty("销售订单-车型确认-排产")
private List<AppReadyCar> readyCar;

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCar.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCarVo.java

@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppNowCar implements Vo {
public class AppNowCarVo implements Vo {
private static final long serialVersionUID = -6377764723851635242L;
@ApiModelProperty("车架号")

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfo.java

@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
@ -32,9 +33,9 @@ public class AppOrderInfo implements Vo {
private String specialInstructions;
@ApiModelProperty("销售订单-车型确认-现车")
private List<AppNowCarList> nowCarList;
private List<AppNowCarList> nowCarList = new ArrayList<>();
@ApiModelProperty("销售订单-车型确认-排产")
private List<AppReadyCarList> readyCarList;
private List<AppReadyCarList> readyCarList = new ArrayList<>();
}

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

@ -164,9 +164,7 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
@Override
@ApiOperation("删除销售订单")
public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
ResultBean rb = ResultBean.fireFail();
busSalesOrderService.deleteSaleOrder(saleOrderSid, userSid);
return rb.success();
return busSalesOrderService.deleteSaleOrder(saleOrderSid, userSid);
}
@Override

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

@ -34,8 +34,8 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceQuery;
import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceVo;
import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
@ -1317,7 +1317,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
AppCarInfo carInfo = new AppCarInfo();
List<AppReadyCar> readyCars = new ArrayList<>();
carInfo.setReadyCar(readyCars);
List<AppNowCar> nowCars = new ArrayList<>();
List<AppNowCarVo> nowCars = new ArrayList<>();
carInfo.setNowCar(nowCars);
vo.setCarInfo(carInfo);
return vo;
@ -1330,62 +1330,95 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String userSid = appBusSaleOrderInitModelInfoQuery.getUserSid();
String special = appBusSaleOrderInitModelInfoQuery.getSpecial();
AppBusSaleOrderInitModelInfoVo vo = new AppBusSaleOrderInitModelInfoVo();
//选择的车型信息的数据
AppOrderInfo orderInfo = new AppOrderInfo();
//根据车型及配置查询除的现车及排产采购订单的列表数据
AppCarInfo appCarInfo = new AppCarInfo();
List<AppNowCar> appNowCars = new ArrayList<>();
//根据车型及配置查询除的现车列表
List<AppNowCarVo> appNowCars = new ArrayList<>();
List<AppReadyCar> appReadyCar = new ArrayList<>();
List<AppNowCarList> appNowCarLists = new ArrayList<>();
List<AppReadyCarList> appReadyCarLists = new ArrayList<>();
AppNowCar appNowCar = null;
//根据车型及配置查询车型信息
ResultBean<AppCarConfigSummaryVo> appCarConfigSummaryVoResultBean = baseVehmodelConfigFeign.selectCarConfigSummary(modelSid, configSid, userSid);
AppCarConfigSummaryVo data = appCarConfigSummaryVoResultBean.getData();
//现车
List<AppVinsDetailsVo> appNowCarVos = baseVehicleFeign.getVins(modelSid, configSid).getData();
//排产
List<AppOrderReadyCar> appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData();
orderInfo.setNotice("提示");
orderInfo.setModelSid(modelSid);
orderInfo.setModelName(data.getModel());
orderInfo.setConfigSid(configSid);
orderInfo.setCommonlyConfig(data.getConfig());
orderInfo.setMoreConfig(data.getMoreConfig());
orderInfo.setModelName(special);
orderInfo.setSpecialInstructions(special);
orderInfo.setNowCarList(appNowCarLists);
orderInfo.setReadyCarList(appReadyCarLists);
//现车
if (appNowCarVos.size() > 0) {
for (AppVinsDetailsVo appNowCarVo : appNowCarVos) {
appNowCar = new AppNowCar();
appNowCar.setCarSid(appNowCarVo.getCarSid());
appNowCar.setAddress(appNowCarVo.getAddress());
appNowCar.setVin(appNowCarVo.getVin());
appNowCars.add(appNowCar);
appCarInfo.setNowCar(appNowCars);
vo.setOrderInfo(orderInfo);
//根据车型sid及配置sid查询现车列表
ResultBean<List<AppBaseVehicleOrderVo>> orderVoResultBean = baseVehicleFeign.selectAppList(modelSid, configSid);
if (orderVoResultBean.getSuccess()) {
List<AppBaseVehicleOrderVo> voList = orderVoResultBean.getData();
for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
AppNowCarVo appNowCarVo = new AppNowCarVo();
BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
appNowCars.add(appNowCarVo);
}
} else {
appCarInfo.setNowCar(appNowCars);
}
//排产采购订单
List<AppOrderReadyCar> appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData();
//排产
BeanUtil.copyProperties(appReadyCar, appOrderReadyCars);
vo.setCarInfo(appCarInfo);
vo.setOrderInfo(orderInfo);
appCarInfo.setReadyCar(appReadyCar);
return vo;
}
@Transactional(rollbackFor = Exception.class)
public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
ResultBean rb = ResultBean.fireFail();
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData().getStaffSid();
BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
if (busSalesOrder.getStaffSid().equals(staffSid)) {
if (busSalesOrder == null) {
return rb.setMsg("该订单不存在");
}
if (!busSalesOrder.getStaffSid().equals(staffSid)) {
return rb.fail().setMsg("该订单不是当前用户所属订单,不能删除");
}
deleteBySid(saleOrderSid);
if (StringUtils.isNotBlank(busSalesOrder.getNodeState())) {
return rb.setMsg("流程已启动,不允许删除");
}
String sid = saleOrderSid;
//删除销售订单主表
deleteBySid(sid);
//删除主车车型信息
busSalesOrderModelService.deleteByOrderSid(sid);
if ("1".equals(busSalesOrder.getType())) {
//删除现车车辆信息
busSalesOrderVehicleService.deleteByOrderSid(sid);
}
if ("2".equals(busSalesOrder.getType())) {
//删除采购订单信息
busSalesVehicleOrderService.deleteByOrderSid(sid);
}
if ("1".equals(busSalesOrder.getIsTop())) {
//删除上装配置信息
busSalesOrderMakeupService.deleteBySalesOrderSid(sid);
}
//删除价格信息
busSalesOrderPriceService.deleteByOrderSid(sid);
//删除主车优惠
busSalesOrderDiscountService.deleteByOrderSid(sid);
if ("1".equals(busSalesOrder.getIsInsurance())) {
//删除保险信息
busSalesOrderInsuranceService.deleteByOrderSid(sid);
}
BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
if (busSalesOrderDeposit != null) {
//删除订金信息
busSalesOrderDepositService.deleteByOrderSid(sid);
if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
//删除订金和虚拟订单关联信息
busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid());
}
}
return rb.success();
}

1
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppOrderCrmVehicleDemandVo.java

@ -7,6 +7,7 @@ import lombok.Data;
@Data
public class AppOrderCrmVehicleDemandVo implements Vo {
private static final long serialVersionUID = 141976458932283317L;
@ApiModelProperty("意向sid")
private String sid;

20
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@ -70,14 +70,14 @@
<!--获取意向车型列表-->
<select id="getVisitListSid" resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo">
SELECT DISTINCT cvcd.sid,
cvcd.modelName,
cvcd.brandName,
cvcd.createTime,
cvcd.saleReferencePrice AS guidancePrice,
cvcd.purchaseMethodValue AS purchaseType
cvcd.modelName,
cvcd.brandName,
cvcd.createTime,
cvcd.saleReferencePrice AS guidancePrice,
cvcd.purchaseMethodValue AS purchaseType
FROM crm_visit cv
LEFT JOIN crm_visit_demand cvd ON cv.sid = cvd.visitSid
LEFT JOIN crm_vehicledemand cvcd ON cvcd.sid = cvd.demandSid
LEFT JOIN crm_visit_demand cvd ON cv.sid = cvd.visitSid
LEFT JOIN crm_vehicledemand cvcd ON cvcd.sid = cvd.demandSid
<where>
${ew.sqlSegment}
</where>
@ -129,9 +129,10 @@
</select>
<select id="getWantCarList" resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo">
select cv.modelSid,
select cv.sid,
cv.modelSid,
cv.comonConfigSid as configSid,
cv.modelAlias as modelName,
cv.modelName,
cv.brandName,
cv.createTime
from crm_vehicledemand cv ${ew.customSqlSegment}
@ -143,5 +144,4 @@
set vehicleModelOffer = NULL
where sid = #{sid}
</update>
</mapper>

3
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@ -30,7 +30,6 @@ import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
* Project: anrui-crm(客户管理) <br/>
@ -441,7 +440,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
//根据车型sid及配置sid查询单台指导价
ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelSid());
ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getConfigSid());
if (voResultBean.getSuccess()) {
list.get(i).setGuidancePrice(voResultBean.getData().getGuidedPrice());
}

11
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java

@ -83,4 +83,15 @@ public interface SysStaffOrgFeign {
@ResponseBody
@ApiModelProperty("根据员工sid获取主管部门信息")
ResultBean<SysStaffOrg> selectAllByStaffSid(@RequestParam(value = "staffSid") String staffSid);
/**
* 根据用户sid获取分公司sid
*
* @param applySid 用户sid
* @return
*/
@GetMapping("/getPathSidByUserSid")
@ResponseBody
@ApiModelProperty("根据员工sid获取部门全路径")
ResultBean<String> getPathSidByUserSid(@RequestParam(value = "userSid") String applySid);
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java

@ -89,4 +89,9 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign {
public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
return null;
}
@Override
public ResultBean<String> getPathSidByUserSid(String applySid) {
return null;
}
}

5
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java

@ -120,4 +120,9 @@ public class SysStaffOrgRest implements SysStaffOrgFeign {
public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
return sysStaffOrgService.selectAllByStaffSid(staffSid);
}
@Override
public ResultBean<String> getPathSidByUserSid(String applySid) {
return sysStaffOrgService.getPathSidByUserSid(applySid);
}
}

23
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

@ -4,9 +4,10 @@ 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.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.*;
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService;
import com.yxt.anrui.portal.biz.sysuser.SysUserService;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -37,6 +38,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
@Autowired
private SysOrganizationService sysOrganizationService;
@Autowired
private SysUserService sysUserService;
public PagerVo<SysStaffOrg> listPage(PagerQuery<SysStaffOrgQuery> pq) {
SysStaffOrgQuery query = pq.getParams();
@ -171,7 +174,7 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
for (int i = 0; i < list.size(); i++) {
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(list.get(i));
if (sysOrganization != null) {
if (sysOrganization.getIsDept() != null){
if (sysOrganization.getIsDept() != null) {
if (sysOrganization.getIsDept() == 0 && !"0".equals(sysOrganization.getPsid())) {
sid = list.get(i);
break;
@ -194,4 +197,20 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
public SysStaffOrg getOrgByStaffSid(String sid) {
return baseMapper.getOrgByStaffSid(sid);
}
/**
* 根据用户sid获取分公司sid
*
* @param applySid 用户sid
* @return
*/
public ResultBean<String> getPathSidByUserSid(String applySid) {
ResultBean<String> rb = ResultBean.fireFail();
SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(applySid);
if (sysUserInfoVo == null) {
return rb;
}
ResultBean<String> resultBean = selectSidPathByStaffSid(sysUserInfoVo.getStaffSid());
return resultBean;
}
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@ -27,6 +27,8 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -96,4 +98,8 @@ public interface AppBusSalesOrderFeign {
@ResponseBody
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery);
@ApiOperation("获取客户意向车型列表")
@PostMapping("/init/wantCarList")
@ResponseBody
ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> getWantCarList(@RequestBody PagerQuery<AppCrmOrderVehicleDemandQuery> pagerQuery);
}

7
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@ -26,6 +26,8 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -81,4 +83,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
return null;
}
@Override
public ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> getWantCarList(PagerQuery<AppCrmOrderVehicleDemandQuery> pagerQuery) {
return null;
}
}

7
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@ -26,6 +26,8 @@
package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -102,4 +104,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
return appBusSalesOrderService.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery);
}
@Override
public ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> getWantCarList(PagerQuery<AppCrmOrderVehicleDemandQuery> pagerQuery) {
return appBusSalesOrderService.getWantCarList(pagerQuery);
}
}

11
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@ -27,6 +27,9 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -53,6 +56,8 @@ public class AppBusSalesOrderService {
@Autowired
BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private CrmVehicledemandFeign crmVehicledemandFeign;
/************************************* 销售订单接口 *********************************************/
@ -125,7 +130,7 @@ public class AppBusSalesOrderService {
* @return
*/
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
ResultBean resultBean = busSalesOrderFeign.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery);
ResultBean<AppBusSaleOrderInitModelInfoVo> resultBean = busSalesOrderFeign.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery);
return resultBean;
}
@ -142,4 +147,8 @@ public class AppBusSalesOrderService {
}
public ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> getWantCarList(PagerQuery<AppCrmOrderVehicleDemandQuery> pagerQuery) {
ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> resultBean = crmVehicledemandFeign.getWantCarList(pagerQuery);
return resultBean;
}
}
Loading…
Cancel
Save