diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListQuery.java index 450f3055bd..3f5c0555a0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListQuery.java @@ -15,25 +15,69 @@ import javax.validation.constraints.NotBlank; public class BaseModelConfigListQuery implements Query { private static final long serialVersionUID = 932522587144455873L; - @ApiModelProperty(value = "车型sid", required = true) - @NotBlank(message = "请选择车型") + @ApiModelProperty(value = "车型sid") private String modelSid; - @ApiModelProperty(value = "颜色") + @ApiModelProperty(value = "配置sid") + private String configSid; + + @ApiModelProperty(value = "颜色key") private String carColor; - @ApiModelProperty(value = "缓速器") + @ApiModelProperty(value = "缓速器key") private String slowMachine; - @ApiModelProperty(value = "驾驶室") + @ApiModelProperty(value = "驾驶室key") private String specification; - @ApiModelProperty(value = "后桥速比") + @ApiModelProperty(value = "后桥速比key") private String rearAxleRatio; - @ApiModelProperty(value = "燃料箱") + @ApiModelProperty(value = "燃料箱key") private String fuelTank; + @ApiModelProperty(value = "后视镜key") + private String rearViewMirrorKey; + + @ApiModelProperty(value = "轮胎key") + private String tireSizeKey; + + @ApiModelProperty(value = "空调key") + private String airConditionerKey; + + @ApiModelProperty(value = "轮毂材质key") + private String hubMaterialKey; + + @ApiModelProperty(value = "导流罩key") + private String baffleModelKey; + + @ApiModelProperty(value = "悬架key") + private String suspensionKey; + + @ApiModelProperty(value = "座椅key") + private String seatKey; + + @ApiModelProperty(value = "护轮罩key") + private String tireCoverKey; + + @ApiModelProperty(value = "鞍座key") + private String saddleKey; + + @ApiModelProperty(value = "轴距key") + private String wheelbaseKey; + + @ApiModelProperty(value = "保险杠key") + private String bumperKey; + + @ApiModelProperty(value = "配置包key") + private String configuringBaoKey; + + @ApiModelProperty(value = "独立热源key") + private String independentSourcesKey; + + @ApiModelProperty(value = "多媒体key") + private String multimediaKey; + @ApiModelProperty(value = "常用配置") private String configName; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppPurchaseDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppPurchaseDetailsVo.java new file mode 100644 index 0000000000..1bd508ec0b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppPurchaseDetailsVo.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; + +import java.util.List; + +@Data +public class AppPurchaseDetailsVo implements Vo { + + @ApiModelProperty("车辆sid") + private String sid; + @ApiModelProperty("车辆照片") + private List vehicleImages; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车辆状态") + private String vehicleStateValue; + @ApiModelProperty("车辆标签") + private String vehicleLabel; + @ApiModelProperty("促销政策") + private String promotionPolicy; + @ApiModelProperty("存放地点") + private String location; + @ApiModelProperty("入库日期") + private String priceDate; + @ApiModelProperty("销售指导价") + private String guidedPrice; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListPageVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListPageVo.java index 1e2bd1d3a7..a6a100c8a1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListPageVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListPageVo.java @@ -28,6 +28,9 @@ public class BaseExistingCarListPageVo implements Vo { @ApiModelProperty(value = "存放地点") private String location; + @ApiModelProperty(value = "合格证") + private String certificate; + // @ApiModelProperty(value = "销售指导价") // @JsonSerialize(using = ToStringSerializer.class) // private String guidedPrice; 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 b00a1ffd39..67861f53de 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 @@ -177,6 +177,16 @@ public interface BaseVehicleFeign { @PostMapping("/selExistingCarPageList") public ResultBean> selExistingCarPageList(@RequestBody PagerQuery pagerQuery); + /** + * pc排产车详情（新） + * + * @param vinNo + * @return + */ + @ApiOperation("根据车架号查询现车详情(新)") + @GetMapping("/getPurchaseDetails/{vinNo}") + ResultBean getPurchaseDetails(@PathVariable("vinNo") String vinNo); + @ApiOperation("采购退库选择车辆分页列表") @PostMapping("/vehicleReturnList") ResultBean> vehicleReturnList(@RequestBody PagerQuery pagerQuery); 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 ad3bfe0815..38b27120d7 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 @@ -99,6 +99,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean getPurchaseDetails(String vinNo) { + return null; + } + @Override public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListQuery.java index 331da1b2aa..f737ba1478 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListQuery.java @@ -17,7 +17,7 @@ public class BaseVehicleModelListQuery implements Query { private String modelName; @ApiModelProperty(value = "品牌sid") private String carBrand; - @ApiModelProperty(value = "功能") + @ApiModelProperty(value = "功能key") private String vehicleType; @ApiModelProperty(value = "系列key") private String productLine; @@ -27,12 +27,24 @@ public class BaseVehicleModelListQuery implements Query { private String power; @ApiModelProperty(value = "版本key") private String vehicleVersion; - @ApiModelProperty(value = "燃料") + @ApiModelProperty(value = "燃料key") private String fuelType; @ApiModelProperty(value = "变速箱key") private String gearboxType; + @ApiModelProperty(value = "排放标准key") + private String emissionStandard; + @ApiModelProperty(value = "发动机型号key") + private String engineType; + @ApiModelProperty(value = "细分市场") + private String marketSegments; + @ApiModelProperty(value = "规格型号") + private String specifications; @ApiModelProperty(value = "用户sid") private String userSid; + @ApiModelProperty(value = "车型sid") + private String modelSid; + @ApiModelProperty(value = "配置sid") + private String configSid; @ApiModelProperty(value = "分公司sid") private String useOrg; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index d2ca713b80..730623b893 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -295,7 +295,7 @@ LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} - AND bvc.useOrg = #{useOrg} + AND bvc.useOrgSid = #{useOrg} 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 ${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} @@ -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} INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location, - vehicleState, firstStartDate, libraryAge) + vehicleState, firstStartDate, libraryAge) VALUES (UUID(), @@ -196,8 +196,8 @@ 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 ${ew.sqlSegment} @@ -349,7 +349,7 @@ LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} - AND bvc.useOrg = #{useOrg} + AND bvc.useOrgSid = #{useOrg} @@ -476,29 +476,29 @@ 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 @@ -575,9 +575,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} @@ -636,4 +636,15 @@ LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` ${ew.customSqlSegment} + + \ 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 99c6b1da13..28a5dce098 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 @@ -6,6 +6,7 @@ import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; +import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; @@ -290,6 +291,18 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv1); } + /** + * 根据车架号查询现车详情 + * + * @param vinNo + * @return + */ + @Override + public ResultBean getPurchaseDetails(String vinNo) { + AppPurchaseDetailsVo vo = baseVehicleService.getPurchaseDetails(vinNo); + return new ResultBean().success().setData(vo); + } + /** * 采购退库选择车辆分页列表 * 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 9064902549..f9fa315bc3 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,10 +6,13 @@ 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.basevehicle.AppPurchaseDetailsVo; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService; import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; +import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -61,6 +64,9 @@ public class BaseVehicleService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = existingCarBuildQW(pagerQuery.getParams()); - return baseMapper.selExistingCarPageList(page, qw); + IPage baseExistingCarListPageVoIPage = baseMapper.selExistingCarPageList(page, qw); + for (BaseExistingCarListPageVo record : baseExistingCarListPageVoIPage.getRecords()) { + record.setCertificate("虚拟/正式"); + } + return baseExistingCarListPageVoIPage; } /** @@ -700,6 +710,29 @@ public class BaseVehicleService extends MybatisBaseService vehicleImages = new ArrayList<>(); + List list = commonAppendixService.selByLinkSid(sid); + if (list.size() > 0) { + for (CommonAppendixVo commonAppendixVo : list) { + String url = fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath(); + vehicleImages.add(url); + } + } + vo.setVehicleImages(vehicleImages); + vo.setVehicleLabel("热卖"); + vo.setPromotionPolicy("机油五桶、保养三次"); + return vo; + } + /** * 手机端业务-车型报价-列表 * @@ -763,7 +796,7 @@ public class BaseVehicleService extends MybatisBaseService SELECT - ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bm.sid and bv.useOrg = bvc.useOrg) AS nowCarNum, + ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bm.sid and bv.useOrg = bvc.useOrgSid) AS nowCarNum, ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bm.sid ) AS productionCarNum FROM base_vehicle_model bm diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java index 0b79518738..0f2dd9c5b9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java @@ -367,9 +367,29 @@ public class BaseVehicleModelService extends MybatisBaseService customerList; + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty("流程实例ID") + private String procInsId; + + @ApiModelProperty("付款账号") + private String payNumber; + + @ApiModelProperty("收款银行") + private String collectionBank; + + @ApiModelProperty("收款银行") + private String collectionBankKey; + + @ApiModelProperty("收款银行账号") + private String collectionNumberKey; + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java index 77c92130c6..2065227e1d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java @@ -21,7 +21,7 @@ public class AppBusDepositBuscenterDetailVo implements Vo { @ApiModelProperty("付款人") private String payName; - @ApiModelProperty("车辆台数") + @ApiModelProperty("预定数量") private String carNumber; @ApiModelProperty("订金金额") @@ -33,6 +33,18 @@ public class AppBusDepositBuscenterDetailVo implements Vo { @ApiModelProperty("付款方式") private String payTypeValue; + @ApiModelProperty("付款方式") + private String payType; + + @ApiModelProperty("付款账号") + private String payNumber; + + @ApiModelProperty("创建日期") + private String createDate; + + @ApiModelProperty("收款银行") + private String collectionBank; + @ApiModelProperty("收款账号") private String collectionNumber; @@ -54,9 +66,6 @@ public class AppBusDepositBuscenterDetailVo implements Vo { @ApiModelProperty("部门名称") private String departmentName; - @ApiModelProperty("跟新状态地址") - private String updateStateUrl; - @ApiModelProperty("客户列表") private List customerList; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java index 416c08a0ab..dd77b9ae2c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java @@ -26,7 +26,7 @@ public class AppBusDepositBuscenterDto implements Dto { private String payTypeValue; @ApiModelProperty("付款方式key") - private String payType; + private String payTypeKey; @ApiModelProperty("付款日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -53,4 +53,23 @@ public class AppBusDepositBuscenterDto implements Dto { @ApiModelProperty("客户列表") private List customerList; + @ApiModelProperty("任务Id") + private String taskId; + + @ApiModelProperty("流程实例ID") + private String procInsId; + + @ApiModelProperty("付款账号") + private String payNumber; + + @ApiModelProperty("收款银行") + private String collectionBank; + + @ApiModelProperty("收款银行") + private String collectionBankKey; + + @ApiModelProperty("收款银行账号") + private String collectionNumberKey; + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositQuery.java index 1e022488c8..bae8f60313 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositQuery.java @@ -59,4 +59,7 @@ public class AppBusMainDepositQuery implements Query { @ApiModelProperty(value = "name") private String name; + @ApiModelProperty(value = "业务员sid") + private String staffSid; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java index c96e47e5b5..635bf8ac15 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java @@ -49,6 +49,12 @@ import lombok.Data; @Data public class AppBusMainDepositVo implements Vo { + @ApiModelProperty(value = "虚拟订单类型（01:订金收取,02:车辆预订）") + private String virtualOrderType; + + @ApiModelProperty(value = "虚拟订单状态") + private String virtualOrderState; + @ApiModelProperty(value = "虚拟订单Sid") private String virtualOrderSid; @@ -58,6 +64,9 @@ public class AppBusMainDepositVo implements Vo { @ApiModelProperty(value = "制单日期") private String virtualOrderDate; + @ApiModelProperty(value = "客户名称") + private String customerSid; + @ApiModelProperty(value = "客户名称") private String customerName; @@ -67,37 +76,25 @@ public class AppBusMainDepositVo implements Vo { @ApiModelProperty(value = "付款人") private String payName; - @ApiModelProperty(value = "备注") - private String remarks; - @ApiModelProperty(value = "车辆台数") private String carNumber; + @ApiModelProperty(value = "备注") + private String remarks; + @ApiModelProperty(value = "描述 (01时传值，02传空字符串)") private String describe; - @ApiModelProperty(value = "是否显示删除") + @ApiModelProperty(value = "是否显示删除 只要走流程了就不显示了") private boolean showDeleteBtn; - @ApiModelProperty(value = "是否显示修改") + @ApiModelProperty(value = "是否显示修改 只要走流程了就不显示了") private boolean showUpdateBtn; - @ApiModelProperty(value = "虚拟订单状态") - private String virtualOrderState; - - @ApiModelProperty(value = "虚拟订单类型（01:订金收取,02:车辆预订）") - private String virtualOrderType; - - @ApiModelProperty(value = "是否显示使用订金记录") + @ApiModelProperty(value = "是否显示使用订金记录 有使用记录时才显示（订金收取时才有）") private boolean showDepositBtn; - @ApiModelProperty(value = "是否显示申请收款单") + @ApiModelProperty(value = "是否显示申请收款单 流程状态为 收款确认 时显示") private boolean showApplyBtn; - @ApiModelProperty(value = "联系电话") - private String mobile; - - @ApiModelProperty(value = "审核节点状态") - private String nodeState; - } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempMaintainStateVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempMaintainStateVo.java index 20ab6ea7c8..1d775b4a4b 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempMaintainStateVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempMaintainStateVo.java @@ -26,6 +26,9 @@ public class AppCrmCustomerTempMaintainStateVo implements Vo { @ApiModelProperty("车辆需求：0、未完善1、已完善") private int vehicleDemandState; + @ApiModelProperty("客户档案：0、未完善1、已完善") + private int customerArchivesState; + @ApiModelProperty("维系提醒：0、不开启1、已开启") private int isOnRemind; diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java index 7b5aa38129..cb1a89a60b 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java @@ -26,10 +26,10 @@ public class AppCrmVehicledemandVo implements Vo { private String createTime; @ApiModelProperty("销售指导价") - private String guidancePrice; + private String vehicleModelOffer; @ApiModelProperty("购车方式value") - private String purchaseType; + private String purchaseMethod; } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.java index 0d22d45b12..6a7bbf1657 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.java @@ -68,6 +68,15 @@ public interface CrmCustomerFileMapper extends BaseMapper { List selectByCustomerSid(@Param("customerSid") String customerSid); + /** + * 手机端维护客户信息是否完善的状态 + * 查询客户档案状态 + * + * @param customerSid + * @return + */ + List selectByCustomerSidState(@Param("customerSid") String customerSid); + List selArchivesFileImageBySid(@Param("sid") String sid); // 查询数据库是否存在该类型 diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml index ae4fade2e3..48c8c5ca1a 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml @@ -43,4 +43,10 @@ where ccf.linkSid = #{sid} + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java index 267c889718..47dc25d18e 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java @@ -282,5 +282,14 @@ public class CrmCustomerFileService extends MybatisBaseService selectByCustomerSidState(String sid) { + return baseMapper.selectByCustomerSidState(sid); + } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 0e6f9a257a..32ead98237 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -10,12 +10,14 @@ import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto; import com.yxt.anrui.crm.api.crmbusiness.AppCrmBusinessInfoVo; import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto; import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessVo; +import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileVo; import com.yxt.anrui.crm.api.crmcustomertemp.*; import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum; import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo; import com.yxt.anrui.crm.api.crmvisit.AppCrmVisitThumbDetailsVo; import com.yxt.anrui.crm.api.crmvisit.PcCrmVisitAppendixDto; import com.yxt.anrui.crm.biz.crmbusiness.CrmBusinessService; +import com.yxt.anrui.crm.biz.crmcustomerfile.CrmCustomerFileService; import com.yxt.anrui.crm.biz.crmfile.CrmFileService; import com.yxt.anrui.crm.biz.crmvehicledemand.CrmVehicledemandService; import com.yxt.anrui.crm.biz.crmvisit.CrmVisitService; @@ -69,6 +71,9 @@ public class CrmCustomerTempService extends MybatisBaseService crmCustomerFileVos = crmCustomerFileService.selectByCustomerSidState(sid); + if (crmCustomerFileVos.size() <= 0) { + vo.setOperationSituationState(0); + } else { + vo.setOperationSituationState(1); + } //意向车型 List appCrmVehicledemandVos = crmVehicledemandService.selectCustomerSid(sid); if (appCrmVehicledemandVos.size() > 0) { diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index 765657d7ad..d03b8a5cb9 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -28,7 +28,7 @@ cvcd.comonConfigSid, cvcd.vehicleModelOffer, cvcd.createTime, - cvcd.purchaseMethodValue + cvcd.purchaseMethodValue AS purchaseMethod FROM crm_customer_temp cct LEFT JOIN crm_vehicledemand cvcd ON cct.sid = cvcd.customerSid WHERE cct.sid = #{sid}