From 2b9410fdee2f990f2de58e480a011120ae49ff9f Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 28 May 2022 11:56:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=84=8F=E5=90=91=E8=BD=A6=E5=9E=8B=E5=88=97=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BD=A6=E5=9E=8B=E5=92=8C=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8F=8A=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehmodelConfigFeign.java | 3 +- .../BaseVehmodelConfigMapper.xml | 42 ++++++++++--------- .../BaseVehmodelConfigRest.java | 5 +-- .../BaseVehmodelConfigService.java | 18 +++++--- .../app/AppBusSaleOrderInitModelInfoVo.java | 4 +- .../api/bussalesorder/app/AppOrderInfo.java | 5 ++- .../bussalesorder/BusSalesOrderService.java | 19 ++++----- .../AppOrderCrmVehicleDemandVo.java | 1 + .../CrmVehicledemandMapper.xml | 20 ++++----- .../CrmVehicledemandService.java | 3 +- .../api/sysstafforg/SysStaffOrgFeign.java | 11 +++++ .../sysstafforg/SysStaffOrgFeignFallback.java | 5 +++ .../biz/sysstafforg/SysStaffOrgRest.java | 5 +++ .../biz/sysstafforg/SysStaffOrgService.java | 23 +++++++++- .../saleOrders/AppBusSalesOrderFeign.java | 6 +++ .../AppBusSalesOrderFeignFallback.java | 7 ++++ .../saleOrders/AppBusSalesOrderRest.java | 7 ++++ .../saleOrders/AppBusSalesOrderService.java | 11 ++++- 18 files changed, 134 insertions(+), 61 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java index 927f10bfaf..3d5d484d72 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java +++ b/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 selectCarConfigSummary(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid, @RequestParam("userSid") String userSid); + public ResultBean selectCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 728b66270b..37bfffeb54 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -5,9 +5,9 @@ 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 ${ew.sqlSegment} @@ -186,8 +186,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 +249,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} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java index 6a7b3a45b6..98101b5824 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java +++ b/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 selectCarConfigSummary(String modelSid, String configSid, String userSid) { - ResultBean rb = ResultBean.fireFail(); - AppCarConfigSummaryVo vo = baseVehmodelConfigService.selectCarConfigSummary(modelSid, configSid,userSid); - return rb.success().setData(vo); + return baseVehmodelConfigService.selectCarConfigSummary(modelSid, configSid,userSid); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 237a15feb6..ee7b44e533 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/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 selectCarConfigSummary(String modelSid, String configSid, String userSid) { + ResultBean rb = ResultBean.fireFail(); + ResultBean 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()); } /** diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderInitModelInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderInitModelInfoVo.java index d1984a6727..dbe926005c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderInitModelInfoVo.java +++ b/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") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfo.java index 8750c4819a..633116abf7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfo.java +++ b/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 nowCarList; + private List nowCarList = new ArrayList<>(); @ApiModelProperty("销售订单-车型确认-排产") - private List readyCarList; + private List readyCarList = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 7a0464c9b4..e229f7f3ff 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -1336,26 +1336,23 @@ public class BusSalesOrderService extends MybatisBaseService appReadyCar = new ArrayList<>(); List appNowCarLists = new ArrayList<>(); List appReadyCarLists = new ArrayList<>(); - AppNowCar appNowCar = null; - + //根据车型及配置查询车型信息 ResultBean appCarConfigSummaryVoResultBean = baseVehmodelConfigFeign.selectCarConfigSummary(modelSid, configSid, userSid); AppCarConfigSummaryVo data = appCarConfigSummaryVoResultBean.getData(); - //现车 - List appNowCarVos = baseVehicleFeign.getVins(modelSid, configSid).getData(); - //排产 - List 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); - + vo.setOrderInfo(orderInfo); + //现车 + List appNowCarVos = baseVehicleFeign.getVins(modelSid, configSid).getData(); + //排产 + List appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData(); //现车 if (appNowCarVos.size() > 0) { for (AppVinsDetailsVo appNowCarVo : appNowCarVos) { @@ -1372,9 +1369,7 @@ public class BusSalesOrderService extends MybatisBaseService 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} @@ -373,9 +373,9 @@ 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} @@ -473,33 +473,42 @@ 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 @@ -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} + + \ 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 76e74c7792..6c4720b1d8 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 @@ -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> selectAppList(String modelSid, String configSid) { + return baseVehicleService.selectAppList(modelSid, configSid); + } + /** * 手机端现车列表 * 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 0b35955ae8..43c30cd2ff 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,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> selectAppList(String modelSid, String configSid) { + ResultBean> rb = ResultBean.fireFail(); + List 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); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java index 38dd1005bf..735a6841d5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java +++ b/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 INSERT INTO base_vehicle_certificate(sid, certificationNo, vehicleSid, vinNo, certificateSituation, - certificateDate, toCardDate, receiveDate, seatingCapacity, remarks) + certificateDate, toCardDate, receiveDate, seatingCapacity, remarks) VALUES (UUID(), @@ -163,4 +163,10 @@ #{item} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java index eb00f23305..c985872026 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java +++ b/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 nowCar; + private List nowCar; @ApiModelProperty("销售订单-车型确认-排产") private List readyCar; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCar.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCarVo.java similarity index 93% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCar.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCarVo.java index 0ced0cf01f..894de68e1f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCar.java +++ b/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("车架号") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index bd7a29eff7..af84cb1c35 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/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 readyCars = new ArrayList<>(); carInfo.setReadyCar(readyCars); - List nowCars = new ArrayList<>(); + List nowCars = new ArrayList<>(); carInfo.setNowCar(nowCars); vo.setCarInfo(carInfo); return vo; @@ -1330,13 +1330,15 @@ public class BusSalesOrderService extends MybatisBaseService appNowCars = new ArrayList<>(); + //根据车型及配置查询除的现车列表 + List appNowCars = new ArrayList<>(); List appReadyCar = new ArrayList<>(); List appNowCarLists = new ArrayList<>(); List appReadyCarLists = new ArrayList<>(); - AppNowCar appNowCar = null; //根据车型及配置查询车型信息 ResultBean appCarConfigSummaryVoResultBean = baseVehmodelConfigFeign.selectCarConfigSummary(modelSid, configSid, userSid); AppCarConfigSummaryVo data = appCarConfigSummaryVoResultBean.getData(); @@ -1349,29 +1351,26 @@ public class BusSalesOrderService extends MybatisBaseService appNowCarVos = baseVehicleFeign.getVins(modelSid, configSid).getData(); - //排产 - List appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData(); - //现车 - 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); + //根据车型sid及配置sid查询现车列表 + ResultBean> orderVoResultBean = baseVehicleFeign.selectAppList(modelSid, configSid); + if (orderVoResultBean.getSuccess()) { + List voList = orderVoResultBean.getData(); + for (AppBaseVehicleOrderVo vehicleOrderVo : voList) { + AppNowCarVo appNowCarVo = new AppNowCarVo(); + BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo); + appNowCars.add(appNowCarVo); } - } else { appCarInfo.setNowCar(appNowCars); } + //排产采购订单 + List appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData(); //排产 BeanUtil.copyProperties(appReadyCar, appOrderReadyCars); vo.setCarInfo(appCarInfo); appCarInfo.setReadyCar(appReadyCar); return vo; } + @Transactional(rollbackFor = Exception.class) public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) { ResultBean rb = ResultBean.fireFail(); From ca3495b3870506d2a3677f7616cf191767da698d Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 28 May 2022 18:04:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseOutsourcingApplicationDto.java | 11 +++--- .../BaseVehmodelConfigVo.java | 2 + .../busvehicleapply/BusVehicleApplyQuery.java | 2 + .../busvehicleapply/BusVehicleApplyVo.java | 2 + .../BusVehicleApplyDetail.java | 2 + .../BusVehicleApplyDetailDto.java | 4 +- .../BusVehicleApplyDetailVo.java | 2 + .../BaseVehmodelConfigMapper.xml | 3 +- .../busvehicleapply/BusVehicleApplyMapper.xml | 5 ++- .../BusVehicleApplyService.java | 38 ++++++++----------- 10 files changed, 41 insertions(+), 30 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java index ad35c903a6..266a36de23 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java +++ b/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") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java index 36ea7ccef8..8723c13189 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java +++ b/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; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java index 59cd168294..065bb6b164 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java +++ b/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; // 车型名称 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java index 44a0cb68c4..a283c47b1f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java +++ b/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") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java index 9d525a78ad..7b96658f37 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java +++ b/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; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java index cea4e16ec5..1136681988 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java +++ b/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; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java index 2ed3ea6c87..c32ce834ee 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java +++ b/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; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 37bfffeb54..7754bad3cd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -50,7 +50,8 @@ 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 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml index b76b77303f..8275f18b47 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml @@ -4,7 +4,10 @@