diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java index 18c3d0fc1d..bf435cfee8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java @@ -25,6 +25,8 @@ public class BaseVehicleOutVoExecl{ private String insideCode; // 内部编码 @ExportEntityMap(CnName = "销售类型", EnName = "type") private String type; + @ExportEntityMap(CnName = "采购类型", EnName = "manPurOrderTypeValue") + private String manPurOrderTypeValue; @ExportEntityMap(CnName = "销售日期", EnName = "saleDate") private String saleDate; @ExportEntityMap(CnName = "成交价", EnName = "price") @@ -61,6 +63,4 @@ public class BaseVehicleOutVoExecl{ private String rebateMoneyTwo; @ExportEntityMap(CnName = "内部引荐人姓名", EnName = "innerName") private String innerName; - @ExportEntityMap(CnName = "采购类型", EnName = "manPurOrderTypeValue") - private String manPurOrderTypeValue; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java index 5f72db58f0..d117f70ffc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java @@ -1,13 +1,12 @@ package com.yxt.anrui.base.biz.basevehicleout; +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.basevehicleout.BaseVehicleOut; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl; +import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo; +import com.yxt.anrui.base.api.basevehicleout.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -40,5 +39,5 @@ public interface BaseVehicleOutMapper extends BaseMapper { BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid,@Param("vehSid") String vehSid); - BaseVehicleOutVoExecl selByExcel(String sid); + List selByExcel(@Param(Constants.WRAPPER) Wrapper qw); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml index 0d5a806dba..58fd2c1c8a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml @@ -126,43 +126,46 @@ \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 71e65689fd..deba24ee00 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo; import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailer; @@ -1122,11 +1123,61 @@ public class BaseVehicleOutService extends MybatisBaseService listExcel(BaseVehicleOutQuery baseVehicleOutQuery) { - List baseVehicleOutVoExecls = new ArrayList<>(); - /*BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(baseVehicleOutQuery); - baseVehicleOutVoExecl.setRankNo(id); - baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);*/ + public List listExcel(BaseVehicleOutQuery params) { + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + String orgSidPath = params.getOrgSidPath(); + SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); + String orgLevelKey = data.getOrgLevelKey(); + if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, 73); + qw.like("so.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + qw.eq("bvo.createOrgSid", params.getCreateOrgSid()); + } + //车架号 + if (StringUtils.isNotBlank(params.getVinNo())) { + qw.like("bvo.vinNo", params.getVinNo()); + } + //销售类型 + if (StringUtils.isNotBlank(params.getTypeKey())) { + qw.eq("bvo.typeKey", params.getTypeKey()); + } + //销售日期开始-销售日期结束 + qw.apply(StringUtils.isNotBlank(params.getSaleDateStart()), "date_format (bvo.saleDate,'%Y-%m-%d') >= date_format('" + params.getSaleDateStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(params.getSaleDateEnd()), "date_format (bvo.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%Y-%m-%d')" + ); + //合同编号 + if (StringUtils.isNotBlank(params.getConcatNo())) { + qw.like("bvo.concatNo", params.getConcatNo()); + } + //客户名称 + if (StringUtils.isNotBlank(params.getCustomerName())) { + qw.like("bvo.customerName", params.getCustomerName()); + } + //销售部门 + if (StringUtils.isNotBlank(params.getOrgDeptSid())) { + qw.eq("bvo.orgSid", params.getOrgDeptSid()); + } + //销售人员 + if (StringUtils.isNotBlank(params.getStaffSid())) { + qw.eq("bvo.staffSid", params.getStaffSid()); + } + //内部编码 + if (StringUtils.isNotBlank(params.getInsideCode())) { + qw.like("bv.insideCode", params.getInsideCode()); + } + //分公司 + if (StringUtils.isNotBlank(params.getOrgSid())) { + qw.eq("bvo.createOrgSid", params.getOrgSid()); + } + } + List baseVehicleOutVoExecls = baseMapper.selByExcel(qw); + int id = 1; + for (BaseVehicleOutVoExecl baseVehicleOutVoExecl : baseVehicleOutVoExecls) { + baseVehicleOutVoExecl.setRankNo(id); + id = id + 1; + } return baseVehicleOutVoExecls; } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 5e0fef2799..9da257a02a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1600,10 +1600,12 @@ public class CommonContractService extends MybatisBaseService - 身份证号码: + 证件号码: diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl index 6b98277ed7..69a2e05ecf 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl @@ -812,7 +812,7 @@ - 身份证号码: + 证件号码: diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl index 492ce74020..28fcb513a8 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl @@ -928,7 +928,7 @@ - 身份证号码: + 证件号码: diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl index ea325ea12e..3fbdf7c7a9 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl @@ -928,7 +928,7 @@ - 身份证号码: + 证件号码: diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl index 98d1791092..9c74df0d71 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl @@ -996,7 +996,7 @@ - 身份证号码: + 证件号码: diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 87130949b9..dfa4dccc9e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -359,7 +359,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService selectListAll(); - ScmVehInventorymonthVoExcel selByExcel(String sid); + List selByExcel(String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml index c8f6081a09..27e5f8abcb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml @@ -61,11 +61,15 @@ \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java index f7566b45af..b7f3b332f1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java @@ -412,21 +412,12 @@ public class ScmVehInventorymonthService extends MybatisBaseService listExcel(String[] sids) { - List scmVehInventorymonthVoExcels = new ArrayList<>(); int id = 1; - for (String sid : sids) { - ScmVehInventorymonthVoExcel scmVehInventorymonthVoExcel = baseMapper.selByExcel(sid); - String mainSid = scmVehInventorymonthVoExcel.getSid(); - AppVehInventorymonthVo vo = scmVehicleInventoryService.getMonthByMainSid(mainSid); - scmVehInventorymonthVoExcel.setSurplusNumber(String.valueOf(vo.getSurplusNumber())); - scmVehInventorymonthVoExcel.setTotalNumber(String.valueOf(vo.getTotalNumber())); - scmVehInventorymonthVoExcel.setLossNumber(String.valueOf(vo.getLossNumber())); - scmVehInventorymonthVoExcel.setDamageNumber(String.valueOf(vo.getDamageNumber())); - scmVehInventorymonthVoExcel.setProfitNumber(String.valueOf(vo.getProfitNumber())); - scmVehInventorymonthVoExcel.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber())); + String sid = sids[0]; + List scmVehInventorymonthVoExcels = baseMapper.selByExcel(sid); + for (ScmVehInventorymonthVoExcel scmVehInventorymonthVoExcel : scmVehInventorymonthVoExcels) { scmVehInventorymonthVoExcel.setRankNo(id); id = id + 1; - scmVehInventorymonthVoExcels.add(scmVehInventorymonthVoExcel); } return scmVehInventorymonthVoExcels; }