From b66b64a36538e65d672b8b7c3d918c51fb63620a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 27 Apr 2022 18:43:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=86=99=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrderFeign.java | 2 +- .../api/bussalesorder/BusSalesOrderQuery.java | 49 +------ .../api/bussalesorder/BusSalesOrderVo.java | 66 +++------- .../BusSalesOrderModel.java | 2 + .../BusSalesOrderModelDetailsVo.java | 42 +++--- .../BusSalesOrderModelDto.java | 25 ++-- .../BusSalesOrderModelQuery.java | 1 + .../BusSalesOrderModelVo.java | 3 +- .../bussalesorder/BusSalesOrderMapper.java | 20 +-- .../biz/bussalesorder/BusSalesOrderMapper.xml | 34 +++-- .../biz/bussalesorder/BusSalesOrderRest.java | 77 ++++++----- .../bussalesorder/BusSalesOrderService.java | 122 ++++++++++-------- doc/databases/bus-center_tables.sql | 1 + 13 files changed, 206 insertions(+), 238 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index fa7b75c72f..86ecf81623 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -54,7 +54,7 @@ import org.springframework.web.bind.annotation.*; fallback = BusSalesOrderFeignFallback.class) public interface BusSalesOrderFeign { - @ApiOperation("根据条件分页查询数据的列表") + @ApiOperation("销售订单分页列表") @PostMapping("/listPage") @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderQuery.java index a5f2defb17..756f0a5601 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderQuery.java @@ -26,14 +26,11 @@ package com.yxt.anrui.buscenter.api.bussalesorder; -import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderQuery.java
@@ -52,51 +49,19 @@ import java.util.Date; public class BusSalesOrderQuery implements Query { private static final long serialVersionUID = 1335611924216892243L; - @ApiModelProperty("销售部门sid") - private String orgSid; + @ApiModelProperty("销售部门") private String orgName; @ApiModelProperty("客户名称") private String customerName; - @ApiModelProperty("客户sid") - private String customerSid; - @ApiModelProperty("销售专员") - private String staffName; - @ApiModelProperty("销售专员sid") - private String staffSid; - @ApiModelProperty("客户联系电话") - private String mobile; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("制单日期") - private Date createDateStart; - private Date createDateEnd; - @ApiModelProperty("开票类型key") - private String billingTypeKey; - @ApiModelProperty("开票类型value") - private String billingType; + private String createDateStart; + private String createDateEnd; @ApiModelProperty("付款方式key") private String payTypeKey; - @ApiModelProperty("付款方式value") - private String payType; - @ApiModelProperty("挂靠公司sid") - private String affiliatedCompanySid; - @ApiModelProperty("挂靠公司名称") - private String affiliatedCompany; - @ApiModelProperty("公司是否入保") - private Integer isInsurance; - @ApiModelProperty("补充说明") - private String notes; - @ApiModelProperty("是否包含上装") - private Integer isTop; - @ApiModelProperty("节点状态") - private String nodeState; - @ApiModelProperty("流程定义id") - private String procDefId; - @ApiModelProperty("环节定义id") - private String nodeId; - @ApiModelProperty("流程实例id") - private String procInstId; - @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产") - private Integer type; + @ApiModelProperty(value = "车型名称") + private String modelName; + @ApiModelProperty("销售专员sid") + private String staffSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java index 13e883ddfd..8d0209e2d2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java @@ -26,14 +26,13 @@ package com.yxt.anrui.buscenter.api.bussalesorder; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderVo.java
@@ -53,52 +52,29 @@ public class BusSalesOrderVo implements Vo { private static final long serialVersionUID = -5570433499942792774L; private String sid; - - @ApiModelProperty("销售部门sid") - private String orgSid; - @ApiModelProperty("销售部门") - private String orgName; + @ApiModelProperty("节点状态") + private String nodeState; + @ApiModelProperty(value = "订单编号") + private String billNo; + @ApiModelProperty("制单日期") + private String createDate; @ApiModelProperty("客户名称") private String customerName; - @ApiModelProperty("客户sid") - private String customerSid; - @ApiModelProperty("销售专员") - private String staffName; - @ApiModelProperty("销售专员sid") - private String staffSid; @ApiModelProperty("客户联系电话") private String mobile; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiModelProperty("制单日期") - private Date createDateStart; - private Date createDateEnd; - @ApiModelProperty("开票类型key") - private String billingTypeKey; - @ApiModelProperty("开票类型value") - private String billingType; - @ApiModelProperty("付款方式key") - private String payTypeKey; - @ApiModelProperty("付款方式value") + @ApiModelProperty(value = "品牌") + private String brandName; + @ApiModelProperty(value = "单台成交价") + @JsonSerialize(using = ToStringSerializer.class) + private String singleFinalPrice; + @ApiModelProperty(value = "数量") + private int quantity; + @ApiModelProperty(value = "付款方式") private String payType; - @ApiModelProperty("挂靠公司sid") - private String affiliatedCompanySid; - @ApiModelProperty("挂靠公司名称") - private String affiliatedCompany; - @ApiModelProperty("公司是否入保") - private Integer isInsurance; - @ApiModelProperty("补充说明") - private String notes; - @ApiModelProperty("是否包含上装") - private Integer isTop; - @ApiModelProperty("节点状态") - private String nodeState; - @ApiModelProperty("流程定义id") - private String procDefId; - @ApiModelProperty("环节定义id") - private String nodeId; - @ApiModelProperty("流程实例id") - private String procInstId; - @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产") - private Integer type; + @ApiModelProperty(value = "订金") + @JsonSerialize(using = ToStringSerializer.class) + private String depositAll; + @ApiModelProperty(value = "是否保险") + private String isInsurance; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java index 8b0dbf7a59..532ab60281 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java @@ -52,6 +52,8 @@ public class BusSalesOrderModel extends BaseEntity { @ApiModelProperty("销售订单sid") private String salesOrderSid; + @ApiModelProperty(value = "品牌") + private String brandName; @ApiModelProperty("车型sid") private String modelSid; @ApiModelProperty("配置sid") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java index 5228a21e26..f68b7c1bff 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java @@ -50,27 +50,27 @@ import java.math.BigDecimal; @ApiModel(value = "销售订单-主车车型 视图数据详情", description = "销售订单-主车车型 视图数据详情") public class BusSalesOrderModelDetailsVo implements Vo { - private String sid; // sid + private String sid; - @ApiModelProperty("销售订单sid") - private String salesOrderSid; // 销售订单sid - @ApiModelProperty("车型sid") - private String modelSid; // 车型sid - @ApiModelProperty("配置sid") - private String modelConfigSid; // 配置sid - @ApiModelProperty("车型名称") - private String modelName; // 车型名称 - @ApiModelProperty("车型配置名称") - private String modelConfig; // 车型配置名称 - @ApiModelProperty("常用配置") - private String config; // 常用配置 - @ApiModelProperty("更多配置") - private String moreConfig; // 更多配置 - @ApiModelProperty("特殊配置说明") - private String specialConfig; // 特殊配置说明 - @ApiModelProperty("单台指导价") - private BigDecimal guildPrice; // 单台指导价 - @ApiModelProperty("单台成交价") - private BigDecimal finalPrice; // 单台成交价 + @ApiModelProperty("销售订单sid") + private String salesOrderSid; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String modelConfigSid; + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("车型配置名称") + private String modelConfig; + @ApiModelProperty("常用配置") + private String config; + @ApiModelProperty("更多配置") + private String moreConfig; + @ApiModelProperty("特殊配置说明") + private String specialConfig; + @ApiModelProperty("单台指导价") + private BigDecimal guildPrice; + @ApiModelProperty("单台成交价") + private BigDecimal finalPrice; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java index 3455b17c9b..5c33892683 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java @@ -50,27 +50,30 @@ import java.math.BigDecimal; @ApiModel(value = "销售订单-主车车型 数据传输对象", description = "销售订单-主车车型 数据传输对象") public class BusSalesOrderModelDto implements Dto { - private String sid; // sid + private static final long serialVersionUID = -216156078782065154L; + private String sid; - @ApiModelProperty("销售订单sid") + @ApiModelProperty("销售订单sid") private String salesOrderSid; - @ApiModelProperty("车型sid") + @ApiModelProperty(value = "品牌") + private String brandName; + @ApiModelProperty("车型sid") private String modelSid; - @ApiModelProperty("配置sid") + @ApiModelProperty("配置sid") private String modelConfigSid; - @ApiModelProperty("车型名称") + @ApiModelProperty("车型名称") private String modelName; - @ApiModelProperty("车型配置名称") + @ApiModelProperty("车型配置名称") private String modelConfig; - @ApiModelProperty("常用配置") + @ApiModelProperty("常用配置") private String config; - @ApiModelProperty("更多配置") + @ApiModelProperty("更多配置") private String moreConfig; - @ApiModelProperty("特殊配置说明") + @ApiModelProperty("特殊配置说明") private String specialConfig; - @ApiModelProperty("单台指导价") + @ApiModelProperty("单台指导价") private BigDecimal guildPrice; - @ApiModelProperty("单台成交价") + @ApiModelProperty("单台成交价") private BigDecimal finalPrice; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelQuery.java index 12bf183a19..90c492a337 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelQuery.java @@ -50,6 +50,7 @@ import java.math.BigDecimal; @ApiModel(value = "销售订单-主车车型 查询条件", description = "销售订单-主车车型 查询条件") public class BusSalesOrderModelQuery implements Query { + private static final long serialVersionUID = 4555157406828024693L; @ApiModelProperty("销售订单sid") private String salesOrderSid; @ApiModelProperty("车型sid") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelVo.java index 4026cf4349..fe4bcc51ab 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelVo.java @@ -50,7 +50,8 @@ import java.math.BigDecimal; @ApiModel(value = "销售订单-主车车型 视图数据对象", description = "销售订单-主车车型 视图数据对象") public class BusSalesOrderModelVo implements Vo { - private String sid; // sid + private static final long serialVersionUID = -5356017948754536344L; + private String sid; @ApiModelProperty("销售订单sid") private String salesOrderSid; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index d8569ed912..330322a90d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -26,16 +26,13 @@ package com.yxt.anrui.buscenter.biz.bussalesorder; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo; - -import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * Project: anrui-buscenter(业务管理)
@@ -53,13 +50,6 @@ import java.util.List; @Mapper public interface BusSalesOrderMapper extends BaseMapper { - //@Update("update bus_sales_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); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_sales_order") - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 0df097eeb7..ca91f4dbb7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -1,13 +1,29 @@ - - - - - + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 1052ef9c23..dc72ead376 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.bussalesorder; +import com.yxt.anrui.buscenter.api.bussalesorder.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -33,14 +34,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderQuery; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDto; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderFeignFallback.java
@@ -59,42 +52,46 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; @RequestMapping("v1/bussalesorder") public class BusSalesOrderRest implements BusSalesOrderFeign { - @Autowired - private BusSalesOrderService busSalesOrderService; + @Autowired + private BusSalesOrderService busSalesOrderService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = busSalesOrderService.listPageVo(pq); - return rb.success().setData(pv); - } + /** + * 分页列表 + * + * @param pq 查询条件 + * @return + */ + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busSalesOrderService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BusSalesOrderDto dto){ - ResultBean rb = ResultBean.fireFail(); - busSalesOrderService.saveOrUpdateDto(dto); - return rb.success(); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BusSalesOrderDto dto) { + ResultBean rb = ResultBean.fireFail(); + busSalesOrderService.saveOrUpdateDto(dto); + return rb.success(); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - busSalesOrderService.delBySids(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + busSalesOrderService.delBySids(sids); + return rb.success(); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BusSalesOrderDetailsVo vo = busSalesOrderService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderDetailsVo vo = busSalesOrderService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } } 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 c08c04ebed..bedb4d3707 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 @@ -28,23 +28,14 @@ package com.yxt.anrui.buscenter.biz.bussalesorder; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.commons.lang3.StringUtils; +import com.yxt.anrui.buscenter.api.bussalesorder.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderQuery; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDto; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; - +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import java.util.List; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderService.java
@@ -60,51 +51,76 @@ import java.util.List; */ @Service public class BusSalesOrderService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(BusSalesOrderQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - BusSalesOrderQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(BusSalesOrderDto dto){ + private QueryWrapper createQueryWrapper(BusSalesOrderQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + //销售部门 + if (StringUtils.isNotBlank(query.getOrgName())) { + qw.like("bo.orgName", query.getOrgName()); + } + //客户名称 + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("bo.customerName", query.getCustomerName()); + } + //制单日期 + if (StringUtils.isNotBlank(query.getCreateDateStart()) && StringUtils.isNotBlank(query.getCreateDateEnd())) { + qw.between("bo.createDate", query.getCreateDateStart(), query.getCreateDateEnd()); + } + //付款方式 + if (StringUtils.isNotBlank(query.getPayTypeKey())) { + qw.eq("bo.payTypeKey", query.getPayTypeKey()); + } + //车型名称 + if (StringUtils.isNotBlank(query.getModelName())) { + qw.like("bm.modelName", query.getModelName()); + } + qw.eq("bo.staffSid", query.getStaffSid()); + qw.orderByDesc("bo.id"); + + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusSalesOrderQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(BusSalesOrderDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(BusSalesOrderDto dto){ - BusSalesOrder entity = new BusSalesOrder(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(BusSalesOrderDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(BusSalesOrderDto dto) { + BusSalesOrder entity = new BusSalesOrder(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(BusSalesOrderDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - BusSalesOrder entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BusSalesOrderDetailsVo fetchDetailsVoBySid(String sid){ - BusSalesOrder entity = fetchBySid(sid); - BusSalesOrderDetailsVo vo = new BusSalesOrderDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + BusSalesOrder entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BusSalesOrderDetailsVo fetchDetailsVoBySid(String sid) { + BusSalesOrder entity = fetchBySid(sid); + BusSalesOrderDetailsVo vo = new BusSalesOrderDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } } \ No newline at end of file diff --git a/doc/databases/bus-center_tables.sql b/doc/databases/bus-center_tables.sql index db55e85bf9..5998162959 100644 --- a/doc/databases/bus-center_tables.sql +++ b/doc/databases/bus-center_tables.sql @@ -331,6 +331,7 @@ CREATE TABLE `bus_sales_order_model` `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', `salesOrderSid` varchar(64) DEFAULT NULL COMMENT '销售订单sid', + `brandName` varchar(64) DEFAULT NULL COMMENT '品牌', `modelSid` VARCHAR(64) DEFAULT NULL COMMENT '车型sid', `modelConfigSid` VARCHAR(64) DEFAULT NULL COMMENT '配置sid', `modelName` varchar(200) DEFAULT NULL COMMENT '车型名称',