Skip to content

J
jiedao-api-boot-master
Commit 2127b0d9 authored by zhengyi's avatar zhengyi
Browse files
Options

Merge branch 'release-org' into release

parents 36d49522 8835dae9
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 1215 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java
View file @ 2127b0d9
...@@ -8,7 +8,6 @@ import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO; ...@@ -8,7 +8,6 @@ import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
import cn.iocoder.yudao.module.order.dal.dataobject.orderItem.OrderItemDO; import cn.iocoder.yudao.module.order.dal.dataobject.orderItem.OrderItemDO;
import cn.iocoder.yudao.module.order.dto.OrderExportBackDTO; import cn.iocoder.yudao.module.order.dto.OrderExportBackDTO;
import cn.iocoder.yudao.module.order.dto.OrderBackInfoDto; import cn.iocoder.yudao.module.order.dto.OrderBackInfoDto;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.dto.SearchBackDto; import cn.iocoder.yudao.module.order.dto.SearchBackDto;
import cn.iocoder.yudao.module.order.vo.order.*; import cn.iocoder.yudao.module.order.vo.order.*;
import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionStatisticsExcelVo; import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionStatisticsExcelVo;
...@@ -662,11 +661,11 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -662,11 +661,11 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
* @param query * @param query
* @return * @return
*/ */
List<OrderExcelVO> exportMyOrderExcelList(@Param("start")int start, @Param("size") int size,@Param("query") OrderQueryDTO query); List<OrderExcelVO> exportMyOrderExcelList(@Param("start")int start, @Param("size") int size,@Param("query") OrderQueryVO query);
long exportOrderExcelCount(@Param("query") OrderQueryVO query); long exportOrderExcelCount(@Param("query") OrderQueryVO query);
long exportMyOrderExcelCount(@Param("query") OrderQueryDTO query); long exportMyOrderExcelCount(@Param("query") OrderQueryVO query);
@ResultType(OrderBackPageVO.class) @ResultType(OrderBackPageVO.class)
@Select({ @Select({
...@@ -1091,11 +1090,11 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -1091,11 +1090,11 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
List<OrderBackPageVO> deptOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query); List<OrderBackPageVO> deptOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query);
List<OrderBackPageVO> deptOrderList1(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryDTO query); List<OrderBackPageVO> deptOrderList1(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query);
long deptOrderCount(@Param("query") OrderQueryVO query); long deptOrderCount(@Param("query") OrderQueryVO query);
long deptOrderCount1(@Param("query") OrderQueryDTO query); long deptOrderCount1(@Param("query") OrderQueryVO query);
@ResultType(OrderBackPageVO.class) @ResultType(OrderBackPageVO.class)
@Select({ @Select({
...@@ -1922,11 +1921,11 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -1922,11 +1921,11 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
List<OrderBackPageVO> adminCargoControlOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query); List<OrderBackPageVO> adminCargoControlOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query);
List<OrderBackPageVO> adminCargoControlMyOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryDTO query); List<OrderBackPageVO> adminCargoControlMyOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query);
long adminCargoControlOrderCount(@Param("query") OrderQueryVO query); long adminCargoControlOrderCount(@Param("query") OrderQueryVO query);
long adminCargoControlMyOrderCount(@Param("query") OrderQueryDTO query); long adminCargoControlMyOrderCount(@Param("query") OrderQueryVO query);
@ResultType(OrderBackPageVO.class) @ResultType(OrderBackPageVO.class)
@Select({ @Select({
"<script>", "<script>",
...@@ -3842,7 +3841,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -3842,7 +3841,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
* @param query * @param query
* @return * @return
*/ */
List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsList(@Param("query") OrderQueryDTO query); List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsList(@Param("query") OrderQueryVO query);
/** /**
* 重货统计 * 重货统计
...@@ -3850,7 +3849,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -3850,7 +3849,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
* @param query * @param query
* @return * @return
*/ */
List<OrderHeavyExcelVo> getHeavyOrderExcelList(@Param("query") OrderQueryDTO query); List<OrderHeavyExcelVo> getHeavyOrderExcelList(@Param("query") OrderQueryVO query);
/** /**
* 退仓统计 * 退仓统计
...@@ -3858,7 +3857,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -3858,7 +3857,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
* @param query * @param query
* @return * @return
*/ */
List<OrderReturnOrderExcelVo> getReturnOrderExcelList(@Param("query") OrderQueryDTO query); List<OrderReturnOrderExcelVo> getReturnOrderExcelList(@Param("query") OrderQueryVO query);
/** /**
* 售后赔付 * 售后赔付
...@@ -3866,7 +3865,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -3866,7 +3865,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
* @param query * @param query
* @return * @return
*/ */
List<OrderSaleRepayExcelVo> getSaleRepayExcelList(@Param("query") OrderQueryDTO query); List<OrderSaleRepayExcelVo> getSaleRepayExcelList(@Param("query") OrderQueryVO query);
/** /**
* 报关数据 * 报关数据
...@@ -3874,7 +3873,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -3874,7 +3873,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
* @param query * @param query
* @return * @return
*/ */
List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(@Param("query") OrderQueryDTO query); List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(@Param("query") OrderQueryVO query);
/** /**
* 出货量 * 出货量
...@@ -3882,7 +3881,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -3882,7 +3881,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
* @param query * @param query
* @return * @return
*/ */
List<OrderShipDataExcelVo> getShipDatasExcelList(@Param("query") OrderQueryDTO query); List<OrderShipDataExcelVo> getShipDatasExcelList(@Param("query") OrderQueryVO query);
/** /**
* 预付运费 * 预付运费
...@@ -3890,7 +3889,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -3890,7 +3889,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
* @param query * @param query
* @return * @return
*/ */
List<OrderShipFeeExcelVo> getShipFeeExcelList(@Param("query") OrderQueryDTO query); List<OrderShipFeeExcelVo> getShipFeeExcelList(@Param("query") OrderQueryVO query);
@ResultType(OrderDO.class) @ResultType(OrderDO.class)
@Select({ @Select({
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dto/OrderQueryDTO.java deleted 100644 → 0
View file @ 36d49522
package cn.iocoder.yudao.module.order.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.*;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Data
public class OrderQueryDTO {
@ApiModelProperty(value = "OrderId列表，通过多个orderId查询订单时使用")
private List<Long> orderIdList;
@ApiModelProperty(value = "订单编号")
private String orderNo;
@ApiModelProperty(value = "快递单号")
private String number;
@ApiModelProperty(value = "反向搜索快递单号不包含的数据")
private String notNumber;
@ApiModelProperty(value = "提单编号")
private String tidanNo;
@ApiModelProperty(value = "父编号")
private String parentNumber;
/**
* 父订单id
*/
@ApiModelProperty(value = "父订单id")
private Long parentOrderId;
/**
* 初始母订单id
*/
@ApiModelProperty(value = "初始母订单id")
private Long initialParentOrderId;
@ApiModelProperty(value = "初始母订单编号")
private String initialParentOrderNo;
@ApiModelProperty(value = "旧编号")
private String oldNumbers;
@ApiModelProperty(value = "货柜自编号")
private String containerNumber;
@ApiModelProperty(value = "运输方式id")
private Integer transportId;
@ApiModelProperty(value = "线路ID")
private Long lineId;
@ApiModelProperty(value = "渠道ID")
private Long channelId;
@ApiModelProperty(value = "订单类型筛选条件：0 普通订单 1 集运服务 2 海外仓")
private List<String> type;
@ApiModelProperty(value = "订单类型：1 普货 2 重货 3 泡货")
private Integer orderType;
@ApiModelProperty(value = "下单会员id")
private Long userId;
@ApiModelProperty(value = "客户经理ID")
private Long salesmanId;
@ApiModelProperty(value = "客户经理所属部门ID")
private Long deptId;
@ApiModelProperty(value = "客户经理所属部门ID集合")
private List<Long> deptIdList;
@ApiModelProperty(value = "唛头")
private String marks;
@ApiModelProperty(value = "产品备案属性：1有牌,2无牌,3中性,4混牌")
private List<Integer> productRecord;
@ApiModelProperty(value = "是否控货")
private Boolean isCargoControl;
@ApiModelProperty(value = "0 控货中；1 已放完货；2 部分控货 3 放货中(此状态值为组合状态，当已放完货，但未全部复核完毕时为此状态，仅供查询条件传参使用)")
private Integer cargoControlStatus;
@ApiModelProperty(value = "报关类别：我司全代：1，自单代报：2，混合报关：3")
private List<Integer> customsType;
@ApiModelProperty(value = "上传文件")
private String upFile;
@ApiModelProperty(value = "付款类型")
private Integer payType;
@ApiModelProperty(value = "订单状态详情见字典：order_status")
//private Integer [] status;
private List<Integer> status;
@ApiModelProperty(value = "订单异常状态(字典 order_abnormal_state)")
private List<Integer> abnormalState;
@ApiModelProperty(value = "订单入仓状态(字典 order_warehouse_in_status)")
private Integer inWarehouseState;
@ApiModelProperty(value = "订单出货状态(字典 order_shipment_state)")
private Integer shipmentState;
@ApiModelProperty(value = "上次订单主状态值")
private Integer oldStatus;
@ApiModelProperty(value = "上次订单入仓状态值")
private Integer oldInWarehouseState;
@ApiModelProperty(value = "上次订单出货状态值")
private Integer oldShipmentState;
@ApiModelProperty(value = "是否被删掉 1 删掉；0正常")
private Boolean isDel;
@ApiModelProperty(value = "代收金额")
private BigDecimal collectionProxy;
@ApiModelProperty(value = "代收货币ID")
private Integer collectionProxyCurrency;
@ApiModelProperty(value = "是否代收货款收款 0为否 1为是")
private Boolean isCollection;
@ApiModelProperty(value = "重货体积")
private String wVolume;
@ApiModelProperty(value = "泡货重量")
private String vWeight;
@ApiModelProperty(value = "重货标准基数")
private BigDecimal weightUnit;
@ApiModelProperty(value = "泡货标准基数")
private BigDecimal volumeUnit;
@ExcelProperty("原重货标准基数")
@ApiModelProperty(value = "原重货标准基数")
private BigDecimal orgWeightUnit;
@ExcelProperty("原重货标准基数")
@ApiModelProperty(value = "原泡货标准基数")
private BigDecimal orgVolumeUnit;
@ApiModelProperty(value = "计算使用的重货标准基数")
private BigDecimal useWeightUnit;
@ApiModelProperty(value = "计算使用的泡货标准基数")
private BigDecimal useVolumeUnit;
@ApiModelProperty(value = "入仓类型")
private List<Integer> warehouseType;
@ApiModelProperty(value = "是否发送过入仓短信 已发送：1，未发送：0")
private Boolean sendsms;
@ApiModelProperty(value = "单证资料")
private String documentsFile;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "调仓始发仓")
private Long adjustToStartWarehouseId;
/**
* 调仓目的仓
*/
@ApiModelProperty(value = "调仓目的仓id")
private Long adjustToDestWarehouseId;
@ApiModelProperty(value = "入仓数量")
private Integer sumQuantity;
@ApiModelProperty(value = "入仓件数")
private Integer sumNum;
@ApiModelProperty(value = "入仓体积")
private BigDecimal sumVolume;
@ApiModelProperty(value = "入仓重量")
private BigDecimal sumWeight;
@ApiModelProperty(value = "重货比")
private BigDecimal weightRatio;
@ApiModelProperty(value = "发货人的客户id")
private Long customerId;
@ApiModelProperty(value = "客户详情页-客户id")
private Long customerDetailId;
@ApiModelProperty(value = "用户优惠劵ids")
private String couponCustomerIds;
@ApiModelProperty(value = "库域ID")
private Long wareId;
@ApiModelProperty(value = "始发仓ID串，eg: 1,2,3")
private String pdaStartWareIds;
@ApiModelProperty(value = "目的仓ID串，eg: 1,2,3")
private String pdaDestWareIds;
@ApiModelProperty(value = "库区ID")
private Long areaId;
@ApiModelProperty(value = "库位ID")
private Long locationId;
@ApiModelProperty(value = "仓位名称，多个用(,)号隔开")
private String locationName;
@ApiModelProperty(value = "航空公司id")
private Long airlineCompany;
@ApiModelProperty(value = "船公司id")
private Long shippingCompany;
@ApiModelProperty(value = "清关证书：0 否 1 是")
private Boolean customsClearCert;
@ApiModelProperty(value = "出单方式：1 电放 2 正本")
private Integer issuingMethod;
@ApiModelProperty(value = "是否拆包：0 否 1 是")
private Boolean isUnpack;
@ApiModelProperty(value = "是否单票立刻转运：0 否 1 是")
private Boolean isSingleTicketTransport;
@ApiModelProperty(value = "费用清单")
private String cost;
@ApiModelProperty(value = "付款人： 1 发货人 2 收货人 3 自定义")
private Integer drawee;
@ApiModelProperty(value = "自定义付款人信息")
private String customDrawee;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始送货时间")
private Date beginDeliveryDate;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束送货时间")
private Date endDeliveryDate;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始入仓时间")
private Date beginRucangTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束入仓时间")
private Date endRucangTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始入仓记录时间")
private Date beginWarehouseInTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束入仓记录时间")
private Date endWarehouseInTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始到港时间")
private Date beginDaogangTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束到港时间")
private Date endDaogangTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始清关时间")
private Date beginQingguanTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束清关时间")
private Date endQingguanTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始已预装时间")
private Date beginPreLoadTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束已预装时间")
private Date endPreLoadTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始已装柜时间")
private Date beginLoadTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始出仓时间")
private Date beginOutboundTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束出仓时间")
private Date endOutboundTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始理货时间")
private Date beginTallyTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束理货时间")
private Date endTallyTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始出货时间")
private Date beginShippingTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束出货时间")
private Date endShippingTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束已装柜时间")
private Date endLoadTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始已卸柜时间")
private Date beginUnloadTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束已卸柜时间")
private Date endUnloadTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始提货时间")
private Date beginTakeTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束提货时间")
private Date endTakeTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始提货记录时间")
private Date beginPickUpTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束提货记录时间")
private Date endPickUpTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始拆单时间")
private Date beginSplitTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束拆单时间")
private Date endSplitTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始创建时间")
private Date beginCreateTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束创建时间")
private Date endCreateTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "开始放货时间")
private Date beginPickTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "结束放货时间")
private Date endPickTime;
@ApiModelProperty(value = "包装类型ids")
private String packageType;
@ApiModelProperty(value = "包装备注")
private String packageRemarks;
@ApiModelProperty(value = "是否双清：1 客户自清 2 我司双清")
private Integer doubleClear;
@ApiModelProperty(value = "装箱单url")
private String packingListUrl;
@ApiModelProperty(value = "语言")
private Integer lang;
@ApiModelProperty(value = "始发地id")
private Long departureId;
@ApiModelProperty(value = "目的地id")
private List<Long> objectiveId;
@ApiModelProperty(value = "始发仓ID")
private List<Long> startWarehouseId;
@ApiModelProperty(value = "目的仓ID")
private List<Long> destWarehouseId;
/**
* 目的国
*/
@ApiModelProperty(value = "目的国id")
private List<Long> destCountryId ;
@ApiModelProperty(value = "发货客户ID")
private Long consignorId;
@ApiModelProperty(value = "发货客户联系人ID")
private Long consignorContactsId;
@ApiModelProperty(value = "发货客户联系人IDs")
private Collection<Long> consignorContactsIds;
@ApiModelProperty(value = "收货人手机号")
private String consignorPhone;
@ApiModelProperty(value = "收货客户id")
private Long consigneeId;
@ApiModelProperty(value = "收货客户联系人id")
private Long consigneeContactsId;
@ApiModelProperty(value = "收货客户联系人ids")
private Collection<Long> consigneeContactsIds;
@ApiModelProperty(value = "收货人手机号")
private String consigneePhone;
@ApiModelProperty(value = "控货人手机号")
private String cargoControlPhone;
@ApiModelProperty(value = "创建者", required = true)
private String creator;
@ApiModelProperty(value = "发货人姓名、手机号搜索")
private String consignorKey;
@ApiModelProperty(value = "发货人姓名、手机号反向搜索不包含的数据")
private String notConsignorKey;
@ApiModelProperty(value = "收货人姓名、手机号搜索")
private String consigneeKey;
@ApiModelProperty(value = "收货人姓名、手机号反向搜索不包含的数据")
private String notConsigneeKey;
@ApiModelProperty(value = "编号关键字搜索(包括订单号，麦头，收货人姓名电话)")
private String searchKey;
@ApiModelProperty(value = "编号搜索(包括订单号，麦头，提单号)")
private String numberKey;
@ApiModelProperty(value = "反向编号搜索(包括订单号，麦头，提单号)不包含的数据")
private String notNumberKey;
@ApiModelProperty(value = "编号搜索强等于(包括订单号，麦头，提单号)")
private String eqNumberKey;
@ApiModelProperty(value = "编号搜索强不等于(包括订单号，麦头，提单号)")
private String notEqNumberKey;
@ApiModelProperty(value = "商品搜索(商品类型、品名或品牌)")
private String prodKey;
@ApiModelProperty(value = "商品反向搜索(商品类型、品名或品牌)不包含的数据")
private String notProdKey;
@ApiModelProperty(value = "商品搜索强等于(商品类型、品名或品牌)")
private String eqProdKey;
@ApiModelProperty(value = "商品搜索强不等于(商品类型、品名或品牌)")
private String notEqProdKey;
@ApiModelProperty(value = "是否齐货")
private Boolean isNeat;
@ApiModelProperty(value = "审核类型(字典 order_approval_type) 0 为正常")
private List<Integer> auditType;
@ApiModelProperty(value = "审核结果")
private String auditResult;
@ApiModelProperty(value = "是否外部仓")
private List<Integer> isExternalWarehouse;
@ApiModelProperty(value = "目的港清关：1 我司 2 客户")
private Integer portDestCustomsClear;
@ApiModelProperty(value = "发货方式：1 多票 2 单票")
private Integer deliveryWay;
@ApiModelProperty(value = "空运可出货状态：0 默认值 1 待出 2 可出 3 备货中 4 已备货 10 可出、备货中、已备货 11 待出、可出、备货中、已备货 12 可出、备货中")
private Integer airShipment;
/**
* 端口 {@link }
*/
@ApiModelProperty(value = "端口(默认管理端)")
private Integer userType = 2;
@ApiModelProperty(value = "是否显示关联订单状态")
private Boolean isDisplayGuanlianStatus = false;
@ApiModelProperty(value = "内部转换状态字段")
//private Integer[] asStatus;
private List<Integer> asStatus ;
private List<Integer> statusList;
public void setStatus(List<Integer> status) {
this.status= status ;
this.asStatus =status;
if (CollectionUtils.isNotEmpty(this.asStatus) ) {
asStatus.forEach(statu->{
combinedState(statu, this.transportId);
});
}
}
// public void setStatus(Integer [] status) {
// this.status= status ;
// this.asStatus =status;
//
// if (this.status.length>0) {
// for(int i=0;i<status.length;i++){
// System.out.print(asStatus[i]);
// if(status[i]>10000){
// combinedState(status[i], this.transportId);
// }
//
// }
//
//
// }
//
// }
public void setTransportId(Integer transportId) {
this.transportId = transportId;
if (Objects.nonNull(transportId) && CollectionUtils.isNotEmpty(this.asStatus)) {
asStatus.forEach(statu->{
combinedState(statu, this.transportId);
});
}
// if(Objects.nonNull(transportId) ){
// if (this.asStatus.length>0) {
// for(int i=0;i<asStatus.length;i++){
// combinedState(asStatus[i], this.transportId);
// }
//
//
// }
//
// }
}
private void combinedState(Integer asStatus, Integer transportId) {
this.statusList = new ArrayList<>() ;
switch (asStatus) {
case 12325:
//this.status = 12;
this.statusList.add(12) ;
this.shipmentState = 325;
break;
case 10501:
// 空运待出
//this.status = 5;
this.statusList.add(5) ;
this.transportId = 3; // 空运待出查询，只查空运的订单
this.airShipment = 1;
//this.auditType = 0;
if(CollectionUtils.isEmpty(auditType)){
this.auditType= new ArrayList<>();
this.auditType.add(0);
}else {
this.auditType.add(0);
}
//this.abnormalState = 0;
if(CollectionUtils.isEmpty(abnormalState)){
this.abnormalState = new ArrayList<>();
this.abnormalState.add(0) ;
}else {
this.abnormalState.add(0) ;
}
break;
case 10502:
// 空运可出
//this.status = 5;
this.statusList.add(5) ;
this.transportId = 3; // 空运待出查询，只查空运的订单
this.airShipment = 12; // 可出、备货中
break;
case 10503:
// 空运已备货
//this.status = 5;
this.statusList.add(5) ;
this.transportId = 3; // 空运待出查询，只查空运的订单
this.airShipment = 4; // 已备货
break;
case 10504:
// 待排单
//this.status = 5;
this.statusList.add(5) ;
if (Objects.nonNull(transportId) && transportId == 3) {
// 空运无需判断备货状态 可出、备货中、已备货
this.airShipment = 10;
}else {
// 兼容空运已入仓的可出、备货中、已备货，且无异常无审批，海运的已入仓无异常无审批
this.airShipment = 20;
}
//this.auditType = 0;
if(CollectionUtils.isEmpty(auditType)){
this.auditType = new ArrayList<>();
this.auditType.add(0) ;
}else {
this.auditType.add(0) ;
}
//this.abnormalState = 0;
if(CollectionUtils.isEmpty(abnormalState)){
this.abnormalState = new ArrayList<>();
this.abnormalState.add(0) ;
}else {
this.abnormalState.add(0) ;
}
break;
case 132411:
// 空运已出货
//this.status = 32;
this.statusList.add(32) ;
this.transportId = 3; // 空运待出查询，只查空运的订单
this.shipmentState = 411;
break;
case 132412:
// 空运已出仓
//this.status = 32;
this.statusList.add(32) ;
this.transportId = 3; // 空运待出查询，只查空运的订单
this.shipmentState = 412;
break;
case 132409:
// 空运已理货
//this.status = 32;
this.statusList.add(32) ;
this.transportId = 3; // 空运待出查询，只查空运的订单
this.shipmentState = 409;
break;
case 118428:
// 空运已到港
//this.status = 18;
this.statusList.add(18) ;
this.transportId = 3; // 空运待出查询，只查空运的订单
this.shipmentState = 428;
break;
}
}
//旧代码
// public void setStatus(Integer status) {
// this.status = status;
// this.asStatus = status;
// if (Objects.nonNull(this.asStatus) && asStatus > 10000) {
// combinedState(this.asStatus, this.transportId);
// }
// }
//
// public void setTransportId(Integer transportId) {
// this.transportId = transportId;
// if (Objects.nonNull(transportId) && Objects.nonNull(this.asStatus)) {
// combinedState(this.asStatus, this.transportId);
// }
// }
// private void combinedState(Integer asStatus, Integer transportId) {
// switch (asStatus) {
// case 12325:
// this.status = 12;
// this.shipmentState = 325;
// break;
// case 10501:
// // 空运待出
// this.status = 5;
// this.transportId = 3; // 空运待出查询，只查空运的订单
// this.airShipment = 1;
// //this.auditType = 0;
// if(CollectionUtils.isEmpty(auditType)){
// this.auditType= new ArrayList<>();
// this.auditType.add(0);
// }else {
// this.auditType.add(0);
// }
//
// //this.abnormalState = 0;
// if(CollectionUtils.isEmpty(abnormalState)){
// this.abnormalState = new ArrayList<>();
// this.abnormalState.add(0) ;
// }else {
// this.abnormalState.add(0) ;
// }
//
// break;
// case 10502:
// // 空运可出
// this.status = 5;
// this.transportId = 3; // 空运待出查询，只查空运的订单
// this.airShipment = 12; // 可出、备货中
// break;
// case 10503:
// // 空运已备货
// this.status = 5;
// this.transportId = 3; // 空运待出查询，只查空运的订单
// this.airShipment = 4; // 已备货
// break;
// case 10504:
// // 待排单
// this.status = 5;
// if (Objects.nonNull(transportId) && transportId == 3) {
// // 空运无需判断备货状态 可出、备货中、已备货
// this.airShipment = 10;
// }else {
// // 兼容空运已入仓的可出、备货中、已备货，且无异常无审批，海运的已入仓无异常无审批
// this.airShipment = 20;
// }
// //this.auditType = 0;
// if(CollectionUtils.isEmpty(auditType)){
// this.auditType = new ArrayList<>();
// this.auditType.add(0) ;
// }else {
// this.auditType.add(0) ;
// }
// //this.abnormalState = 0;
//
// if(CollectionUtils.isEmpty(abnormalState)){
// this.abnormalState = new ArrayList<>();
// this.abnormalState.add(0) ;
// }else {
// this.abnormalState.add(0) ;
// }
// break;
// case 132411:
// // 空运已出货
// this.status = 32;
// this.transportId = 3; // 空运待出查询，只查空运的订单
// this.shipmentState = 411;
// break;
// case 132412:
// // 空运已出仓
// this.status = 32;
// this.transportId = 3; // 空运待出查询，只查空运的订单
// this.shipmentState = 412;
// break;
// case 132409:
// // 空运已理货
// this.status = 32;
// this.transportId = 3; // 空运待出查询，只查空运的订单
// this.shipmentState = 409;
// break;
// case 118428:
// // 空运已到港
// this.status = 18;
// this.transportId = 3; // 空运待出查询，只查空运的订单
// this.shipmentState = 428;
// break;
// }
// }
public void setShipmentState(Integer shipmentState) {
if (Objects.nonNull(shipmentState)) {
this.shipmentState = shipmentState;
}
}
}
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/AdvanceOrderExcelExportListener.java
View file @ 2127b0d9
...@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils; ...@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
import cn.iocoder.yudao.framework.i18n.core.I18nMessage; import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.service.file.FileService; import cn.iocoder.yudao.module.infra.service.file.FileService;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.service.order.OrderQueryService; import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import cn.iocoder.yudao.module.order.vo.order.OrderShipDataExcelVo; import cn.iocoder.yudao.module.order.vo.order.OrderShipDataExcelVo;
...@@ -52,7 +51,7 @@ public class AdvanceOrderExcelExportListener { ...@@ -52,7 +51,7 @@ public class AdvanceOrderExcelExportListener {
try { try {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
String nowTime = formatter.format(LocalDateTime.now()); String nowTime = formatter.format(LocalDateTime.now());
OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class); OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
query.setLang(event.getLang()); query.setLang(event.getLang());
List<OrderShipFeeExcelVo> list = orderQueryService.getShipFeeExcelList(query); List<OrderShipFeeExcelVo> list = orderQueryService.getShipFeeExcelList(query);
String sheetName = event.getLang() == 0 ? "预付运费统计" : "advance fee statistics"; String sheetName = event.getLang() == 0 ? "预付运费统计" : "advance fee statistics";
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ContainerNumberOrderExcelExportListener.java
View file @ 2127b0d9
...@@ -10,7 +10,6 @@ import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO; ...@@ -10,7 +10,6 @@ import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.service.file.FileService; import cn.iocoder.yudao.module.infra.service.file.FileService;
import cn.iocoder.yudao.module.order.dto.OrderCostSummaryDto; import cn.iocoder.yudao.module.order.dto.OrderCostSummaryDto;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.service.order.OrderQueryService; import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO; import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/CustomsOrderExcelExportListener.java
View file @ 2127b0d9
...@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils; ...@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
import cn.iocoder.yudao.framework.i18n.core.I18nMessage; import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.service.file.FileService; import cn.iocoder.yudao.module.infra.service.file.FileService;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.service.order.OrderQueryService; import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
import cn.iocoder.yudao.module.order.vo.order.OrderCustomsDatasExcelVo; import cn.iocoder.yudao.module.order.vo.order.OrderCustomsDatasExcelVo;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
...@@ -51,7 +50,7 @@ public class CustomsOrderExcelExportListener { ...@@ -51,7 +50,7 @@ public class CustomsOrderExcelExportListener {
try { try {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
String nowTime = formatter.format(LocalDateTime.now()); String nowTime = formatter.format(LocalDateTime.now());
OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class); OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
query.setLang(event.getLang()); query.setLang(event.getLang());
List<OrderCustomsDatasExcelVo> list = orderQueryService.getCustomsDatasExcelList(query); List<OrderCustomsDatasExcelVo> list = orderQueryService.getCustomsDatasExcelList(query);
String sheetName = event.getLang() == 0 ? "报关数据统计" : "customs data statistics"; String sheetName = event.getLang() == 0 ? "报关数据统计" : "customs data statistics";
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ExceptionOrderStatisticsExcelExportListener.java
View file @ 2127b0d9
...@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.apollo.core.event.export.ExceptionOrderStatist ...@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.apollo.core.event.export.ExceptionOrderStatist
import cn.iocoder.yudao.framework.excel.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.service.file.FileService; import cn.iocoder.yudao.module.infra.service.file.FileService;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.service.order.OrderQueryService; import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionStatisticsExcelVo; import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionStatisticsExcelVo;
...@@ -51,7 +50,7 @@ public class ExceptionOrderStatisticsExcelExportListener { ...@@ -51,7 +50,7 @@ public class ExceptionOrderStatisticsExcelExportListener {
try { try {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
String nowTime = formatter.format(LocalDateTime.now()); String nowTime = formatter.format(LocalDateTime.now());
OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class); OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
query.setLang(event.getLang()); query.setLang(event.getLang());
List<OrderExceptionStatisticsExcelVo> list = orderQueryService.getOrderExceptionStatisticsExcel(query); List<OrderExceptionStatisticsExcelVo> list = orderQueryService.getOrderExceptionStatisticsExcel(query);
String sheetName = event.getLang() == 0 ? "异常单统计" : "Order exception statistics"; String sheetName = event.getLang() == 0 ? "异常单统计" : "Order exception statistics";
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/HeavyOrderExcelExportListener.java
View file @ 2127b0d9
...@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils; ...@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
import cn.iocoder.yudao.framework.i18n.core.I18nMessage; import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.service.file.FileService; import cn.iocoder.yudao.module.infra.service.file.FileService;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.service.order.OrderQueryService; import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
import cn.iocoder.yudao.module.order.vo.order.OrderHeavyExcelVo; import cn.iocoder.yudao.module.order.vo.order.OrderHeavyExcelVo;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
...@@ -51,7 +50,7 @@ public class HeavyOrderExcelExportListener { ...@@ -51,7 +50,7 @@ public class HeavyOrderExcelExportListener {
try { try {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
String nowTime = formatter.format(LocalDateTime.now()); String nowTime = formatter.format(LocalDateTime.now());
OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class); OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
query.setLang(event.getLang()); query.setLang(event.getLang());
List<OrderHeavyExcelVo> list = orderQueryService.getHeavyOrderExcelList(query); List<OrderHeavyExcelVo> list = orderQueryService.getHeavyOrderExcelList(query);
String sheetName = event.getLang() == 0 ? "重货单统计" : "heavy order statistics"; String sheetName = event.getLang() == 0 ? "重货单统计" : "heavy order statistics";
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/OrderCargoControlExcelExportListener.java
View file @ 2127b0d9
...@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.order.listener.export; ...@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.order.listener.export;
import cn.iocoder.yudao.framework.apollo.core.event.export.OrderCargoControlExcelExportEvent; import cn.iocoder.yudao.framework.apollo.core.event.export.OrderCargoControlExcelExportEvent;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControlService; import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControlService;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -33,7 +32,7 @@ public class OrderCargoControlExcelExportListener { ...@@ -33,7 +32,7 @@ public class OrderCargoControlExcelExportListener {
public void orderCargoControlExcelExportEvent(OrderCargoControlExcelExportEvent event) { public void orderCargoControlExcelExportEvent(OrderCargoControlExcelExportEvent event) {
if (StringUtils.isNotBlank(event.getRequestParams())){ if (StringUtils.isNotBlank(event.getRequestParams())){
try { try {
OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class); OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
query.setLang(event.getLang()); query.setLang(event.getLang());
FileDO fileDO = orderCargoControlService.makeCargoControlOrderExcelFile(event.getUserId(), event.getUserType(), query); FileDO fileDO = orderCargoControlService.makeCargoControlOrderExcelFile(event.getUserId(), event.getUserType(), query);
event.setPath(fileDO.getPath()); event.setPath(fileDO.getPath());
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/OrderExcelExportListener.java
View file @ 2127b0d9
...@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.order.listener.export; ...@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.order.listener.export;
import cn.iocoder.yudao.framework.apollo.core.event.export.OrderExcelExportEvent; import cn.iocoder.yudao.framework.apollo.core.event.export.OrderExcelExportEvent;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.service.order.OrderQueryService; import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -59,7 +58,7 @@ public class OrderExcelExportListener { ...@@ -59,7 +58,7 @@ public class OrderExcelExportListener {
public void MyOrderExcelExportEvent(OrderExcelExportEvent event) throws IOException { public void MyOrderExcelExportEvent(OrderExcelExportEvent event) throws IOException {
if (StringUtils.isNotBlank(event.getRequestParams())){ if (StringUtils.isNotBlank(event.getRequestParams())){
try { try {
OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class); OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
query.setLang(event.getLang()); query.setLang(event.getLang());
FileDO fileDO = orderQueryService.makeMyOrderExcelFile(event.getUserId(), event.getUserType(), query); FileDO fileDO = orderQueryService.makeMyOrderExcelFile(event.getUserId(), event.getUserType(), query);
event.setPath(fileDO.getPath()); event.setPath(fileDO.getPath());
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ReturnOrderExcelExportListener.java
View file @ 2127b0d9
...@@ -3,10 +3,8 @@ package cn.iocoder.yudao.module.order.listener.export; ...@@ -3,10 +3,8 @@ package cn.iocoder.yudao.module.order.listener.export;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apollo.core.event.export.ReturnOrderExcelExportEvent; import cn.iocoder.yudao.framework.apollo.core.event.export.ReturnOrderExcelExportEvent;
import cn.iocoder.yudao.framework.excel.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.service.file.FileService; import cn.iocoder.yudao.module.infra.service.file.FileService;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.service.order.OrderQueryService; import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import cn.iocoder.yudao.module.order.vo.order.OrderReturnOrderExcelVo; import cn.iocoder.yudao.module.order.vo.order.OrderReturnOrderExcelVo;
...@@ -51,7 +49,7 @@ public class ReturnOrderExcelExportListener { ...@@ -51,7 +49,7 @@ public class ReturnOrderExcelExportListener {
try { try {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
String nowTime = formatter.format(LocalDateTime.now()); String nowTime = formatter.format(LocalDateTime.now());
OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class); OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
query.setLang(event.getLang()); query.setLang(event.getLang());
List<OrderReturnOrderExcelVo> list = orderQueryService.getReturnOrderExcelList(query); List<OrderReturnOrderExcelVo> list = orderQueryService.getReturnOrderExcelList(query);
String sheetName = event.getLang() == 0 ? "重货单统计" : "heavy order statistics"; String sheetName = event.getLang() == 0 ? "重货单统计" : "heavy order statistics";
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/SaleRepayOrderExcelExportListener.java
View file @ 2127b0d9
...@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils; ...@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
import cn.iocoder.yudao.framework.i18n.core.I18nMessage; import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.service.file.FileService; import cn.iocoder.yudao.module.infra.service.file.FileService;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.service.order.OrderQueryService; import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import cn.iocoder.yudao.module.order.vo.order.OrderSaleRepayExcelVo; import cn.iocoder.yudao.module.order.vo.order.OrderSaleRepayExcelVo;
...@@ -51,7 +50,7 @@ public class SaleRepayOrderExcelExportListener { ...@@ -51,7 +50,7 @@ public class SaleRepayOrderExcelExportListener {
try { try {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
String nowTime = formatter.format(LocalDateTime.now()); String nowTime = formatter.format(LocalDateTime.now());
OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class); OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
query.setLang(event.getLang()); query.setLang(event.getLang());
List<OrderSaleRepayExcelVo> list = orderQueryService.getSaleRepayExcelList(query); List<OrderSaleRepayExcelVo> list = orderQueryService.getSaleRepayExcelList(query);
String sheetName = event.getLang() == 0 ? "售后赔偿金额统计" : "sale repay statistics"; String sheetName = event.getLang() == 0 ? "售后赔偿金额统计" : "sale repay statistics";
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ShippingOrderExcelExportListener.java
View file @ 2127b0d9
...@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils; ...@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
import cn.iocoder.yudao.framework.i18n.core.I18nMessage; import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.service.file.FileService; import cn.iocoder.yudao.module.infra.service.file.FileService;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.service.order.OrderQueryService; import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
import cn.iocoder.yudao.module.order.vo.order.OrderCustomsDatasExcelVo; import cn.iocoder.yudao.module.order.vo.order.OrderCustomsDatasExcelVo;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
...@@ -52,7 +51,7 @@ public class ShippingOrderExcelExportListener { ...@@ -52,7 +51,7 @@ public class ShippingOrderExcelExportListener {
try { try {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
String nowTime = formatter.format(LocalDateTime.now()); String nowTime = formatter.format(LocalDateTime.now());
OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class); OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
query.setLang(event.getLang()); query.setLang(event.getLang());
List<OrderShipDataExcelVo> list = orderQueryService.getShipDatasExcelList(query); List<OrderShipDataExcelVo> list = orderQueryService.getShipDatasExcelList(query);
String sheetName = event.getLang() == 0 ? "客户出货量统计" : "shipping data statistics"; String sheetName = event.getLang() == 0 ? "客户出货量统计" : "shipping data statistics";
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/OrderQueryService.java
View file @ 2127b0d9
...@@ -161,7 +161,7 @@ public interface OrderQueryService { ...@@ -161,7 +161,7 @@ public interface OrderQueryService {
PageResult<OrderBackPageVO> deptOrderPage(OrderQueryVO query, PageVO page); PageResult<OrderBackPageVO> deptOrderPage(OrderQueryVO query, PageVO page);
PageResult<OrderBackPageVO> deptOrderPage1(OrderQueryDTO query, PageVO page); PageResult<OrderBackPageVO> deptOrderPage1(OrderQueryVO query, PageVO page);
PageResult<OrderBackPageVO> myIssuedOrderPage(OrderQueryVO query, PageVO page); PageResult<OrderBackPageVO> myIssuedOrderPage(OrderQueryVO query, PageVO page);
...@@ -186,7 +186,7 @@ public interface OrderQueryService { ...@@ -186,7 +186,7 @@ public interface OrderQueryService {
PageResult<OrderBackPageVO> adminCargoControlOrderPage(OrderQueryVO query, PageVO page); PageResult<OrderBackPageVO> adminCargoControlOrderPage(OrderQueryVO query, PageVO page);
PageResult<OrderBackPageVO> adminCargoControlMyOrderPage(OrderQueryDTO query, PageVO page); PageResult<OrderBackPageVO> adminCargoControlMyOrderPage(OrderQueryVO query, PageVO page);
PageResult<OrderBackPageVO> appCargoControlOrderPage(OrderQueryVO query, PageVO page); PageResult<OrderBackPageVO> appCargoControlOrderPage(OrderQueryVO query, PageVO page);
...@@ -320,21 +320,21 @@ public interface OrderQueryService { ...@@ -320,21 +320,21 @@ public interface OrderQueryService {
FileDO makeOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception; FileDO makeOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception;
FileDO makeMyOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception; FileDO makeMyOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception;
List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsExcel(OrderQueryDTO query); List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsExcel(OrderQueryVO query);
List<OrderHeavyExcelVo> getHeavyOrderExcelList(OrderQueryDTO query); List<OrderHeavyExcelVo> getHeavyOrderExcelList(OrderQueryVO query);
List<OrderReturnOrderExcelVo> getReturnOrderExcelList(OrderQueryDTO query); List<OrderReturnOrderExcelVo> getReturnOrderExcelList(OrderQueryVO query);
List<OrderSaleRepayExcelVo> getSaleRepayExcelList(OrderQueryDTO query); List<OrderSaleRepayExcelVo> getSaleRepayExcelList(OrderQueryVO query);
List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(OrderQueryDTO query); List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(OrderQueryVO query);
List<OrderShipDataExcelVo> getShipDatasExcelList(OrderQueryDTO query); List<OrderShipDataExcelVo> getShipDatasExcelList(OrderQueryVO query);
List<OrderShipFeeExcelVo> getShipFeeExcelList(OrderQueryDTO query); List<OrderShipFeeExcelVo> getShipFeeExcelList(OrderQueryVO query);
/** /**
* 查询订单的身份信息 * 查询订单的身份信息
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java
View file @ 2127b0d9
...@@ -973,7 +973,6 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -973,7 +973,6 @@ public class OrderQueryServiceImpl implements OrderQueryService {
if (Objects.isNull(query.getLang())) { if (Objects.isNull(query.getLang())) {
query.setLang(I18nMessage.getLang()); query.setLang(I18nMessage.getLang());
} }
// caseStatus(query.getStatus(), query);
IPage<OrderBackPageVO> mpPage = MyBatisUtils.buildPage(page); IPage<OrderBackPageVO> mpPage = MyBatisUtils.buildPage(page);
long total = orderMapper.myOrderCount(query); long total = orderMapper.myOrderCount(query);
log.warn(I18nMessage.getLang().toString()); log.warn(I18nMessage.getLang().toString());
...@@ -984,160 +983,6 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -984,160 +983,6 @@ public class OrderQueryServiceImpl implements OrderQueryService {
} }
public void caseStatus(List<Integer> status, OrderQueryDTO query) {
if (CollectionUtils.isNotEmpty(status) && status.size() > 0) {
List<Integer> statusList = new ArrayList<>();
status.forEach(statu -> {
if (statu > 10000) {
combinedState(statu, query, statusList);
}
});
statusList.stream().distinct();
List<Integer> list = new ArrayList<>();
list.addAll(status.stream().filter(s -> s < 10000).collect(Collectors.toList()));
list.addAll(statusList.stream().distinct().collect(Collectors.toList()));
query.setStatusList(list);
} else if (CollectionUtils.isNotEmpty(status) && status.size() == 0) {
status = null;
}
}
private void combinedState(Integer asStatus, OrderQueryDTO query, List<Integer> statusList) {
switch (asStatus) {
case 12325:
//this.status = 12;
statusList.add(12);
query.setShipmentState(325);
break;
case 10501:
// 空运待出
//this.status = 5;
statusList.add(5);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if (Objects.nonNull(query.getTransportId())) {
query.setTransportId(3);
}
query.setAirShipment(1);
//this.auditType = 0;
if (CollectionUtils.isEmpty(query.getAuditType())) {
List<Integer> audits = new ArrayList<>();
query.setAuditType(audits);
query.getAuditType().add(0);
} else {
query.getAuditType().add(0);
}
//this.abnormalState = 0;
if (CollectionUtils.isEmpty(query.getAbnormalState())) {
List<Integer> audits = new ArrayList<>();
query.setAbnormalState(audits);
query.getAbnormalState().add(0);
} else {
query.getAbnormalState().add(0);
}
break;
case 10502:
// 空运可出
//this.status = 5;
statusList.add(5);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if (Objects.nonNull(query.getTransportId())) {
query.setTransportId(3);
}
query.setAirShipment(12); // 可出、备货中
break;
case 10503:
// 空运已备货
//this.status = 5;
statusList.add(5);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if (Objects.nonNull(query.getTransportId())) {
query.setTransportId(3);
}
query.setAirShipment(4); // 已备货
break;
case 10504:
// 待排单
//this.status = 5;
statusList.add(5);
if (Objects.nonNull(query.getTransportId()) && query.getTransportId() == 3) {
// 空运无需判断备货状态 可出、备货中、已备货
query.setAirShipment(10);
} else {
// 兼容空运已入仓的可出、备货中、已备货，且无异常无审批，海运的已入仓无异常无审批
query.setAirShipment(20);
}
//this.auditType = 0;
if (CollectionUtils.isEmpty(query.getAuditType())) {
List<Integer> audits = new ArrayList<>();
query.setAuditType(audits);
query.getAuditType().add(0);
} else {
query.getAuditType().add(0);
}
//this.abnormalState = 0;
if (CollectionUtils.isEmpty(query.getAbnormalState())) {
List<Integer> audits = new ArrayList<>();
query.setAbnormalState(audits);
query.getAbnormalState().add(0);
} else {
query.getAbnormalState().add(0);
}
break;
case 132411:
// 空运已出货
//this.status = 32;
statusList.add(32);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if (Objects.nonNull(query.getTransportId())) {
query.setTransportId(3);
}
query.setShipmentState(411);
break;
case 132412:
// 空运已出仓
//this.status = 32;
statusList.add(32);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if (Objects.nonNull(query.getTransportId())) {
query.setTransportId(3);
}
query.setShipmentState(412);
break;
case 132409:
// 空运已理货
//this.status = 32;
statusList.add(32);
// 空运待出查询，只查空运的订单
if (Objects.nonNull(query.getTransportId())) {
query.setTransportId(3);
}
query.setShipmentState(409);
break;
case 118428:
// 空运已到港
//this.status = 18;
statusList.add(18);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if (Objects.nonNull(query.getTransportId())) {
query.setTransportId(3);
}
query.setShipmentState(428);
break;
}
}
@Override @Override
public long orderCount(OrderQueryVO query) { public long orderCount(OrderQueryVO query) {
return orderMapper.orderCount(query); return orderMapper.orderCount(query);
...@@ -1156,9 +1001,8 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -1156,9 +1001,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
} }
@Override @Override
public PageResult<OrderBackPageVO> deptOrderPage1(OrderQueryDTO query, PageVO page) { public PageResult<OrderBackPageVO> deptOrderPage1(OrderQueryVO query, PageVO page) {
query.setLang(I18nMessage.getLang()); query.setLang(I18nMessage.getLang());
// caseStatus(query.getStatus(), query);
IPage<OrderBackPageVO> mpPage = MyBatisUtils.buildPage(page); IPage<OrderBackPageVO> mpPage = MyBatisUtils.buildPage(page);
long total = orderMapper.deptOrderCount1(query); long total = orderMapper.deptOrderCount1(query);
log.warn(I18nMessage.getLang().toString()); log.warn(I18nMessage.getLang().toString());
...@@ -1203,9 +1047,8 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -1203,9 +1047,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
} }
@Override @Override
public PageResult<OrderBackPageVO> adminCargoControlMyOrderPage(OrderQueryDTO query, PageVO page) { public PageResult<OrderBackPageVO> adminCargoControlMyOrderPage(OrderQueryVO query, PageVO page) {
query.setLang(I18nMessage.getLang()); query.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(), query);
IPage<OrderBackPageVO> mpPage = MyBatisUtils.buildPage(page); IPage<OrderBackPageVO> mpPage = MyBatisUtils.buildPage(page);
long total = orderMapper.adminCargoControlMyOrderCount(query); long total = orderMapper.adminCargoControlMyOrderCount(query);
log.warn(I18nMessage.getLang().toString()); log.warn(I18nMessage.getLang().toString());
...@@ -1771,7 +1614,6 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -1771,7 +1614,6 @@ public class OrderQueryServiceImpl implements OrderQueryService {
@Override @Override
public StatisticsOrderVO statisticsMyOrder(OrderQueryVO query) { public StatisticsOrderVO statisticsMyOrder(OrderQueryVO query) {
// caseStatus(query.getStatus(), query);
StatisticsOrderVO vo = orderMapper.statisticsMyOrder(query); StatisticsOrderVO vo = orderMapper.statisticsMyOrder(query);
if (Objects.nonNull(vo)) { if (Objects.nonNull(vo)) {
vo.setTotalVolume(new BigDecimal(vo.getTotalVolume()).setScale(2, RoundingMode.HALF_UP).toString()); vo.setTotalVolume(new BigDecimal(vo.getTotalVolume()).setScale(2, RoundingMode.HALF_UP).toString());
...@@ -1975,10 +1817,9 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -1975,10 +1817,9 @@ public class OrderQueryServiceImpl implements OrderQueryService {
@Override @Override
public FileDO makeMyOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception { public FileDO makeMyOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
String nowTime = formatter.format(LocalDateTime.now()); String nowTime = formatter.format(LocalDateTime.now());
caseStatus(query.getStatus(), query);
String sheetName = query.getLang() == 0 ? "订单管理第{0}页" : "Order Management number {0}"; String sheetName = query.getLang() == 0 ? "订单管理第{0}页" : "Order Management number {0}";
if (Objects.isNull(userId)) { if (Objects.isNull(userId)) {
userId = 0L; userId = 0L;
...@@ -2060,8 +1901,7 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -2060,8 +1901,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
* @return * @return
*/ */
@Override @Override
public List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsExcel(OrderQueryDTO query) { public List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsExcel(OrderQueryVO query) {
caseStatus(query.getStatus(), query);
return orderMapper.getOrderExceptionStatisticsList(query); return orderMapper.getOrderExceptionStatisticsList(query);
} }
...@@ -2071,8 +1911,7 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -2071,8 +1911,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
* @return * @return
*/ */
@Override @Override
public List<OrderHeavyExcelVo> getHeavyOrderExcelList(OrderQueryDTO query) { public List<OrderHeavyExcelVo> getHeavyOrderExcelList(OrderQueryVO query) {
caseStatus(query.getStatus(), query);
return orderMapper.getHeavyOrderExcelList(query); return orderMapper.getHeavyOrderExcelList(query);
} }
...@@ -2083,8 +1922,7 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -2083,8 +1922,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
* @return * @return
*/ */
@Override @Override
public List<OrderReturnOrderExcelVo> getReturnOrderExcelList(OrderQueryDTO query) { public List<OrderReturnOrderExcelVo> getReturnOrderExcelList(OrderQueryVO query) {
caseStatus(query.getStatus(), query);
return orderMapper.getReturnOrderExcelList(query); return orderMapper.getReturnOrderExcelList(query);
} }
...@@ -2095,8 +1933,7 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -2095,8 +1933,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
* @return * @return
*/ */
@Override @Override
public List<OrderSaleRepayExcelVo> getSaleRepayExcelList(OrderQueryDTO query) { public List<OrderSaleRepayExcelVo> getSaleRepayExcelList(OrderQueryVO query) {
caseStatus(query.getStatus(), query);
return orderMapper.getSaleRepayExcelList(query); return orderMapper.getSaleRepayExcelList(query);
} }
...@@ -2107,8 +1944,7 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -2107,8 +1944,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
* @return * @return
*/ */
@Override @Override
public List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(OrderQueryDTO query) { public List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(OrderQueryVO query) {
caseStatus(query.getStatus(), query);
return orderMapper.getCustomsDatasExcelList(query); return orderMapper.getCustomsDatasExcelList(query);
} }
...@@ -2119,8 +1955,7 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -2119,8 +1955,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
* @return * @return
*/ */
@Override @Override
public List<OrderShipDataExcelVo> getShipDatasExcelList(OrderQueryDTO query) { public List<OrderShipDataExcelVo> getShipDatasExcelList(OrderQueryVO query) {
caseStatus(query.getStatus(), query);
return orderMapper.getShipDatasExcelList(query); return orderMapper.getShipDatasExcelList(query);
} }
...@@ -2131,8 +1966,7 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -2131,8 +1966,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
* @return * @return
*/ */
@Override @Override
public List<OrderShipFeeExcelVo> getShipFeeExcelList(OrderQueryDTO query) { public List<OrderShipFeeExcelVo> getShipFeeExcelList(OrderQueryVO query) {
caseStatus(query.getStatus(), query);
return orderMapper.getShipFeeExcelList(query); return orderMapper.getShipFeeExcelList(query);
} }
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlService.java
View file @ 2127b0d9
...@@ -7,17 +7,14 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; ...@@ -7,17 +7,14 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControl.OrderCargoControlDO; import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControl.OrderCargoControlDO;
import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto; import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO; import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import cn.iocoder.yudao.module.order.vo.order.OrderSendSmsReqVO; import cn.iocoder.yudao.module.order.vo.order.OrderSendSmsReqVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControl.*; import cn.iocoder.yudao.module.order.vo.orderCargoControl.*;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -123,7 +120,7 @@ public interface OrderCargoControlService extends IService<OrderCargoControlDO> ...@@ -123,7 +120,7 @@ public interface OrderCargoControlService extends IService<OrderCargoControlDO>
// FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception; // FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception;
FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception; FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception;
/** /**
* 判断是否控货人是否设置了控货密码 * 判断是否控货人是否设置了控货密码
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java
View file @ 2127b0d9
...@@ -30,7 +30,6 @@ import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignor.OrderConsigno ...@@ -30,7 +30,6 @@ import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignor.OrderConsigno
import cn.iocoder.yudao.module.order.dal.mysql.approval.OrderApprovalMapper; import cn.iocoder.yudao.module.order.dal.mysql.approval.OrderApprovalMapper;
import cn.iocoder.yudao.module.order.dal.mysql.orderCargoControl.OrderCargoControlMapper; import cn.iocoder.yudao.module.order.dal.mysql.orderCargoControl.OrderCargoControlMapper;
import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto; import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
import cn.iocoder.yudao.module.order.enums.OrderApprovalTypeResultEnum; import cn.iocoder.yudao.module.order.enums.OrderApprovalTypeResultEnum;
import cn.iocoder.yudao.module.order.enums.OrderStatusEnum; import cn.iocoder.yudao.module.order.enums.OrderStatusEnum;
import cn.iocoder.yudao.module.order.service.order.OrderBusinessService; import cn.iocoder.yudao.module.order.service.order.OrderBusinessService;
...@@ -407,7 +406,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont ...@@ -407,7 +406,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
} }
@Override @Override
public FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception { public FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
String nowTime = formatter.format(LocalDateTime.now()); String nowTime = formatter.format(LocalDateTime.now());
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java
View file @ 2127b0d9
...@@ -590,8 +590,6 @@ public class OrderQueryVO { ...@@ -590,8 +590,6 @@ public class OrderQueryVO {
@ApiModelProperty(value = "内部转换状态字段") @ApiModelProperty(value = "内部转换状态字段")
private List<Integer> asStatusList; private List<Integer> asStatusList;
@ApiModelProperty(value = "是否预警控货订单： 1 是") @ApiModelProperty(value = "是否预警控货订单： 1 是")
private Integer warningOrder; private Integer warningOrder;
......
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @ 2127b0d9
...@@ -1214,7 +1214,7 @@ ...@@ -1214,7 +1214,7 @@
limit #{start}, #{size} limit #{start}, #{size}
</select> </select>
<select id="myOrderPageList" resultType="cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO" parameterType="cn.iocoder.yudao.module.order.dto.OrderQueryDTO"> <select id="myOrderPageList" resultType="cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO" parameterType="cn.iocoder.yudao.module.order.vo.OrderQueryVO">
select o.order_id, select o.order_id,
o.package_type as advance_type, o.package_type as advance_type,
o.package_remarks, o.package_remarks,
......
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/order/OrderExportController.java
View file @ 2127b0d9
...@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent; ...@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.order.dto.OrderQueryDTO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import cn.iocoder.yudao.module.system.api.file.FileMakeApi; import cn.iocoder.yudao.module.system.api.file.FileMakeApi;
import cn.iocoder.yudao.module.system.api.file.dto.FileMakeReqDTO; import cn.iocoder.yudao.module.system.api.file.dto.FileMakeReqDTO;
import cn.iocoder.yudao.module.system.enums.download.DownloadTypeEnum; import cn.iocoder.yudao.module.system.enums.download.DownloadTypeEnum;
...@@ -49,7 +49,7 @@ public class OrderExportController { ...@@ -49,7 +49,7 @@ public class OrderExportController {
@GetMapping("/search") @GetMapping("/search")
@ApiOperation(value = "参数搜索导出订单管理 Excel", notes = "参数搜索和指定订单导出管理") @ApiOperation(value = "参数搜索导出订单管理 Excel", notes = "参数搜索和指定订单导出管理")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
public CommonResult<Boolean> exportOrderExcel(OrderQueryDTO query) { public CommonResult<Boolean> exportOrderExcel(OrderQueryVO query) {
FileMakeReqDTO reqDTO = new FileMakeReqDTO(); FileMakeReqDTO reqDTO = new FileMakeReqDTO();
reqDTO.setType(DownloadTypeEnum.ORDER_SEARCH_EXCEL_EXPORT.getType()); reqDTO.setType(DownloadTypeEnum.ORDER_SEARCH_EXCEL_EXPORT.getType());
reqDTO.setName("订单导出Excel"); reqDTO.setName("订单导出Excel");
...@@ -57,7 +57,6 @@ public class OrderExportController { ...@@ -57,7 +57,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -67,7 +66,7 @@ public class OrderExportController { ...@@ -67,7 +66,7 @@ public class OrderExportController {
@ApiOperation(value = "参数搜索导出我的订单管理 Excel", notes = "参数搜索和指定我的订单导出管理") @ApiOperation(value = "参数搜索导出我的订单管理 Excel", notes = "参数搜索和指定我的订单导出管理")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportMyOrderExcel(OrderQueryDTO query) { public CommonResult<Boolean> exportMyOrderExcel(OrderQueryVO query) {
Long salesmanId = SecurityFrameworkUtils.getLoginUserId(); // 获取当前登录用户ID Long salesmanId = SecurityFrameworkUtils.getLoginUserId(); // 获取当前登录用户ID
query.setUserType(UserTypeEnum.ADMIN.getValue()); query.setUserType(UserTypeEnum.ADMIN.getValue());
// query.setSalesmanId(salesmanId); // query.setSalesmanId(salesmanId);
...@@ -79,174 +78,17 @@ public class OrderExportController { ...@@ -79,174 +78,17 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
} }
public void caseStatus(List<Integer> status, OrderQueryDTO query){
if (CollectionUtils.isNotEmpty(status) && status.size()>0) {
List<Integer> statusList =new ArrayList<>() ;
status.forEach(statu->{
if(statu>10000){
combinedState(statu, query,statusList);
}
});
statusList.stream().distinct();
List<Integer> list= new ArrayList<>() ;
list.addAll(status.stream().filter(s->s <10000).collect(Collectors.toList())) ;
list.addAll(statusList.stream().distinct().collect(Collectors.toList()));
query.setStatusList(list) ;
}else if(CollectionUtils.isNotEmpty(status) && status.size()==0){
status =null;
}
}
private void combinedState(Integer asStatus, OrderQueryDTO query,List<Integer> statusList) {
switch (asStatus) {
case 12325:
//this.status = 12;
statusList.add(12);
query.setShipmentState(325);
break;
case 10501:
// 空运待出
//this.status = 5;
statusList.add(5);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if(Objects.nonNull(query.getTransportId())){
query.setTransportId(3);
}
query.setAirShipment(1);
//this.auditType = 0;
if(CollectionUtils.isEmpty(query.getAuditType())){
List<Integer> audits= new ArrayList<>();
query.setAuditType(audits) ;
query.getAuditType().add(0) ;
}else {
query.getAuditType().add(0) ;
}
//this.abnormalState = 0;
if(CollectionUtils.isEmpty(query.getAbnormalState())){
List<Integer> audits= new ArrayList<>();
query.setAbnormalState(audits);
query.getAbnormalState().add(0) ;
}else {
query.getAbnormalState().add(0) ;
}
break;
case 10502:
// 空运可出
//this.status = 5;
statusList.add(5);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if(Objects.nonNull(query.getTransportId())){
query.setTransportId(3);
}
query.setAirShipment(12) ; // 可出、备货中
break;
case 10503:
// 空运已备货
//this.status = 5;
statusList.add(5);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if(Objects.nonNull(query.getTransportId())){
query.setTransportId(3);
}
query.setAirShipment(4) ; // 已备货
break;
case 10504:
// 待排单
//this.status = 5;
statusList.add(5);
if (Objects.nonNull(query.getTransportId()) && query.getTransportId() == 3) {
// 空运无需判断备货状态 可出、备货中、已备货
query.setAirShipment(10) ;
}else {
// 兼容空运已入仓的可出、备货中、已备货，且无异常无审批，海运的已入仓无异常无审批
query.setAirShipment(20) ;
}
//this.auditType = 0;
if(CollectionUtils.isEmpty(query.getAuditType())){
List<Integer> audits= new ArrayList<>();
query.setAuditType(audits) ;
query.getAuditType().add(0);
}else {
query.getAuditType().add(0) ;
}
//this.abnormalState = 0;
if(CollectionUtils.isEmpty(query.getAbnormalState())){
List<Integer> audits= new ArrayList<>();
query.setAbnormalState(audits);
query.getAbnormalState().add(0) ;
}else {
query.getAbnormalState().add(0) ;
}
break;
case 132411:
// 空运已出货
//this.status = 32;
statusList.add(32);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if(Objects.nonNull(query.getTransportId())){
query.setTransportId(3);
}
query.setShipmentState(411);
break;
case 132412:
// 空运已出仓
//this.status = 32;
statusList.add(32);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if(Objects.nonNull(query.getTransportId())){
query.setTransportId(3);
}
query.setShipmentState(412);
break;
case 132409:
// 空运已理货
//this.status = 32;
statusList.add(32);
// 空运待出查询，只查空运的订单
if(Objects.nonNull(query.getTransportId())){
query.setTransportId(3);
}
query.setShipmentState( 409);
break;
case 118428:
// 空运已到港
//this.status = 18;
statusList.add(18);
//query.setTransportId(3); // 空运待出查询，只查空运的订单
if(Objects.nonNull(query.getTransportId())){
query.setTransportId(3);
}
query.setShipmentState( 428);
break;
}
}
@GetMapping("dept/search") @GetMapping("dept/search")
@ApiOperation(value = "参数搜索导出部门订单管理 Excel", notes = "参数搜索和指定部门订单导出管理") @ApiOperation(value = "参数搜索导出部门订单管理 Excel", notes = "参数搜索和指定部门订单导出管理")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportDeptOrderExcel(OrderQueryDTO query) { public CommonResult<Boolean> exportDeptOrderExcel(OrderQueryVO query) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); // 获取当前登录用户ID LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); // 获取当前登录用户ID
query.setUserType(UserTypeEnum.ADMIN.getValue()); query.setUserType(UserTypeEnum.ADMIN.getValue());
query.setDeptId(Objects.isNull(loginUser) || Objects.isNull(loginUser.getDeptId()) ? 0L : loginUser.getDeptId()); query.setDeptId(Objects.isNull(loginUser) || Objects.isNull(loginUser.getDeptId()) ? 0L : loginUser.getDeptId());
...@@ -257,7 +99,6 @@ public class OrderExportController { ...@@ -257,7 +99,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -268,7 +109,7 @@ public class OrderExportController { ...@@ -268,7 +109,7 @@ public class OrderExportController {
@ApiOperation("参数搜索导出控货订单列表") @ApiOperation("参数搜索导出控货订单列表")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportCargoControlOrderExcel(OrderQueryDTO query) { public CommonResult<Boolean> exportCargoControlOrderExcel(OrderQueryVO query) {
FileMakeReqDTO reqDTO = new FileMakeReqDTO(); FileMakeReqDTO reqDTO = new FileMakeReqDTO();
reqDTO.setType(DownloadTypeEnum.CARGO_CONTROL_ORDER_SEARCH_EXCEL_EXPORT.getType()); reqDTO.setType(DownloadTypeEnum.CARGO_CONTROL_ORDER_SEARCH_EXCEL_EXPORT.getType());
reqDTO.setName("控货订单导出Excel"); reqDTO.setName("控货订单导出Excel");
...@@ -276,7 +117,6 @@ public class OrderExportController { ...@@ -276,7 +117,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -286,7 +126,7 @@ public class OrderExportController { ...@@ -286,7 +126,7 @@ public class OrderExportController {
@ApiOperation("导出异常单统计 Excel") @ApiOperation("导出异常单统计 Excel")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportOrderExceptionExcel(OrderQueryDTO query) { public CommonResult<Boolean> exportOrderExceptionExcel(OrderQueryVO query) {
FileMakeReqDTO reqDTO = new FileMakeReqDTO(); FileMakeReqDTO reqDTO = new FileMakeReqDTO();
reqDTO.setType(DownloadTypeEnum.EXCEPTION_ORDER_STATISTICS_SEARCH_EXCEL_EXPORT.getType()); reqDTO.setType(DownloadTypeEnum.EXCEPTION_ORDER_STATISTICS_SEARCH_EXCEL_EXPORT.getType());
reqDTO.setName("异常订单统计导出Excel"); reqDTO.setName("异常订单统计导出Excel");
...@@ -294,7 +134,6 @@ public class OrderExportController { ...@@ -294,7 +134,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -304,7 +143,7 @@ public class OrderExportController { ...@@ -304,7 +143,7 @@ public class OrderExportController {
@ApiOperation("导出重货单统计 Excel") @ApiOperation("导出重货单统计 Excel")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportHeavyOrder(OrderQueryDTO query) { public CommonResult<Boolean> exportHeavyOrder(OrderQueryVO query) {
FileMakeReqDTO reqDTO = new FileMakeReqDTO(); FileMakeReqDTO reqDTO = new FileMakeReqDTO();
reqDTO.setType(DownloadTypeEnum.HEAVY_ORDER_SEARCH_EXCEL_EXPORT.getType()); reqDTO.setType(DownloadTypeEnum.HEAVY_ORDER_SEARCH_EXCEL_EXPORT.getType());
reqDTO.setName("重货订单导出Excel"); reqDTO.setName("重货订单导出Excel");
...@@ -312,7 +151,6 @@ public class OrderExportController { ...@@ -312,7 +151,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -323,7 +161,7 @@ public class OrderExportController { ...@@ -323,7 +161,7 @@ public class OrderExportController {
@ApiOperation("导出退仓单统计 Excel") @ApiOperation("导出退仓单统计 Excel")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportReturnOrder(OrderQueryDTO query) { public CommonResult<Boolean> exportReturnOrder(OrderQueryVO query) {
FileMakeReqDTO reqDTO = new FileMakeReqDTO(); FileMakeReqDTO reqDTO = new FileMakeReqDTO();
reqDTO.setType(DownloadTypeEnum.RETURN_ORDER_SEARCH_EXCEL_EXPORT.getType()); reqDTO.setType(DownloadTypeEnum.RETURN_ORDER_SEARCH_EXCEL_EXPORT.getType());
reqDTO.setName("退仓订单导出Excel"); reqDTO.setName("退仓订单导出Excel");
...@@ -331,7 +169,6 @@ public class OrderExportController { ...@@ -331,7 +169,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -341,7 +178,7 @@ public class OrderExportController { ...@@ -341,7 +178,7 @@ public class OrderExportController {
@ApiOperation("导出售后赔偿金额统计 Excel") @ApiOperation("导出售后赔偿金额统计 Excel")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportSaleRepay(OrderQueryDTO query, HttpServletResponse response) throws IOException { public CommonResult<Boolean> exportSaleRepay(OrderQueryVO query, HttpServletResponse response) throws IOException {
// List<OrderSaleRepayExcelVo> list = orderQueryService.getSaleRepayExcelList(query); // List<OrderSaleRepayExcelVo> list = orderQueryService.getSaleRepayExcelList(query);
// String sheetName = I18nMessage.getLang() == 0 ? "售后赔偿金额统计" : "sale repay statistics"; // String sheetName = I18nMessage.getLang() == 0 ? "售后赔偿金额统计" : "sale repay statistics";
// ExcelUtils.write(response, "售后赔偿金额统计.xls", sheetName, OrderSaleRepayExcelVo.class, list); // ExcelUtils.write(response, "售后赔偿金额统计.xls", sheetName, OrderSaleRepayExcelVo.class, list);
...@@ -352,7 +189,6 @@ public class OrderExportController { ...@@ -352,7 +189,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -362,7 +198,7 @@ public class OrderExportController { ...@@ -362,7 +198,7 @@ public class OrderExportController {
@ApiOperation("导出报关数统计 Excel") @ApiOperation("导出报关数统计 Excel")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportCustomsDatas(OrderQueryDTO query, HttpServletResponse response) throws IOException { public CommonResult<Boolean> exportCustomsDatas(OrderQueryVO query, HttpServletResponse response) throws IOException {
// List<OrderCustomsDatasExcelVo> list = orderQueryService.getCustomsDatasExcelList(query); // List<OrderCustomsDatasExcelVo> list = orderQueryService.getCustomsDatasExcelList(query);
// String sheetName = I18nMessage.getLang() == 0 ? "报关数据统计" : "customs data statistics"; // String sheetName = I18nMessage.getLang() == 0 ? "报关数据统计" : "customs data statistics";
// ExcelUtils.write(response, "报关数据统计.xls", sheetName, OrderCustomsDatasExcelVo.class, list); // ExcelUtils.write(response, "报关数据统计.xls", sheetName, OrderCustomsDatasExcelVo.class, list);
...@@ -373,7 +209,6 @@ public class OrderExportController { ...@@ -373,7 +209,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -383,7 +218,7 @@ public class OrderExportController { ...@@ -383,7 +218,7 @@ public class OrderExportController {
@ApiOperation("导出客户出货量统计 Excel") @ApiOperation("导出客户出货量统计 Excel")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportShippingDatas(OrderQueryDTO query, HttpServletResponse response) throws IOException { public CommonResult<Boolean> exportShippingDatas(OrderQueryVO query, HttpServletResponse response) throws IOException {
// List<OrderShipDataExcelVo> list = orderQueryService.getShipDatasExcelList(query); // List<OrderShipDataExcelVo> list = orderQueryService.getShipDatasExcelList(query);
// String sheetName = I18nMessage.getLang() == 0 ? "客户出货量统计" : "shipping data statistics"; // String sheetName = I18nMessage.getLang() == 0 ? "客户出货量统计" : "shipping data statistics";
// ExcelUtils.write(response, "客户出货量统计.xls", sheetName, OrderShipDataExcelVo.class, list); // ExcelUtils.write(response, "客户出货量统计.xls", sheetName, OrderShipDataExcelVo.class, list);
...@@ -394,7 +229,6 @@ public class OrderExportController { ...@@ -394,7 +229,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -404,7 +238,7 @@ public class OrderExportController { ...@@ -404,7 +238,7 @@ public class OrderExportController {
@ApiOperation("导出预付运费统计 Excel") @ApiOperation("导出预付运费统计 Excel")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportShipFee(OrderQueryDTO query, HttpServletResponse response) throws IOException { public CommonResult<Boolean> exportShipFee(OrderQueryVO query, HttpServletResponse response) throws IOException {
// List<OrderShipFeeExcelVo> list = orderQueryService.getShipFeeExcelList(query); // List<OrderShipFeeExcelVo> list = orderQueryService.getShipFeeExcelList(query);
// String sheetName = I18nMessage.getLang() == 0 ? "预付运费统计" : "ship fee statistics"; // String sheetName = I18nMessage.getLang() == 0 ? "预付运费统计" : "ship fee statistics";
// ExcelUtils.write(response, "预付运费统计.xls", sheetName, OrderShipFeeExcelVo.class, list); // ExcelUtils.write(response, "预付运费统计.xls", sheetName, OrderShipFeeExcelVo.class, list);
...@@ -415,7 +249,6 @@ public class OrderExportController { ...@@ -415,7 +249,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -424,9 +257,9 @@ public class OrderExportController { ...@@ -424,9 +257,9 @@ public class OrderExportController {
@GetMapping("/can-shipment/search") @GetMapping("/can-shipment/search")
@ApiOperation(value = "参数搜索导出待备货(可出-备货中)订单管理 Excel", notes = "参数搜索和指定待备货订单导出管理") @ApiOperation(value = "参数搜索导出待备货(可出-备货中)订单管理 Excel", notes = "参数搜索和指定待备货订单导出管理")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
public CommonResult<Boolean> canShipmentOrderExcel(OrderQueryDTO query, HttpServletResponse response) throws IOException { public CommonResult<Boolean> canShipmentOrderExcel(OrderQueryVO query, HttpServletResponse response) throws IOException {
if (Objects.isNull(query)){ if (Objects.isNull(query)){
query = new OrderQueryDTO(); query = new OrderQueryVO();
} }
query.setUserType(UserTypeEnum.ADMIN.getValue()); query.setUserType(UserTypeEnum.ADMIN.getValue());
query.setAirShipment(12); // 可出、备货中 query.setAirShipment(12); // 可出、备货中
...@@ -438,7 +271,6 @@ public class OrderExportController { ...@@ -438,7 +271,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -447,9 +279,9 @@ public class OrderExportController { ...@@ -447,9 +279,9 @@ public class OrderExportController {
@GetMapping("/ready-stock/search") @GetMapping("/ready-stock/search")
@ApiOperation(value = "参数搜索导出备货订单管理 Excel", notes = "参数搜索和指定备货订单导出管理") @ApiOperation(value = "参数搜索导出备货订单管理 Excel", notes = "参数搜索和指定备货订单导出管理")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
public CommonResult<Boolean> readyStockOrderExcel(OrderQueryDTO query, HttpServletResponse response) throws IOException { public CommonResult<Boolean> readyStockOrderExcel(OrderQueryVO query, HttpServletResponse response) throws IOException {
if (Objects.isNull(query)){ if (Objects.isNull(query)){
query = new OrderQueryDTO(); query = new OrderQueryVO();
} }
query.setUserType(UserTypeEnum.ADMIN.getValue()); query.setUserType(UserTypeEnum.ADMIN.getValue());
query.setAirShipment(10); // 可出-备货中-已备货 query.setAirShipment(10); // 可出-备货中-已备货
...@@ -461,7 +293,6 @@ public class OrderExportController { ...@@ -461,7 +293,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -470,9 +301,9 @@ public class OrderExportController { ...@@ -470,9 +301,9 @@ public class OrderExportController {
@GetMapping("/waiting-shipment/search") @GetMapping("/waiting-shipment/search")
@ApiOperation(value = "参数搜索导出待出订单管理 Excel", notes = "参数搜索和指定待出订单导出管理") @ApiOperation(value = "参数搜索导出待出订单管理 Excel", notes = "参数搜索和指定待出订单导出管理")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
public CommonResult<Boolean> waitingShipmentOrderExcel(OrderQueryDTO query, HttpServletResponse response) throws IOException { public CommonResult<Boolean> waitingShipmentOrderExcel(OrderQueryVO query, HttpServletResponse response) throws IOException {
if (Objects.isNull(query)){ if (Objects.isNull(query)){
query = new OrderQueryDTO(); query = new OrderQueryVO();
} }
query.setUserType(UserTypeEnum.ADMIN.getValue()); query.setUserType(UserTypeEnum.ADMIN.getValue());
query.setAirShipment(1); // 待出 query.setAirShipment(1); // 待出
...@@ -484,7 +315,6 @@ public class OrderExportController { ...@@ -484,7 +315,6 @@ public class OrderExportController {
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
reqDTO.setLang(I18nMessage.getLang()); reqDTO.setLang(I18nMessage.getLang());
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
fileMakeApi.sendFileMake(reqDTO); fileMakeApi.sendFileMake(reqDTO);
return success(true); return success(true);
...@@ -495,7 +325,7 @@ public class OrderExportController { ...@@ -495,7 +325,7 @@ public class OrderExportController {
@ApiOperation("导出自编号订单汇总列表 Excel") @ApiOperation("导出自编号订单汇总列表 Excel")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
public CommonResult<Boolean> exportOrderSummary(OrderQueryDTO query, HttpServletResponse response) throws IOException { public CommonResult<Boolean> exportOrderSummary(OrderQueryVO query, HttpServletResponse response) throws IOException {
if (StringUtils.isBlank(query.getContainerNumber())){ if (StringUtils.isBlank(query.getContainerNumber())){
throw exception(CONTAINER_NUMBER_NOT_NULL); throw exception(CONTAINER_NUMBER_NOT_NULL);
} }
...@@ -523,7 +353,6 @@ public class OrderExportController { ...@@ -523,7 +353,6 @@ public class OrderExportController {
reqDTO.setFileSuffix("xlsx"); reqDTO.setFileSuffix("xlsx");
reqDTO.setTemporaryFile(true); reqDTO.setTemporaryFile(true);
reqDTO.setUserType(2); reqDTO.setUserType(2);
caseStatus(query.getStatus(),query);
reqDTO.setRequestParams(JSONObject.toJSONString(query)); reqDTO.setRequestParams(JSONObject.toJSONString(query));
return success(true); return success(true);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment