diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/MonthlyCustomerShipmentStatVO.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/MonthlyCustomerShipmentStatVO.java index 8d03d1636..5921ac8f0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/MonthlyCustomerShipmentStatVO.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/MonthlyCustomerShipmentStatVO.java @@ -26,74 +26,92 @@ public class MonthlyCustomerShipmentStatVO implements Serializable { private static final long serialVersionUID = 1L; /* 客户名称 */ - @Excel(name = "客户名称") private String customerName; /* 客户编号 */ private String customerCode; /* 月结卡号 */ - @Excel(name = "月结卡号") private String custNo; /* 总票数 */ - @Excel(name = "总票数") private Integer totalTickets; /* 总重量 */ - @Excel(name = "总重量") private BigDecimal totalWeight; /* 销售联系人(多个用/分隔) */ - @Excel(name = "销售联系人") private String salesmen; /* 快递票数 */ - @Excel(name = "快递票数") private Integer expressTickets; /* 快递实际重量 */ - @Excel(name = "快递实际重量") private BigDecimal expressWeight; /* 空运票数 */ - @Excel(name = "空运票数") private Integer airTickets; /* 空运实际重量 */ - @Excel(name = "空运实际重量") private BigDecimal airWeight; /* 陆运票数 */ - @Excel(name = "陆运票数") private Integer landTickets; /* 陆运实际重量 */ - @Excel(name = "陆运实际重量") private BigDecimal landWeight; /* 海运票数 */ - @Excel(name = "海运票数") private Integer seaTickets; /* 海运实际重量 */ - @Excel(name = "海运实际重量") private BigDecimal seaWeight; /* 进口票数 */ - @Excel(name = "进口票数") private Integer importTickets; /* 进口实际重量 */ - @Excel(name = "进口实际重量") private BigDecimal importWeight; /* 其他票数 */ - @Excel(name = "其他票数") private Integer otherTickets; /* 其他实际重量 */ - @Excel(name = "其他实际重量") private BigDecimal otherWeight; + + /* 中国票数 */ + private Integer chinaTickets; + /* 中国实际重量 */ + private BigDecimal chinaWeight; + + /* 越南票数 */ + private Integer vietnamTickets; + /* 越南实际重量 */ + private BigDecimal vietnamWeight; + + /* 柬埔寨票数 */ + private Integer cambodiaTickets; + /* 柬埔寨实际重量 */ + private BigDecimal cambodiaWeight; + + /* 缅甸票数 */ + private Integer myanmarTickets; + /* 缅甸实际重量 */ + private BigDecimal myanmarWeight; + + /* 孟加拉票数 */ + private Integer bangladeshTickets; + /* 孟加拉实际重量 */ + private BigDecimal bangladeshWeight; + + /* 老挝票数 */ + private Integer laosTickets; + /* 老挝实际重量 */ + private BigDecimal laosWeight; + + /* 泰国票数 */ + private Integer thailandTickets; + /* 泰国实际重量 */ + private BigDecimal thailandWeight; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index cc6242801..ef98b061a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -373,6 +373,14 @@ public interface EmisWaybillMapper extends BaseMapper */ List selectMonthlyCustomerShipmentStat(EmisWaybill emisWaybill); + /** + * 按目的国家查询月结客户出货统计 + * + * @param emisWaybill 查询条件 + * @return 统计结果列表 + */ + List selectMonthlyCustomerShipmentStatByCountry(EmisWaybill emisWaybill); + /** * 查询月结客户出货明细 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java index f53a9d9aa..fe69f2abb 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java @@ -11,8 +11,6 @@ package com.xdadan.erp.emis.service.impl; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import com.xdadan.erp.common.utils.SecurityUtils; import com.xdadan.erp.emis.service.EmisBaseService; @@ -162,7 +160,12 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi */ @Override public List selectMonthlyCustomerShipmentStat(EmisWaybill emisWaybill) { - return emisWaybillMapper.selectMonthlyCustomerShipmentStat(emisWaybill); + if("1".equals(emisWaybill.getParams().get("statType"))){ + // 按运输方式统计 + return emisWaybillMapper.selectMonthlyCustomerShipmentStat(emisWaybill); + } + // 按目的国家统计 + return emisWaybillMapper.selectMonthlyCustomerShipmentStatByCountry(emisWaybill); } /**