From 5edc6552fe348783e8a89682adebff20d964f2cb Mon Sep 17 00:00:00 2001 From: alllenliufor3 <1009545232@qq.com> Date: Sat, 2 Apr 2022 11:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0pc=E7=AB=AF=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busvehicleorder/BusVehicleOrder.java | 263 +------------ .../busvehicleorder/BusVehicleOrderDto.java | 325 ++-------------- .../busvehicleorder/BusVehicleOrderFeign.java | 16 +- .../BusVehicleOrderFeignFallback.java | 11 +- .../busvehicleorder/BusVehicleOrderQuery.java | 351 +----------------- .../busvehicleorder/BusVehicleOrderVo.java | 309 +-------------- .../busvehicleorder/VehicleOrderListVo.java | 44 +++ .../BusVehicleOrderMapper.java | 4 +- .../busvehicleorder/BusVehicleOrderMapper.xml | 20 +- .../busvehicleorder/BusVehicleOrderRest.java | 42 +-- .../BusVehicleOrderService.java | 117 +++--- 11 files changed, 186 insertions(+), 1316 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java index 84644a9e78..a27d1515ef 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * Project: anrui-base(车型信息)
@@ -45,6 +46,7 @@ import io.swagger.annotations.ApiModelProperty; */ @ApiModel(value = "车辆采购订单", description = "车辆采购订单") @TableName("bus_vehicle_order") +@Data public class BusVehicleOrder extends BaseEntity { private static final long serialVersionUID = 1L; @@ -108,265 +110,4 @@ public class BusVehicleOrder extends BaseEntity { @ApiModelProperty("订单状态") private String orderStatus; // 订单状态 - - /** - * @return 创建组织sid - */ - public String getCreateOrgSid(){ - return createOrgSid; - } - - /** - * @param createOrgSid 创建组织sid to set - */ - public void setCreateOrgSid(String createOrgSid){ - this.createOrgSid = createOrgSid; - } - /** - * @return 订单编号 - */ - public String getOrderNo(){ - return orderNo; - } - - /** - * @param orderNo 订单编号 to set - */ - public void setOrderNo(String orderNo){ - this.orderNo = orderNo; - } - /** - * @return 订单类型 - */ - public String getOrderType(){ - return orderType; - } - - /** - * @param orderType 订单类型 to set - */ - public void setOrderType(String orderType){ - this.orderType = orderType; - } - /** - * @return 订单日期 - */ - public String getOrderDate(){ - return orderDate; - } - - /** - * @param orderDate 订单日期 to set - */ - public void setOrderDate(String orderDate){ - this.orderDate = orderDate; - } - /** - * @return 排产/采购申请sid - */ - public String getPurchaseRequisitionSid(){ - return purchaseRequisitionSid; - } - - /** - * @param purchaseRequisitionSid 排产/采购申请sid to set - */ - public void setPurchaseRequisitionSid(String purchaseRequisitionSid){ - this.purchaseRequisitionSid = purchaseRequisitionSid; - } - /** - * @return 排产/采购申请中车型表sid - */ - public String getPurchaseApplyMediumModelSid(){ - return purchaseApplyMediumModelSid; - } - - /** - * @param purchaseApplyMediumModelSid 排产/采购申请中车型表sid to set - */ - public void setPurchaseApplyMediumModelSid(String purchaseApplyMediumModelSid){ - this.purchaseApplyMediumModelSid = purchaseApplyMediumModelSid; - } - /** - * @return 台数 - */ - public String getPlatformNo(){ - return platformNo; - } - - /** - * @param platformNo 台数 to set - */ - public void setPlatformNo(String platformNo){ - this.platformNo = platformNo; - } - /** - * @return 底盘价格构成 - */ - public String getChassisPriceComposition(){ - return chassisPriceComposition; - } - - /** - * @param chassisPriceComposition 底盘价格构成 to set - */ - public void setChassisPriceComposition(String chassisPriceComposition){ - this.chassisPriceComposition = chassisPriceComposition; - } - /** - * @return 底盘结算价格 - */ - public String getChassisSettlementPrice(){ - return chassisSettlementPrice; - } - - /** - * @param chassisSettlementPrice 底盘结算价格 to set - */ - public void setChassisSettlementPrice(String chassisSettlementPrice){ - this.chassisSettlementPrice = chassisSettlementPrice; - } - /** - * @return 上装价格 - */ - public String getCoatPrice(){ - return coatPrice; - } - - /** - * @param coatPrice 上装价格 to set - */ - public void setCoatPrice(String coatPrice){ - this.coatPrice = coatPrice; - } - /** - * @return 修订差价 - */ - public String getRevisedPriceDifference(){ - return revisedPriceDifference; - } - - /** - * @param revisedPriceDifference 修订差价 to set - */ - public void setRevisedPriceDifference(String revisedPriceDifference){ - this.revisedPriceDifference = revisedPriceDifference; - } - /** - * @return 入库价格 - */ - public String getTreasuryPrice(){ - return treasuryPrice; - } - - /** - * @param treasuryPrice 入库价格 to set - */ - public void setTreasuryPrice(String treasuryPrice){ - this.treasuryPrice = treasuryPrice; - } - /** - * @return 运费 - */ - public String getFreight(){ - return freight; - } - - /** - * @param freight 运费 to set - */ - public void setFreight(String freight){ - this.freight = freight; - } - /** - * @return 销售指导价 - */ - public String getSalesGuidePrice(){ - return salesGuidePrice; - } - - /** - * @param salesGuidePrice 销售指导价 to set - */ - public void setSalesGuidePrice(String salesGuidePrice){ - this.salesGuidePrice = salesGuidePrice; - } - /** - * @return 收到发票日期 - */ - public String getReceivedInvoiceDate(){ - return receivedInvoiceDate; - } - - /** - * @param receivedInvoiceDate 收到发票日期 to set - */ - public void setReceivedInvoiceDate(String receivedInvoiceDate){ - this.receivedInvoiceDate = receivedInvoiceDate; - } - /** - * @return 发票金额 - */ - public String getInvoiceAmount(){ - return invoiceAmount; - } - - /** - * @param invoiceAmount 发票金额 to set - */ - public void setInvoiceAmount(String invoiceAmount){ - this.invoiceAmount = invoiceAmount; - } - /** - * @return 预计上线日期 - */ - public String getExpectLaunchDate(){ - return expectLaunchDate; - } - - /** - * @param expectLaunchDate 预计上线日期 to set - */ - public void setExpectLaunchDate(String expectLaunchDate){ - this.expectLaunchDate = expectLaunchDate; - } - /** - * @return 上线日期 - */ - public String getLaunchDate(){ - return launchDate; - } - - /** - * @param launchDate 上线日期 to set - */ - public void setLaunchDate(String launchDate){ - this.launchDate = launchDate; - } - /** - * @return 下线日期 - */ - public String getOfflineDate(){ - return offlineDate; - } - - /** - * @param offlineDate 下线日期 to set - */ - public void setOfflineDate(String offlineDate){ - this.offlineDate = offlineDate; - } - /** - * @return 订单状态 - */ - public String getOrderStatus(){ - return orderStatus; - } - - /** - * @param orderStatus 订单状态 to set - */ - public void setOrderStatus(String orderStatus){ - this.orderStatus = orderStatus; - } } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java index 2c86cc9d99..86d6ea66da 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java @@ -26,9 +26,16 @@ package com.yxt.anrui.base.api.busvehicleorder; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; +import com.yxt.common.core.utils.desensitized.Sensitive; +import com.yxt.common.core.utils.desensitized.SensitiveTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; /** * Project: anrui-base(车型信息)
@@ -44,8 +51,11 @@ import io.swagger.annotations.ApiModelProperty; * @since 1.0 */ @ApiModel(value = "车辆采购订单 数据传输对象", description = "车辆采购订单 数据传输对象") +@Data public class BusVehicleOrderDto implements Dto { + @ApiModelProperty("采购订单sid") + private String sid; @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @@ -54,337 +64,56 @@ public class BusVehicleOrderDto implements Dto { private String orderNo; // 订单编号 @ApiModelProperty("订单类型") + @NotBlank(message = "订单类型不能为空") private String orderType; // 订单类型 @ApiModelProperty("订单日期") + @Pattern(regexp = "^(\\s*)|([1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]))$", message = "订单日期格式不正确") private String orderDate; // 订单日期 @ApiModelProperty("排产/采购申请sid") private String purchaseRequisitionSid; // 排产/采购申请sid @ApiModelProperty("排产/采购申请中车型表sid") + @NotBlank(message = "车型表sid不能为空") private String purchaseApplyMediumModelSid; // 排产/采购申请中车型表sid @ApiModelProperty("台数") + @NotBlank(message = "台数不能为空") + @Pattern(regexp = "^(\\s*)|([1-9]\\d*)$", message = "台数输入不正确") private String platformNo; // 台数 - @ApiModelProperty("底盘价格构成") - private String chassisPriceComposition; // 底盘价格构成 - - @ApiModelProperty("底盘结算价格") - private String chassisSettlementPrice; // 底盘结算价格 - @ApiModelProperty("上装价格") + @Pattern(regexp = "^(\\s*)|(([1-9][0-9]*)|(([0]\\.\\d{0,2}|[1-9][0-9]*\\.\\d{0,2})))$", message = "上装价格格式输入不正确") private String coatPrice; // 上装价格 - @ApiModelProperty("修订差价") - private String revisedPriceDifference; // 修订差价 - @ApiModelProperty("入库价格") - private String treasuryPrice; // 入库价格 + @Pattern(regexp = "^(\\s*)|(([1-9][0-9]*)|(([0]\\.\\d{0,2}|[1-9][0-9]*\\.\\d{0,2})))$", message = "入库价格格式输入不正确") + private String treasuryPrice; // 入库价格 @ApiModelProperty("运费") + @Pattern(regexp = "^(\\s*)|(([1-9][0-9]*)|(([0]\\.\\d{0,2}|[1-9][0-9]*\\.\\d{0,2})))$", message = "运费格式输入不正确") private String freight; // 运费 @ApiModelProperty("销售指导价") + @Pattern(regexp = "^(\\s*)|(([1-9][0-9]*)|(([0]\\.\\d{0,2}|[1-9][0-9]*\\.\\d{0,2})))$", message = "销售指导价格式输入不正确") private String salesGuidePrice; // 销售指导价 - - @ApiModelProperty("收到发票日期") - private String receivedInvoiceDate; // 收到发票日期 - - @ApiModelProperty("发票金额") - private String invoiceAmount; // 发票金额 - + @ApiModelProperty("预计上线日期") + @Pattern(regexp = "^(\\s*)|([1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]))$", message = "预计上线日期格式不正确") private String expectLaunchDate; // 预计上线日期 @ApiModelProperty("上线日期") + @Pattern(regexp = "^(\\s*)|([1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]))$", message = "上线日期格式不正确") private String launchDate; // 上线日期 @ApiModelProperty("下线日期") + @Pattern(regexp = "^(\\s*)|([1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]))$", message = "下线日期格式不正确") private String offlineDate; // 下线日期 + + @ApiModelProperty("排产申请编号") + private String applicationCode; @ApiModelProperty("订单状态") private String orderStatus; // 订单状态 - - - /** - * @return 创建组织sid - */ - public String getCreateOrgSid(){ - return createOrgSid; - } - - /** - * @param createOrgSid 创建组织sid to set - */ - public void setCreateOrgSid(String createOrgSid){ - this.createOrgSid = createOrgSid; - } - - /** - * @return 订单编号 - */ - public String getOrderNo(){ - return orderNo; - } - - /** - * @param orderNo 订单编号 to set - */ - public void setOrderNo(String orderNo){ - this.orderNo = orderNo; - } - - /** - * @return 订单类型 - */ - public String getOrderType(){ - return orderType; - } - - /** - * @param orderType 订单类型 to set - */ - public void setOrderType(String orderType){ - this.orderType = orderType; - } - - /** - * @return 订单日期 - */ - public String getOrderDate(){ - return orderDate; - } - - /** - * @param orderDate 订单日期 to set - */ - public void setOrderDate(String orderDate){ - this.orderDate = orderDate; - } - - /** - * @return 排产/采购申请sid - */ - public String getPurchaseRequisitionSid(){ - return purchaseRequisitionSid; - } - - /** - * @param purchaseRequisitionSid 排产/采购申请sid to set - */ - public void setPurchaseRequisitionSid(String purchaseRequisitionSid){ - this.purchaseRequisitionSid = purchaseRequisitionSid; - } - - /** - * @return 排产/采购申请中车型表sid - */ - public String getPurchaseApplyMediumModelSid(){ - return purchaseApplyMediumModelSid; - } - - /** - * @param purchaseApplyMediumModelSid 排产/采购申请中车型表sid to set - */ - public void setPurchaseApplyMediumModelSid(String purchaseApplyMediumModelSid){ - this.purchaseApplyMediumModelSid = purchaseApplyMediumModelSid; - } - - /** - * @return 台数 - */ - public String getPlatformNo(){ - return platformNo; - } - - /** - * @param platformNo 台数 to set - */ - public void setPlatformNo(String platformNo){ - this.platformNo = platformNo; - } - - /** - * @return 底盘价格构成 - */ - public String getChassisPriceComposition(){ - return chassisPriceComposition; - } - - /** - * @param chassisPriceComposition 底盘价格构成 to set - */ - public void setChassisPriceComposition(String chassisPriceComposition){ - this.chassisPriceComposition = chassisPriceComposition; - } - - /** - * @return 底盘结算价格 - */ - public String getChassisSettlementPrice(){ - return chassisSettlementPrice; - } - - /** - * @param chassisSettlementPrice 底盘结算价格 to set - */ - public void setChassisSettlementPrice(String chassisSettlementPrice){ - this.chassisSettlementPrice = chassisSettlementPrice; - } - - /** - * @return 上装价格 - */ - public String getCoatPrice(){ - return coatPrice; - } - - /** - * @param coatPrice 上装价格 to set - */ - public void setCoatPrice(String coatPrice){ - this.coatPrice = coatPrice; - } - - /** - * @return 修订差价 - */ - public String getRevisedPriceDifference(){ - return revisedPriceDifference; - } - - /** - * @param revisedPriceDifference 修订差价 to set - */ - public void setRevisedPriceDifference(String revisedPriceDifference){ - this.revisedPriceDifference = revisedPriceDifference; - } - - /** - * @return 入库价格 - */ - public String getTreasuryPrice(){ - return treasuryPrice; - } - - /** - * @param treasuryPrice 入库价格 to set - */ - public void setTreasuryPrice(String treasuryPrice){ - this.treasuryPrice = treasuryPrice; - } - - /** - * @return 运费 - */ - public String getFreight(){ - return freight; - } - - /** - * @param freight 运费 to set - */ - public void setFreight(String freight){ - this.freight = freight; - } - - /** - * @return 销售指导价 - */ - public String getSalesGuidePrice(){ - return salesGuidePrice; - } - - /** - * @param salesGuidePrice 销售指导价 to set - */ - public void setSalesGuidePrice(String salesGuidePrice){ - this.salesGuidePrice = salesGuidePrice; - } - - /** - * @return 收到发票日期 - */ - public String getReceivedInvoiceDate(){ - return receivedInvoiceDate; - } - - /** - * @param receivedInvoiceDate 收到发票日期 to set - */ - public void setReceivedInvoiceDate(String receivedInvoiceDate){ - this.receivedInvoiceDate = receivedInvoiceDate; - } - - /** - * @return 发票金额 - */ - public String getInvoiceAmount(){ - return invoiceAmount; - } - - /** - * @param invoiceAmount 发票金额 to set - */ - public void setInvoiceAmount(String invoiceAmount){ - this.invoiceAmount = invoiceAmount; - } - - /** - * @return 预计上线日期 - */ - public String getExpectLaunchDate(){ - return expectLaunchDate; - } - - /** - * @param expectLaunchDate 预计上线日期 to set - */ - public void setExpectLaunchDate(String expectLaunchDate){ - this.expectLaunchDate = expectLaunchDate; - } - - /** - * @return 上线日期 - */ - public String getLaunchDate(){ - return launchDate; - } - - /** - * @param launchDate 上线日期 to set - */ - public void setLaunchDate(String launchDate){ - this.launchDate = launchDate; - } - - /** - * @return 下线日期 - */ - public String getOfflineDate(){ - return offlineDate; - } - - /** - * @param offlineDate 下线日期 to set - */ - public void setOfflineDate(String offlineDate){ - this.offlineDate = offlineDate; - } - - /** - * @return 订单状态 - */ - public String getOrderStatus(){ - return orderStatus; - } - - /** - * @param orderStatus 订单状态 to set - */ - public void setOrderStatus(String orderStatus){ - this.orderStatus = orderStatus; - } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java index e16b211630..45847a560e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java @@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; + /** * Project: anrui-base(车型信息)
* File: BusVehicleOrderFeign.java
@@ -57,22 +59,18 @@ public interface BusVehicleOrderFeign { @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增保存") - @PostMapping("/save") - public ResultBean save(@RequestBody BusVehicleOrderDto dto); + public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("修改保存") - @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody BusVehicleOrderDto dto, @PathVariable("sid") String sid); + @ApiOperation("新增或修改车辆采购订单") + @PostMapping("/saveOrUpdateVehicleOrder") + public ResultBean saveOrUpdateVehicleOrder(@RequestBody @Valid BusVehicleOrderDto dto); @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids); - @ApiOperation("根据SID获取一条记录") + @ApiOperation("根据sid查询车辆采购订单") @GetMapping("/fetchBySid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java index c154bc9f89..d590a54a58 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java @@ -48,19 +48,14 @@ import org.springframework.stereotype.Component; public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign { @Override - public ResultBean> listPage(PagerQuery pq) { + public ResultBean listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-base/busvehicleorder/listPage无法访问"); } @Override - public ResultBean save(BusVehicleOrderDto dto) { - return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleorder/save无法访问"); - } - - @Override - public ResultBean update(BusVehicleOrderDto dto, String sid) { - return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleorder/update无法访问"); + public ResultBean saveOrUpdateVehicleOrder(BusVehicleOrderDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleorder/saveOrUpdateVehicleOrder无法访问"); } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java index 654efa0bde..77f87af344 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java @@ -29,6 +29,7 @@ package com.yxt.anrui.base.api.busvehicleorder; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * Project: anrui-base(车型信息)
@@ -44,347 +45,25 @@ import io.swagger.annotations.ApiModelProperty; * @since 1.0 */ @ApiModel(value = "车辆采购订单 查询条件", description = "车辆采购订单 查询条件") +@Data public class BusVehicleOrderQuery implements Query { - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - @ApiModelProperty("订单编号") - private String orderNo; // 订单编号 - - @ApiModelProperty("订单类型") - private String orderType; // 订单类型 - - @ApiModelProperty("订单日期") - private String orderDate; // 订单日期 - - @ApiModelProperty("排产/采购申请sid") - private String purchaseRequisitionSid; // 排产/采购申请sid - - @ApiModelProperty("排产/采购申请中车型表sid") - private String purchaseApplyMediumModelSid; // 排产/采购申请中车型表sid - - @ApiModelProperty("台数") - private String platformNo; // 台数 - - @ApiModelProperty("底盘价格构成") - private String chassisPriceComposition; // 底盘价格构成 - - @ApiModelProperty("底盘结算价格") - private String chassisSettlementPrice; // 底盘结算价格 - - @ApiModelProperty("上装价格") - private String coatPrice; // 上装价格 - - @ApiModelProperty("修订差价") - private String revisedPriceDifference; // 修订差价 - - @ApiModelProperty("入库价格") - private String treasuryPrice; // 入库价格 - - @ApiModelProperty("运费") - private String freight; // 运费 - - @ApiModelProperty("销售指导价") - private String salesGuidePrice; // 销售指导价 - - @ApiModelProperty("收到发票日期") - private String receivedInvoiceDate; // 收到发票日期 - - @ApiModelProperty("发票金额") - private String invoiceAmount; // 发票金额 - - @ApiModelProperty("预计上线日期") - private String expectLaunchDate; // 预计上线日期 - - @ApiModelProperty("上线日期") - private String launchDate; // 上线日期 + private String orderNo; + + @ApiModelProperty("订单类型") + private String orderType; + + @ApiModelProperty("订单状态") + private String orderStatus; - @ApiModelProperty("下线日期") - private String offlineDate; // 下线日期 + @ApiModelProperty("开始日期") + private String startDate; - @ApiModelProperty("订单状态") - private String orderStatus; // 订单状态 + @ApiModelProperty("结束日期") + private String endDate; - - /** - * @return 创建组织sid - */ - public String getCreateOrgSid(){ - return createOrgSid; - } - - /** - * @param createOrgSid 创建组织sid to set - */ - public void setCreateOrgSid(String createOrgSid){ - this.createOrgSid = createOrgSid; - } - - /** - * @return 订单编号 - */ - public String getOrderNo(){ - return orderNo; - } - - /** - * @param orderNo 订单编号 to set - */ - public void setOrderNo(String orderNo){ - this.orderNo = orderNo; - } - - /** - * @return 订单类型 - */ - public String getOrderType(){ - return orderType; - } - - /** - * @param orderType 订单类型 to set - */ - public void setOrderType(String orderType){ - this.orderType = orderType; - } - - /** - * @return 订单日期 - */ - public String getOrderDate(){ - return orderDate; - } - - /** - * @param orderDate 订单日期 to set - */ - public void setOrderDate(String orderDate){ - this.orderDate = orderDate; - } - - /** - * @return 排产/采购申请sid - */ - public String getPurchaseRequisitionSid(){ - return purchaseRequisitionSid; - } - - /** - * @param purchaseRequisitionSid 排产/采购申请sid to set - */ - public void setPurchaseRequisitionSid(String purchaseRequisitionSid){ - this.purchaseRequisitionSid = purchaseRequisitionSid; - } - - /** - * @return 排产/采购申请中车型表sid - */ - public String getPurchaseApplyMediumModelSid(){ - return purchaseApplyMediumModelSid; - } - - /** - * @param purchaseApplyMediumModelSid 排产/采购申请中车型表sid to set - */ - public void setPurchaseApplyMediumModelSid(String purchaseApplyMediumModelSid){ - this.purchaseApplyMediumModelSid = purchaseApplyMediumModelSid; - } - - /** - * @return 台数 - */ - public String getPlatformNo(){ - return platformNo; - } - - /** - * @param platformNo 台数 to set - */ - public void setPlatformNo(String platformNo){ - this.platformNo = platformNo; - } - - /** - * @return 底盘价格构成 - */ - public String getChassisPriceComposition(){ - return chassisPriceComposition; - } - - /** - * @param chassisPriceComposition 底盘价格构成 to set - */ - public void setChassisPriceComposition(String chassisPriceComposition){ - this.chassisPriceComposition = chassisPriceComposition; - } - - /** - * @return 底盘结算价格 - */ - public String getChassisSettlementPrice(){ - return chassisSettlementPrice; - } - - /** - * @param chassisSettlementPrice 底盘结算价格 to set - */ - public void setChassisSettlementPrice(String chassisSettlementPrice){ - this.chassisSettlementPrice = chassisSettlementPrice; - } - - /** - * @return 上装价格 - */ - public String getCoatPrice(){ - return coatPrice; - } - - /** - * @param coatPrice 上装价格 to set - */ - public void setCoatPrice(String coatPrice){ - this.coatPrice = coatPrice; - } - - /** - * @return 修订差价 - */ - public String getRevisedPriceDifference(){ - return revisedPriceDifference; - } - - /** - * @param revisedPriceDifference 修订差价 to set - */ - public void setRevisedPriceDifference(String revisedPriceDifference){ - this.revisedPriceDifference = revisedPriceDifference; - } - - /** - * @return 入库价格 - */ - public String getTreasuryPrice(){ - return treasuryPrice; - } - - /** - * @param treasuryPrice 入库价格 to set - */ - public void setTreasuryPrice(String treasuryPrice){ - this.treasuryPrice = treasuryPrice; - } - - /** - * @return 运费 - */ - public String getFreight(){ - return freight; - } - - /** - * @param freight 运费 to set - */ - public void setFreight(String freight){ - this.freight = freight; - } - - /** - * @return 销售指导价 - */ - public String getSalesGuidePrice(){ - return salesGuidePrice; - } - - /** - * @param salesGuidePrice 销售指导价 to set - */ - public void setSalesGuidePrice(String salesGuidePrice){ - this.salesGuidePrice = salesGuidePrice; - } - - /** - * @return 收到发票日期 - */ - public String getReceivedInvoiceDate(){ - return receivedInvoiceDate; - } - - /** - * @param receivedInvoiceDate 收到发票日期 to set - */ - public void setReceivedInvoiceDate(String receivedInvoiceDate){ - this.receivedInvoiceDate = receivedInvoiceDate; - } - - /** - * @return 发票金额 - */ - public String getInvoiceAmount(){ - return invoiceAmount; - } - - /** - * @param invoiceAmount 发票金额 to set - */ - public void setInvoiceAmount(String invoiceAmount){ - this.invoiceAmount = invoiceAmount; - } - - /** - * @return 预计上线日期 - */ - public String getExpectLaunchDate(){ - return expectLaunchDate; - } - - /** - * @param expectLaunchDate 预计上线日期 to set - */ - public void setExpectLaunchDate(String expectLaunchDate){ - this.expectLaunchDate = expectLaunchDate; - } - - /** - * @return 上线日期 - */ - public String getLaunchDate(){ - return launchDate; - } - - /** - * @param launchDate 上线日期 to set - */ - public void setLaunchDate(String launchDate){ - this.launchDate = launchDate; - } - - /** - * @return 下线日期 - */ - public String getOfflineDate(){ - return offlineDate; - } - - /** - * @param offlineDate 下线日期 to set - */ - public void setOfflineDate(String offlineDate){ - this.offlineDate = offlineDate; - } - - /** - * @return 订单状态 - */ - public String getOrderStatus(){ - return orderStatus; - } - - /** - * @param orderStatus 订单状态 to set - */ - public void setOrderStatus(String orderStatus){ - this.orderStatus = orderStatus; - } + @ApiModelProperty("车型") + private String modelName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java index 924ab0a6ad..c5ea45adaa 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java @@ -29,6 +29,7 @@ package com.yxt.anrui.base.api.busvehicleorder; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * Project: anrui-base(车型信息)
@@ -44,6 +45,7 @@ import io.swagger.annotations.ApiModelProperty; * @since 1.0 */ @ApiModel(value = "车辆采购订单 视图数据对象", description = "车辆采购订单 视图数据对象") +@Data public class BusVehicleOrderVo implements Vo { @@ -68,18 +70,9 @@ public class BusVehicleOrderVo implements Vo { @ApiModelProperty("台数") private String platformNo; // 台数 - @ApiModelProperty("底盘价格构成") - private String chassisPriceComposition; // 底盘价格构成 - - @ApiModelProperty("底盘结算价格") - private String chassisSettlementPrice; // 底盘结算价格 - @ApiModelProperty("上装价格") private String coatPrice; // 上装价格 - @ApiModelProperty("修订差价") - private String revisedPriceDifference; // 修订差价 - @ApiModelProperty("入库价格") private String treasuryPrice; // 入库价格 @@ -89,302 +82,18 @@ public class BusVehicleOrderVo implements Vo { @ApiModelProperty("销售指导价") private String salesGuidePrice; // 销售指导价 - @ApiModelProperty("收到发票日期") - private String receivedInvoiceDate; // 收到发票日期 - - @ApiModelProperty("发票金额") - private String invoiceAmount; // 发票金额 - @ApiModelProperty("预计上线日期") private String expectLaunchDate; // 预计上线日期 - - @ApiModelProperty("上线日期") + + @ApiModelProperty("上线日期") private String launchDate; // 上线日期 - - @ApiModelProperty("下线日期") + + @ApiModelProperty("下线日期") private String offlineDate; // 下线日期 + + @ApiModelProperty("排产申请编号") + private String applicationCode; @ApiModelProperty("订单状态") private String orderStatus; // 订单状态 - - - /** - * @return 创建组织sid - */ - public String getCreateOrgSid(){ - return createOrgSid; - } - - /** - * @param createOrgSid 创建组织sid to set - */ - public void setCreateOrgSid(String createOrgSid){ - this.createOrgSid = createOrgSid; - } - - /** - * @return 订单编号 - */ - public String getOrderNo(){ - return orderNo; - } - - /** - * @param orderNo 订单编号 to set - */ - public void setOrderNo(String orderNo){ - this.orderNo = orderNo; - } - - /** - * @return 订单类型 - */ - public String getOrderType(){ - return orderType; - } - - /** - * @param orderType 订单类型 to set - */ - public void setOrderType(String orderType){ - this.orderType = orderType; - } - - /** - * @return 订单日期 - */ - public String getOrderDate(){ - return orderDate; - } - - /** - * @param orderDate 订单日期 to set - */ - public void setOrderDate(String orderDate){ - this.orderDate = orderDate; - } - - /** - * @return 排产/采购申请sid - */ - public String getPurchaseRequisitionSid(){ - return purchaseRequisitionSid; - } - - /** - * @param purchaseRequisitionSid 排产/采购申请sid to set - */ - public void setPurchaseRequisitionSid(String purchaseRequisitionSid){ - this.purchaseRequisitionSid = purchaseRequisitionSid; - } - - /** - * @return 排产/采购申请中车型表sid - */ - public String getPurchaseApplyMediumModelSid(){ - return purchaseApplyMediumModelSid; - } - - /** - * @param purchaseApplyMediumModelSid 排产/采购申请中车型表sid to set - */ - public void setPurchaseApplyMediumModelSid(String purchaseApplyMediumModelSid){ - this.purchaseApplyMediumModelSid = purchaseApplyMediumModelSid; - } - - /** - * @return 台数 - */ - public String getPlatformNo(){ - return platformNo; - } - - /** - * @param platformNo 台数 to set - */ - public void setPlatformNo(String platformNo){ - this.platformNo = platformNo; - } - - /** - * @return 底盘价格构成 - */ - public String getChassisPriceComposition(){ - return chassisPriceComposition; - } - - /** - * @param chassisPriceComposition 底盘价格构成 to set - */ - public void setChassisPriceComposition(String chassisPriceComposition){ - this.chassisPriceComposition = chassisPriceComposition; - } - - /** - * @return 底盘结算价格 - */ - public String getChassisSettlementPrice(){ - return chassisSettlementPrice; - } - - /** - * @param chassisSettlementPrice 底盘结算价格 to set - */ - public void setChassisSettlementPrice(String chassisSettlementPrice){ - this.chassisSettlementPrice = chassisSettlementPrice; - } - - /** - * @return 上装价格 - */ - public String getCoatPrice(){ - return coatPrice; - } - - /** - * @param coatPrice 上装价格 to set - */ - public void setCoatPrice(String coatPrice){ - this.coatPrice = coatPrice; - } - - /** - * @return 修订差价 - */ - public String getRevisedPriceDifference(){ - return revisedPriceDifference; - } - - /** - * @param revisedPriceDifference 修订差价 to set - */ - public void setRevisedPriceDifference(String revisedPriceDifference){ - this.revisedPriceDifference = revisedPriceDifference; - } - - /** - * @return 入库价格 - */ - public String getTreasuryPrice(){ - return treasuryPrice; - } - - /** - * @param treasuryPrice 入库价格 to set - */ - public void setTreasuryPrice(String treasuryPrice){ - this.treasuryPrice = treasuryPrice; - } - - /** - * @return 运费 - */ - public String getFreight(){ - return freight; - } - - /** - * @param freight 运费 to set - */ - public void setFreight(String freight){ - this.freight = freight; - } - - /** - * @return 销售指导价 - */ - public String getSalesGuidePrice(){ - return salesGuidePrice; - } - - /** - * @param salesGuidePrice 销售指导价 to set - */ - public void setSalesGuidePrice(String salesGuidePrice){ - this.salesGuidePrice = salesGuidePrice; - } - - /** - * @return 收到发票日期 - */ - public String getReceivedInvoiceDate(){ - return receivedInvoiceDate; - } - - /** - * @param receivedInvoiceDate 收到发票日期 to set - */ - public void setReceivedInvoiceDate(String receivedInvoiceDate){ - this.receivedInvoiceDate = receivedInvoiceDate; - } - - /** - * @return 发票金额 - */ - public String getInvoiceAmount(){ - return invoiceAmount; - } - - /** - * @param invoiceAmount 发票金额 to set - */ - public void setInvoiceAmount(String invoiceAmount){ - this.invoiceAmount = invoiceAmount; - } - - /** - * @return 预计上线日期 - */ - public String getExpectLaunchDate(){ - return expectLaunchDate; - } - - /** - * @param expectLaunchDate 预计上线日期 to set - */ - public void setExpectLaunchDate(String expectLaunchDate){ - this.expectLaunchDate = expectLaunchDate; - } - - /** - * @return 上线日期 - */ - public String getLaunchDate(){ - return launchDate; - } - - /** - * @param launchDate 上线日期 to set - */ - public void setLaunchDate(String launchDate){ - this.launchDate = launchDate; - } - - /** - * @return 下线日期 - */ - public String getOfflineDate(){ - return offlineDate; - } - - /** - * @param offlineDate 下线日期 to set - */ - public void setOfflineDate(String offlineDate){ - this.offlineDate = offlineDate; - } - - /** - * @return 订单状态 - */ - public String getOrderStatus(){ - return orderStatus; - } - - /** - * @param orderStatus 订单状态 to set - */ - public void setOrderStatus(String orderStatus){ - this.orderStatus = orderStatus; - } } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java new file mode 100644 index 0000000000..66a48f44e9 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.base.api.busvehicleorder; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuguohui + * @version 1.0 + * @description + * @date 2022/04/01 + */ +@ApiModel("采购订单列表") +@Data +public class VehicleOrderListVo implements Vo { + + @ApiModelProperty("订单状态") + private String orderStatus; + + @ApiModelProperty("订单编号") + private String orderNo; + + @ApiModelProperty("订单日期") + private String orderDate; + + @ApiModelProperty("订单类型") + private String orderType; + + @ApiModelProperty("车型") + private String modelName; + + @ApiModelProperty("台数") + private String platformNo; + + @ApiModelProperty("预计上线日期") + private String expectLaunchDate; + + @ApiModelProperty("上线日期") + private String launchDate; + + @ApiModelProperty("下线日期") + private String offlineDate; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java index c8aea4f268..689b2b4624 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java @@ -59,7 +59,7 @@ public interface BusVehicleOrderMapper extends BaseMapper { //@Update("update bus_vehicle_order set name=#{msg} where id=#{id}") //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @@ -103,4 +103,6 @@ public interface BusVehicleOrderMapper extends BaseMapper { * @return */ AppCurrentCarDetailVo getAppProductionSchedulingDetailConfigVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid); + + BusVehicleOrderVo selectBySid(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml index 0583bd3e1d..d9e5bad873 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml @@ -3,9 +3,12 @@ - + SELECT bvo.*,bvm.modelName + FROM bus_vehicle_order bvo + LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid=bvm.sid + LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid + LEFT JOIN bus_vehicle_apply bva ON bvad.applySid=bva.sid ${ew.sqlSegment} @@ -161,4 +164,15 @@ WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java index 791cc3469a..4b33778302 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java @@ -28,12 +28,14 @@ package com.yxt.anrui.base.biz.busvehicleorder; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailCongfigVo; import com.yxt.anrui.base.api.busvehicleorder.*; +import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -59,47 +61,35 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign { private BusVehicleOrderService busVehicleOrderService; @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - PagerVo pv = busVehicleOrderService.listPageVo(pq); + PagerVo pv = busVehicleOrderService.listPageVo(pq); return rb.success().setData(pv); } @Override - @ApiOperation("新增保存") - @PostMapping("/save") - public ResultBean save(@RequestBody BusVehicleOrderDto dto) { - ResultBean rb = ResultBean.fireFail(); - busVehicleOrderService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("修改保存") - @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody BusVehicleOrderDto dto, @PathVariable("sid") String sid) { - ResultBean rb = ResultBean.fireFail(); - busVehicleOrderService.updateBySid(dto.toMap(), sid); - return rb.success(); + public ResultBean saveOrUpdateVehicleOrder(BusVehicleOrderDto dto) { + if (StringUtils.isNotBlank(dto.getLaunchDate()) && StringUtils.isNotBlank(dto.getOfflineDate())) { + long launchTime = DateUtils.dateStrConvertDate(dto.getLaunchDate(), "yyyy-MM-dd").getTime(); + long OfflineTime = DateUtils.dateStrConvertDate(dto.getOfflineDate(), "yyyy-MM-dd").getTime(); + if (launchTime > OfflineTime) { + return new ResultBean().setMsg("下线日期不能小于上线日期"); + } + } + return busVehicleOrderService.saveOrUpdateVehicleOrder(dto); } @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids) { + public ResultBean delBySids(String[] sids) { ResultBean rb = ResultBean.fireFail(); busVehicleOrderService.delBySids(sids); return rb.success(); } @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid) { + public ResultBean fetchBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - BusVehicleOrder vo = busVehicleOrderService.fetchBySid(sid); + BusVehicleOrderVo vo = busVehicleOrderService.selectBySid(sid); return rb.success().setData(vo); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index 3bf0b71cab..c32d309bd5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -38,8 +38,10 @@ import com.yxt.anrui.base.api.busvehicleorder.*; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -47,6 +49,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.UUID; /** @@ -95,95 +98,38 @@ public class BusVehicleOrderService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - - if (StringUtils.isNotBlank(query.getCreateOrgSid())) { - qw.eq("createOrgSid", query.getCreateOrgSid()); - } - if (StringUtils.isNotBlank(query.getOrderNo())) { - qw.eq("orderNo", query.getOrderNo()); + qw.like("bvo.orderNo", query.getOrderNo()); } if (StringUtils.isNotBlank(query.getOrderType())) { - qw.eq("orderType", query.getOrderType()); - } - - if (StringUtils.isNotBlank(query.getOrderDate())) { - qw.eq("orderDate", query.getOrderDate()); - } - - if (StringUtils.isNotBlank(query.getPurchaseRequisitionSid())) { - qw.eq("purchaseRequisitionSid", query.getPurchaseRequisitionSid()); - } - - if (StringUtils.isNotBlank(query.getPurchaseApplyMediumModelSid())) { - qw.eq("purchaseApplyMediumModelSid", query.getPurchaseApplyMediumModelSid()); - } - - if (StringUtils.isNotBlank(query.getPlatformNo())) { - qw.eq("platformNo", query.getPlatformNo()); - } - - if (StringUtils.isNotBlank(query.getChassisPriceComposition())) { - qw.eq("chassisPriceComposition", query.getChassisPriceComposition()); - } - - if (StringUtils.isNotBlank(query.getChassisSettlementPrice())) { - qw.eq("chassisSettlementPrice", query.getChassisSettlementPrice()); + qw.like("bvo.orderType", query.getOrderType()); } - if (StringUtils.isNotBlank(query.getCoatPrice())) { - qw.eq("coatPrice", query.getCoatPrice()); - } - - if (StringUtils.isNotBlank(query.getRevisedPriceDifference())) { - qw.eq("revisedPriceDifference", query.getRevisedPriceDifference()); - } - - if (StringUtils.isNotBlank(query.getTreasuryPrice())) { - qw.eq("treasuryPrice", query.getTreasuryPrice()); - } - - if (StringUtils.isNotBlank(query.getFreight())) { - qw.eq("freight", query.getFreight()); - } - - if (StringUtils.isNotBlank(query.getSalesGuidePrice())) { - qw.eq("salesGuidePrice", query.getSalesGuidePrice()); - } - - if (StringUtils.isNotBlank(query.getReceivedInvoiceDate())) { - qw.eq("receivedInvoiceDate", query.getReceivedInvoiceDate()); - } - - if (StringUtils.isNotBlank(query.getInvoiceAmount())) { - qw.eq("invoiceAmount", query.getInvoiceAmount()); + if (StringUtils.isNotBlank(query.getOrderStatus())) { + qw.like("bvo.orderStatus", query.getOrderStatus()); } - if (StringUtils.isNotBlank(query.getExpectLaunchDate())) { - qw.eq("expectLaunchDate", query.getExpectLaunchDate()); + if (StringUtils.isNotBlank(query.getModelName())) { + qw.like("bvm.modelName", query.getModelName()); } - if (StringUtils.isNotBlank(query.getLaunchDate())) { - qw.eq("launchDate", query.getLaunchDate()); + if (StringUtils.isNotBlank(query.getStartDate())) { + qw.gt("bva.applicationDate", query.getStartDate()); } - if (StringUtils.isNotBlank(query.getOfflineDate())) { - qw.eq("offlineDate", query.getOfflineDate()); - } - - if (StringUtils.isNotBlank(query.getOrderStatus())) { - qw.eq("orderStatus", query.getOrderStatus()); + if (StringUtils.isNotBlank(query.getEndDate())) { + qw.lt("bva.applicationDate", query.getEndDate()); } return qw; } - public PagerVo listPageVo(PagerQuery pq) { + public PagerVo listPageVo(PagerQuery pq) { BusVehicleOrderQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -196,10 +142,33 @@ public class BusVehicleOrderService extends MybatisBaseService