From 3cd67f8d10df9df418e06f5c71c2b39513d6ebf3 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sun, 1 May 2022 22:44:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusVehicleApplyDetailFeign.java | 6 ++- .../BusVehicleApplyDetailFeignFallback.java | 7 ++- .../BusVehicleApplyListQuery.java | 24 +++++++++ .../BusVehicleApplyListVo.java | 21 ++++++++ .../BusVehicleApplyDetailMapper.java | 11 ++++ .../BusVehicleApplyDetailMapper.xml | 7 +++ .../BusVehicleApplyDetailRest.java | 9 +++- .../BusVehicleApplyDetailService.java | 52 ++++++++++++++----- .../busvehicleorder/BusVehicleOrderRest.java | 11 +++- .../BusDeliveredApplyDetailsVo.java | 2 +- 10 files changed, 129 insertions(+), 21 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java index 27606c0960..fbcf5e78d3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java @@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import java.util.List; - /** * Project: anrui-scm(进销存)
* File: BusVehicleApplyDetailFeign.java
@@ -57,4 +55,8 @@ public interface BusVehicleApplyDetailFeign { @ApiOperation("查询车型sid") @GetMapping("/selModel/{sid}") public ResultBean selModel(@PathVariable("sid") String sid); + + @ApiOperation("销售订单-采购订单分页列表") + @PostMapping("/applyPage") + ResultBean> applyPage(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java index b07beae8d4..943b87dff5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java @@ -5,8 +5,6 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: anrui-scm(进销存)
* File: BusVehicleApplyDetailFeignFallback.java
@@ -53,4 +51,9 @@ public class BusVehicleApplyDetailFeignFallback implements BusVehicleApplyDetail public ResultBean selModel(String sid) { return null; } + + @Override + public ResultBean> applyPage(PagerQuery pagerQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListQuery.java new file mode 100644 index 0000000000..b95b1ca2b3 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.base.api.busvehicleapplydetail; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/5/1 14:17 + * @Description + */ +@Data +public class BusVehicleApplyListQuery implements Query { + private static final long serialVersionUID = 1760135747503673918L; + + @ApiModelProperty(value = "车型sid") + private String modelSid; + @ApiModelProperty(value = "配置sid") + private String configSid; + @ApiModelProperty(value = "已选") + private List sidList; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListVo.java new file mode 100644 index 0000000000..d4bfa6aa49 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.base.api.busvehicleapplydetail; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/1 14:10 + * @Description + */ +@Data +public class BusVehicleApplyListVo implements Vo { + private static final long serialVersionUID = -3443220506000955719L; + @ApiModelProperty("采购订单编号") + private String linkNo; + @ApiModelProperty("采购订单日期") + private String linkText; + @ApiModelProperty("采购订单sid") + private String linkSid; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java index cb245e2bfb..c63704b1a0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java @@ -1,11 +1,14 @@ package com.yxt.anrui.base.biz.busvehicleapplydetail; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; +import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyListVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -46,4 +49,12 @@ public interface BusVehicleApplyDetailMapper extends BaseMapper fetchByApplySid(String sid); + + /** + * 销售订单-采购订单分页列表 + * @param page 分页 + * @param qw 查询条件 + * @return + */ + IPage applyPage(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml index 1fc0a35ad1..e5f0c0d6f9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml @@ -24,4 +24,11 @@ from bus_vehicle_apply_detail where vehicleSid = #{sid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java index 0a1e97e66b..41da585a5f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java @@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * Project: anrui-scm(进销存)
* File: BusVehicleApplyDetailFeignFallback.java
@@ -81,5 +79,12 @@ public class BusVehicleApplyDetailRest implements BusVehicleApplyDetailFeign { return new ResultBean().success().setData(vo); } + @Override + public ResultBean> applyPage(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = busVehicleApplyDetailService.applyPage(pagerQuery); + return rb.success().setData(pv); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java index 89b0274683..72f67604d0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java @@ -3,13 +3,8 @@ package com.yxt.anrui.base.biz.busvehicleapplydetail; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail; -import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto; -import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailQuery; -import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; -import com.yxt.anrui.base.api.busvehicleorder.AppCommonlyUsedModelsByPageListQuery; -import com.yxt.anrui.base.api.busvehicleorder.AppProductionSchedulingByPageQuery; -import com.yxt.anrui.base.api.busvehicleorder.AppProductionSchedulingByPageVo; +import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; +import com.yxt.anrui.base.api.busvehicleapplydetail.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -81,7 +76,7 @@ public class BusVehicleApplyDetailService extends MybatisBaseService listPageVo(PagerQuery pq) { BusVehicleApplyDetailQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); @@ -90,22 +85,22 @@ public class BusVehicleApplyDetailService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - + public List listAllVo(BusVehicleApplyDetailQuery query) { QueryWrapper qw = createQueryWrapper(query); return baseMapper.selectListAllVo(qw); } - + public List listVo() { return baseMapper.selectListVo(); } - + public void saveOrUpdateDto(BusVehicleApplyDetailDto dto){ BusVehicleApplyDetail entity = new BusVehicleApplyDetail(); dto.fillEntity(entity); this.saveOrUpdate(entity); } - + public BusVehicleApplyDetailVo fetchByIdVo(String id){ BusVehicleApplyDetail entity = this.fetchById(id); BusVehicleApplyDetailVo vo = new BusVehicleApplyDetailVo(); @@ -124,4 +119,37 @@ public class BusVehicleApplyDetailService extends MybatisBaseService applyPage(PagerQuery pagerQuery) { + BusVehicleApplyListQuery query = pagerQuery.getParams(); + QueryWrapper qw = applyPageWrapper(query); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.applyPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + /** + * 销售订单-采购订单分页列表构造条件 + * @param query + * @return + */ + private QueryWrapper applyPageWrapper(BusVehicleApplyListQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + //车型sid + qw.eq("bd.modelSid", query.getModelSid()); + //配置sid + qw.eq("bd.modelConfigSid", query.getConfigSid()); + if (query.getSidList().size() > 0) { + qw.notIn("bo.sid", query.getSidList()); + } + } + return qw; + } } \ 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 a5a055ba4a..d7ac2f469b 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,16 +28,18 @@ package com.yxt.anrui.base.biz.busvehicleorder; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo; import com.yxt.anrui.base.api.busvehicleorder.*; +import com.yxt.anrui.base.api.busvehicleorder.pc.PcBaseOrderQuery; +import com.yxt.anrui.base.api.busvehicleorder.pc.PcBaseOrderVo; 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.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Project: anrui-base(车型信息)
@@ -126,6 +128,11 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign { return rb.success().setData(vo); } + @Override + public ResultBean> selectVo(PagerQuery pcBaseVehicleOrderQuery) { + return null; + } + /** * 手机端排产车分页列表 * diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsVo.java index 729849d95d..ea1ee1ad9c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsVo.java @@ -59,7 +59,7 @@ public class BusDeliveredApplyDetailsVo implements Vo { @ApiModelProperty(value = "使用人信息sid") private String useMessageSid; @ApiModelProperty(value = "使用人信息") - private BusDeliveredUseMessageVo useMessage = new BusDeliveredUseMessageVo(); + private BusDeliveredUseMessageVo useMessage; @ApiModelProperty(value = "备注") private String remarks;