From 348fc580b1fbd6cde60e0eb82ad87ba69671707f Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 1 Jun 2023 16:46:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8C=85=E4=BA=A4=E6=8E=A5=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBusDiscountpackageHandoverQuery.java | 5 +- .../app/AppBusDiscountpackageHandoverVo.java | 18 +++--- .../BusDiscountpackageHandoverMapper.xml | 25 ++++++--- .../BusDiscountpackageHandoverService.java | 56 ++++++++++++++----- .../AppBusDiscountpackageHandoversQuery.java | 2 +- .../AppBusDiscountpackageHandoversVo.java | 2 +- 6 files changed, 71 insertions(+), 37 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java index 63d2274f7b..465dd2d11f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java @@ -15,11 +15,8 @@ public class AppBusDiscountpackageHandoverQuery implements Query { private String orgPath; // 分公司sid @ApiModelProperty("当前登录用户sid") private String userSid; // -// @ApiModelProperty("待接收销售专员用户sid") -// private String recUserSid; // 待接收销售专员用户sid @ApiModelProperty("1待准备 2待交接 3已交接") private String type; // 1待准备 2待交接 3已交接 - @ApiModelProperty("1待准备 2待交接 3已交接") - private String names; // 1待准备 2待交接 3已交接 + private String name; // } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java index b1f16efec1..6fe71de522 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java @@ -21,7 +21,7 @@ public class AppBusDiscountpackageHandoverVo implements Vo { @ApiModelProperty("销售订单sid") private String salesOrderSid; // 销售订单sid @ApiModelProperty("交接状态 1待准备，2待交接，3已交接") - private Integer type; // 交接状态 + private String nodeState; // 交接状态 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createDate; // 合同编号 @@ -33,13 +33,13 @@ public class AppBusDiscountpackageHandoverVo implements Vo { private String model; // 车型名称 @ApiModelProperty("车辆台数") private String carNum; // 车辆台数 - @ApiModelProperty("接收人姓名") - private String recName; // 接收人姓名 - @ApiModelProperty("接收人电话") - private String recPhone; // 接收人电话 - @ApiModelProperty("待交接显示") - private Boolean showHandleBtn; // 待交接显示 - @ApiModelProperty("已交接显示") - private Boolean showDownloadBtn; // 已交接显示 + @ApiModelProperty("优惠包数量") + private String discountNum; // 优惠包数量 + @ApiModelProperty("优惠包总价值") + private String price; // 接收人电话 + @ApiModelProperty("办理显示") + private Boolean showHandleBtn; // 办理显示 + @ApiModelProperty("上传显示") + private Boolean showUploadBtn; // 上传显示 } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml index 3e1c7930c0..5148d3c500 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml @@ -23,18 +23,27 @@ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java index bf8c93ffbf..1515545750 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java @@ -18,6 +18,7 @@ import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService; import com.yxt.anrui.portal.api.sysrole.SysRoleFeign; import com.yxt.anrui.portal.api.sysrole.SysRoleVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -34,6 +35,7 @@ import org.springframework.stereotype.Service; import java.io.File; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; +import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -58,6 +60,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService appCreateQueryWrapper(AppBusDiscountpackageHandoverQuery query) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("useOrgSid", query.getOrgPath()); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("useOrgSid", useOrgSid); qw.eq("isDelete", 0); if (StringUtils.isNotBlank(query.getUserSid())) { qw.eq("recUserSid", query.getUserSid()); } if (StringUtils.isNotBlank(query.getType())) { - if (query.getType().equals("3")) { - qw.eq("state", query.getType()); - } else { + if (query.getType().equals("2")) { + qw.eq("state", 3); + } else if (query.getType().equals("1")) { qw.ne("state", 3); } } - if (StringUtils.isNotBlank(query.getNames())) { - qw.and(wrapper -> wrapper.like("contractNo", query.getNames()).or().like("customerName", query.getNames()) - .or().like("recName",query.getNames())); + if (StringUtils.isNotBlank(query.getName())) { + qw.and(wrapper -> wrapper.like("contractNo", query.getName()).or().like("customerName", query.getName())); } + qw.orderByDesc("createTime"); return qw; } @@ -525,11 +530,10 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectAppPageVo(page, qw); List records = pagging.getRecords(); - if (null != records) { + if (null != records && records.size() > 0) { for (AppBusDiscountpackageHandoverVo record : records) { if (null != record) { if (StringUtils.isNotBlank(record.getContractId())) { - CommonContract data = commonContractFeign.selectByNo(record.getContractId()).getData(); if (null != data) { if (StringUtils.isNotBlank(data.getBusSid())) { @@ -537,13 +541,37 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService buscenterFiles = buscenterFileService.selectByLinkSid(record.getSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); + if (buscenterFiles.size() > 0) { + record.setShowUploadBtn(false); + } else { + record.setShowUploadBtn(true); + } + } + record.setShowUploadBtn(false); + } + List listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(record.getSid()); + if (listByMainSid.size() > 0) { + BigDecimal price = new BigDecimal(0); + int discountNum = 0; + for (BusDiscountpackageHandoverList handoverList : listByMainSid) { + if (null != handoverList) { + //优惠包数量 + String number = handoverList.getNumber(); + discountNum = discountNum + Integer.valueOf(number); + BigDecimal totalPrice = handoverList.getTotalPrice(); + price = price.add(totalPrice); } } + record.setDiscountNum(String.valueOf(discountNum)); + record.setPrice(String.valueOf(price)); } } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java index 1a15134d06..40a21625a6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java @@ -19,7 +19,7 @@ public class AppBusDiscountpackageHandoversQuery implements Query { @ApiModelProperty("1待准备 2待交接 3已交接") private String type; // 1待准备 2待交接 3已交接 @ApiModelProperty("合同编号/客户名称/待接收人") - private String names; + private String name; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java index 19863c19db..e6750f8c12 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java @@ -21,7 +21,7 @@ public class AppBusDiscountpackageHandoversVo implements Vo { @ApiModelProperty("销售订单sid") private String salesOrderSid; // 销售订单sid @ApiModelProperty("交接状态 1待准备，2待交接，3已交接") - private Integer type; // 交接状态 + private String nodeSate; // 交接状态 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createDate; // 合同编号