2022年12月6日16:41:03

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/dto/ArchivesExcelEnter.java

@@ -20,7 +20,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/dto/ArchivesExcelOut.java

@@ -20,17 +20,12 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -165,6 +160,26 @@ public class ArchivesExcelOut implements Serializable {
 	 */
 	@ExcelProperty(value = "箱出入场状态")
 	private String boxAccessStatus;
+	/**
+	 * 创建人
+	 */
+	@ExcelProperty(value = "创建人")
+	private String createUserName;
+	/**
+	 * 创建时间
+	 */
+	@ExcelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人
+	 */
+	@ExcelProperty(value = "修改人")
+	private String updateUserName;
+	/**
+	 * 修改时间
+	 */
+	@ExcelProperty(value = "修改时间")
+	private Date updateTime;
 
 
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/dto/ExportRepairOut.java

@@ -16,13 +16,11 @@
  */
 package org.springblade.box.tube.dto;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
 import lombok.Data;
-import org.springblade.common.execl.ExcelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -96,4 +94,25 @@ public class ExportRepairOut implements Serializable {
 	 */
 	@ExcelProperty(value = "审核时间")
 	private Date approvalDate;
+
+	/**
+	 * 创建人
+	 */
+	@ExcelProperty(value = "创建人")
+	private String createUserName;
+	/**
+	 * 创建时间
+	 */
+	@ExcelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人
+	 */
+	@ExcelProperty(value = "修改人")
+	private String updateUserName;
+	/**
+	 * 修改时间
+	 */
+	@ExcelProperty(value = "修改时间")
+	private Date updateTime;
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/dto/ExportTradingBoxOut.java

@@ -16,11 +16,11 @@
  */
 package org.springblade.box.tube.dto;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
-import org.springblade.common.execl.ExcelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -97,4 +97,25 @@ public class ExportTradingBoxOut implements Serializable {
 	 */
 	@ExcelProperty(value = "箱数")
 	private int boxNumber;
+
+	/**
+	 * 创建人
+	 */
+	@ExcelProperty(value = "创建人")
+	private String createUserName;
+	/**
+	 * 创建时间
+	 */
+	@ExcelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人
+	 */
+	@ExcelProperty(value = "修改人")
+	private String updateUserName;
+	/**
+	 * 修改时间
+	 */
+	@ExcelProperty(value = "修改时间")
+	private Date updateTime;
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/dto/ExportTransportOut.java

@@ -20,7 +20,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
-import org.springblade.common.execl.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -153,4 +153,25 @@ public class ExportTransportOut implements Serializable {
 	@ExcelProperty(value = "提单号")
 	private String billNo;
 
+	/**
+	 * 创建人
+	 */
+	@ExcelProperty(value = "创建人")
+	private String createUserName;
+	/**
+	 * 创建时间
+	 */
+	@ExcelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人
+	 */
+	@ExcelProperty(value = "修改人")
+	private String updateUserName;
+	/**
+	 * 修改时间
+	 */
+	@ExcelProperty(value = "修改时间")
+	private Date updateTime;
+
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/dto/TradingBoxItemRentExcelEnter.java

@@ -126,4 +126,10 @@ public class TradingBoxItemRentExcelEnter implements Serializable {
 	 */
 	@ExcelProperty(value = "备注")
 	private String remarks;
+
+	/**
+	 * 起租日期
+	 */
+	@ExcelProperty(value = "起租日期")
+	private Date leaseCommencementDate;
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/Archives.java

@@ -253,5 +253,17 @@ public class Archives implements Serializable {
 	@TableField(exist = false)
 	private Integer stopDays;
 
+	/**
+	 * 创建时间(开始-结束)
+	 */
+	@TableField(exist = false)
+	private List<String> createTimeList;
+
+	/**
+	 * 修改时间(开始-结束)
+	 */
+	@TableField(exist = false)
+	private List<String> updateTimeList;
+
 
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/Repair.java

@@ -194,5 +194,17 @@ public class Repair implements Serializable {
 	@TableField(exist = false)
 	private String checkType;
 
+	/**
+	 * 创建时间(开始-结束)
+	 */
+	@TableField(exist = false)
+	private List<String> createTimeList;
+
+	/**
+	 * 修改时间(开始-结束)
+	 */
+	@TableField(exist = false)
+	private List<String> updateTimeList;
+
 
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/TradingBox.java

@@ -218,10 +218,27 @@ public class TradingBox implements Serializable {
 	private Date rentDate;
 
 	/**
+	 * 租金计费截止日期
+	 */
+	@TableField(exist = false)
+	private Date rentCalculationDate;
+	/**
 	 * 租金计费日期
 	 */
 	@TableField(exist = false)
-	private List<Date> rentCalculationDateList;
+	private Date rentStartDate;
+
+	/**
+	 * 创建时间(开始-结束)
+	 */
+	@TableField(exist = false)
+	private List<String> createTimeList;
+
+	/**
+	 * 修改时间(开始-结束)
+	 */
+	@TableField(exist = false)
+	private List<String> updateTimeList;
 
 
 

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/TradingBoxItem.java

@@ -213,6 +213,18 @@ public class TradingBoxItem implements Serializable {
 	@ApiModelProperty(value = "租金计算截止日期")
 	private Date rentEndDate;
 
+	/**
+	 * 租金计算起始时间
+	 */
+	@ApiModelProperty(value = "租金计算起始时间")
+	private Date rentStartDate;
+
+	/**
+	 * 退租日期
+	 */
+	@ApiModelProperty(value = "退租日期")
+	private Date rentingOutDate;
+
 
 	/**
 	 * 租金/天

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/Transport.java

@@ -270,4 +270,16 @@ public class Transport implements Serializable {
 	@ApiModelProperty(value = "提单号")
 	private String billNo;
 
+	/**
+	 * 创建时间(开始-结束)
+	 */
+	@TableField(exist = false)
+	private List<String> createTimeList;
+
+	/**
+	 * 修改时间(开始-结束)
+	 */
+	@TableField(exist = false)
+	private List<String> updateTimeList;
+
 }

blade-service-api/trade-finance-api/pom.xml

@@ -12,6 +12,14 @@
     <artifactId>trade-finance-api</artifactId>
     <name>${project.artifactId}</name>
     <version>${bladex.project.version}</version>
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel-core</artifactId>
+            <version>3.1.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
     <packaging>jar</packaging>
 
 

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/ExportAccOut.java

@@ -0,0 +1,94 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.vojo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 财务账单实体类
+ *
+ * @author BladeX
+ * @since 2021-11-23
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ExportAccOut implements Serializable {
+
+
+	@ExcelProperty(value = "单据来源")
+	private String billType;
+
+	@ExcelProperty(value = "合同号")
+	private String srcRefno;
+
+	@ExcelProperty(value = "提单号")
+	private String srcBillNo;
+
+	@ExcelProperty(value = "箱号")
+	private String srcSysno;
+
+	@ExcelProperty(value = "往来单位")
+	private String corpName;
+
+	@ExcelProperty(value = "所属公司")
+	private String company;
+
+	@ExcelProperty(value = "费用名称")
+	private String itemName;
+
+	@ExcelProperty(value = "数量")
+	private BigDecimal quantity;
+
+	@ExcelProperty(value = "单价")
+	private BigDecimal price;
+
+	@ExcelProperty(value = "金额")
+	private BigDecimal amount;
+
+	@ExcelProperty(value = "结算金额")
+	private BigDecimal settlementAmount;
+
+	@ExcelProperty(value = "开票金额")
+	private BigDecimal invoiceAmount;
+
+	@ExcelProperty(value = "币别")
+	private String currency;
+
+	@ExcelProperty(value = "汇率")
+	private BigDecimal exchangeRate;
+
+	@ExcelProperty(value = "录入人")
+	private String CreateUserName;
+
+	@ExcelProperty(value = "创建时间")
+	private Date createTime;
+
+	@ExcelProperty(value = "备注")
+	private String remarks;
+
+}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/ArchivesController.java

@@ -82,7 +82,6 @@ public class ArchivesController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入archives")
-	@RepeatSubmit
 	public R<IPage<Archives>> list(Archives archives, Query query) {
 		LambdaQueryWrapper<Archives> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Archives::getTenantId, AuthUtil.getTenantId())
@@ -96,6 +95,8 @@ public class ArchivesController extends BladeController {
 			.eq(ObjectUtils.isNotNull(archives.getBoxSource()), Archives::getBoxSource, archives.getBoxSource())//箱来源
 			.eq(ObjectUtils.isNotNull(archives.getStatus()), Archives::getStatus, archives.getStatus())//状态
 			.eq(ObjectUtils.isNotNull(archives.getBoxMakingCompany()), Archives::getBoxMakingCompany, archives.getBoxMakingCompany())//造箱公司
+			.eq(ObjectUtils.isNotNull(archives.getCreateUser()), Archives::getCreateUser, archives.getCreateUser())//制单人
+			.eq(ObjectUtils.isNotNull(archives.getUpdateUser()), Archives::getUpdateUser, archives.getUpdateUser())//修改人
 			.eq(ObjectUtils.isNotNull(archives.getBoxStatus()), Archives::getBoxStatus, archives.getBoxStatus());//箱状态
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(archives.getBoxMakingCompanyId()), Archives::getBoxMakingCompanyId, archives.getBoxMakingCompanyId());//造箱公司
 		if (archives.getNewDateList() != null && archives.getNewDateList().size() > 1) {//最新日期
@@ -110,6 +111,14 @@ public class ArchivesController extends BladeController {
 			lambdaQueryWrapper.ge(Archives::getLeaseCommencementDate, archives.getLeaseCommencementDateList().get(0));
 			lambdaQueryWrapper.le(Archives::getLeaseCommencementDate, archives.getLeaseCommencementDateList().get(1));
 		}
+		if (archives.getCreateTimeList() != null && archives.getCreateTimeList().size() > 1) {//创建日期
+			lambdaQueryWrapper.ge(Archives::getCreateTime, archives.getCreateTimeList().get(0));
+			lambdaQueryWrapper.le(Archives::getCreateTime, archives.getCreateTimeList().get(1));
+		}
+		if (archives.getUpdateTimeList() != null && archives.getUpdateTimeList().size() > 1) {//修改日期
+			lambdaQueryWrapper.ge(Archives::getUpdateTime, archives.getUpdateTimeList().get(0));
+			lambdaQueryWrapper.le(Archives::getUpdateTime, archives.getUpdateTimeList().get(1));
+		}
 		lambdaQueryWrapper.orderByDesc(Archives::getCreateTime);
 		IPage<Archives> pages = archivesService.page(Condition.getPage(query), lambdaQueryWrapper);
 		for (Archives archives_ : pages.getRecords()) {

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/RepairController.java

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.box.tube.dto.ExportRepairOut;
+import org.springblade.box.tube.entity.Archives;
 import org.springblade.box.tube.entity.Repair;
 import org.springblade.box.tube.service.IRepairService;
 import org.springblade.box.tube.vo.RepairVO;
@@ -220,11 +221,21 @@ public class RepairController extends BladeController {
 			.like(ObjectUtils.isNotNull(repair.getCompanyId()), Repair::getCompanyId, repair.getCompanyId())//公司id
 			.eq(ObjectUtils.isNotNull(repair.getStatus()), Repair::getStatus, repair.getStatus())//状态
 			.eq(ObjectUtils.isNotNull(repair.getAddressId()), Repair::getAddressId, repair.getAddressId())//地点
+			.eq(ObjectUtils.isNotNull(repair.getCreateUser()), Repair::getCreateUser, repair.getCreateUser())//制单人
+			.eq(ObjectUtils.isNotNull(repair.getUpdateUser()), Repair::getUpdateUser, repair.getUpdateUser())//修改人
 			.eq(ObjectUtils.isNotNull(repair.getBillType()), Repair::getBillType, repair.getBillType());//业务类型
 		if (repair.getNewDateList() != null && repair.getNewDateList().size() > 1) {//最新时间
 			lambdaQueryWrapper.ge(Repair::getNewDate, repair.getNewDateList().get(0));
 			lambdaQueryWrapper.le(Repair::getNewDate, repair.getNewDateList().get(1));
 		}
+		if (repair.getCreateTimeList() != null && repair.getCreateTimeList().size() > 1) {//创建日期
+			lambdaQueryWrapper.ge(Repair::getCreateTime, repair.getCreateTimeList().get(0));
+			lambdaQueryWrapper.le(Repair::getCreateTime, repair.getCreateTimeList().get(1));
+		}
+		if (repair.getUpdateTimeList() != null && repair.getUpdateTimeList().size() > 1) {//修改日期
+			lambdaQueryWrapper.ge(Repair::getUpdateTime, repair.getUpdateTimeList().get(0));
+			lambdaQueryWrapper.le(Repair::getUpdateTime, repair.getUpdateTimeList().get(1));
+		}
 		List<Repair> repairList = repairService.list(lambdaQueryWrapper);
 		for (Repair repair_ : repairList) {
 			if (repair_.getBillType().equals("REPAIR")) {

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxController.java

@@ -25,6 +25,8 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.box.tube.dto.ArchivesExcelOut;
+import org.springblade.box.tube.dto.ExportTradingBoxOut;
+import org.springblade.box.tube.entity.Archives;
 import org.springblade.box.tube.entity.TradingBox;
 import org.springblade.box.tube.service.ITradingBoxService;
 import org.springblade.box.tube.vo.TradingBoxVO;
@@ -220,11 +222,21 @@ public class TradingBoxController extends BladeController {
 			.like(ObjectUtils.isNotNull(tradingBox.getContractNo()), TradingBox::getContractNo, tradingBox.getContractNo())//合同号
 			.like(ObjectUtils.isNotNull(tradingBox.getPurchaseCompanyId()), TradingBox::getPurchaseCompanyId, tradingBox.getPurchaseCompanyId())//买入公司id
 			.eq(ObjectUtils.isNotNull(tradingBox.getStatus()), TradingBox::getStatus, tradingBox.getStatus())//状态
+			.eq(ObjectUtils.isNotNull(tradingBox.getCreateUser()), TradingBox::getCreateUser, tradingBox.getCreateUser())//制单人
+			.eq(ObjectUtils.isNotNull(tradingBox.getUpdateUser()), TradingBox::getUpdateUser, tradingBox.getUpdateUser())//修改人
 			.eq(ObjectUtils.isNotNull(tradingBox.getType()), TradingBox::getType, tradingBox.getType());//业务类型
 		if (tradingBox.getPurchaseDateList() != null && tradingBox.getPurchaseDateList().size() > 1) {//买入时间
 			lambdaQueryWrapper.ge(TradingBox::getPurchaseDate, tradingBox.getPurchaseDateList().get(0));
 			lambdaQueryWrapper.le(TradingBox::getPurchaseDate, tradingBox.getPurchaseDateList().get(1));
 		}
+		if (tradingBox.getCreateTimeList() != null && tradingBox.getCreateTimeList().size() > 1) {//创建日期
+			lambdaQueryWrapper.ge(TradingBox::getCreateTime, tradingBox.getCreateTimeList().get(0));
+			lambdaQueryWrapper.le(TradingBox::getCreateTime, tradingBox.getCreateTimeList().get(1));
+		}
+		if (tradingBox.getUpdateTimeList() != null && tradingBox.getUpdateTimeList().size() > 1) {//修改日期
+			lambdaQueryWrapper.ge(TradingBox::getUpdateTime, tradingBox.getUpdateTimeList().get(0));
+			lambdaQueryWrapper.le(TradingBox::getUpdateTime, tradingBox.getUpdateTimeList().get(1));
+		}
 		lambdaQueryWrapper.orderByDesc(TradingBox::getCreateTime);
 		List<TradingBox> tradingBoxList = tradingBoxService.list(lambdaQueryWrapper);
 		for (TradingBox tradingBox_ : tradingBoxList) {
@@ -240,6 +252,6 @@ public class TradingBoxController extends BladeController {
 				tradingBox_.setType("无");
 			}
 		}
-		ExcelUtil.export(response, "导出订单信息", "导出数据表", BeanUtil.copy(tradingBoxList, ArchivesExcelOut.class), ArchivesExcelOut.class);
+		ExcelUtil.export(response, "导出订单信息", "导出数据表", BeanUtil.copy(tradingBoxList, ExportTradingBoxOut.class), ExportTradingBoxOut.class);
 	}
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxRentController.java

@@ -26,6 +26,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.box.tube.dto.TradingBoxItemRentExcelEnter;
+import org.springblade.box.tube.entity.Archives;
 import org.springblade.box.tube.entity.TradingBox;
 import org.springblade.box.tube.service.ITradingBoxService;
 import org.springblade.box.tube.vo.TradingBoxVO;
@@ -84,11 +85,21 @@ public class TradingBoxRentController extends BladeController {
 			.like(ObjectUtils.isNotNull(tradingBox.getContractNo()), TradingBox::getContractNo, tradingBox.getContractNo())//合同号
 			.like(ObjectUtils.isNotNull(tradingBox.getPurchaseCompanyId()), TradingBox::getPurchaseCompanyId, tradingBox.getPurchaseCompanyId())//买入公司id
 			.eq(ObjectUtils.isNotNull(tradingBox.getStatus()), TradingBox::getStatus, tradingBox.getStatus())//状态
+			.eq(ObjectUtils.isNotNull(tradingBox.getCreateUser()), TradingBox::getCreateUser, tradingBox.getCreateUser())//制单人
+			.eq(ObjectUtils.isNotNull(tradingBox.getUpdateUser()), TradingBox::getUpdateUser, tradingBox.getUpdateUser())//修改人
 			.eq(ObjectUtils.isNotNull(tradingBox.getType()), TradingBox::getType, tradingBox.getType());//业务类型
 		if (tradingBox.getEffectiveDateList() != null && tradingBox.getEffectiveDateList().size() > 1) {//买入时间
 			lambdaQueryWrapper.ge(TradingBox::getEffectiveDate, tradingBox.getEffectiveDateList().get(0));
 			lambdaQueryWrapper.le(TradingBox::getEffectiveDate, tradingBox.getEffectiveDateList().get(1));
 		}
+		if (tradingBox.getCreateTimeList() != null && tradingBox.getCreateTimeList().size() > 1) {//创建日期
+			lambdaQueryWrapper.ge(TradingBox::getCreateTime, tradingBox.getCreateTimeList().get(0));
+			lambdaQueryWrapper.le(TradingBox::getCreateTime, tradingBox.getCreateTimeList().get(1));
+		}
+		if (tradingBox.getUpdateTimeList() != null && tradingBox.getUpdateTimeList().size() > 1) {//修改日期
+			lambdaQueryWrapper.ge(TradingBox::getUpdateTime, tradingBox.getUpdateTimeList().get(0));
+			lambdaQueryWrapper.le(TradingBox::getUpdateTime, tradingBox.getUpdateTimeList().get(1));
+		}
 		lambdaQueryWrapper.orderByDesc(TradingBox::getCreateTime);
 		IPage<TradingBox> pages = tradingBoxService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TransportController.java

@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.box.tube.dto.ExportTransportOut;
 import org.springblade.box.tube.dto.TransportItemExcelEnter;
+import org.springblade.box.tube.entity.Archives;
 import org.springblade.box.tube.entity.Transport;
 import org.springblade.box.tube.service.ITransportService;
 import org.springblade.box.tube.vo.TransportVO;
@@ -253,6 +254,8 @@ public class TransportController extends BladeController {
 			.eq(ObjectUtils.isNotNull(transport.getDepartureHarborId()), Transport::getDepartureHarborId, transport.getDepartureHarborId())//起运港
 			.eq(ObjectUtils.isNotNull(transport.getObjectiveHarborId()), Transport::getObjectiveHarborId, transport.getObjectiveHarborId())//目的港
 			.eq(ObjectUtils.isNotNull(transport.getShippingCompanyId()), Transport::getShippingCompanyId, transport.getShippingCompanyId())//船公司
+			.eq(ObjectUtils.isNotNull(transport.getCreateUser()), Transport::getCreateUser, transport.getCreateUser())//制单人
+			.eq(ObjectUtils.isNotNull(transport.getUpdateUser()), Transport::getUpdateUser, transport.getUpdateUser())//修改人
 			.eq(ObjectUtils.isNotNull(transport.getBillType()), Transport::getBillType, transport.getBillType());//业务类型
 		if (transport.getEffectiveDateList() != null && transport.getEffectiveDateList().size() > 1) {//合同生效-失效日期
 			lambdaQueryWrapper.ge(Transport::getEffectiveDate, transport.getEffectiveDateList().get(0));
@@ -262,6 +265,14 @@ public class TransportController extends BladeController {
 			lambdaQueryWrapper.ge(Transport::getStartingRentDate, transport.getStartingRentDateList().get(0));
 			lambdaQueryWrapper.le(Transport::getStartingRentDate, transport.getStartingRentDateList().get(1));
 		}
+		if (transport.getCreateTimeList() != null && transport.getCreateTimeList().size() > 1) {//创建日期
+			lambdaQueryWrapper.ge(Transport::getCreateTime, transport.getCreateTimeList().get(0));
+			lambdaQueryWrapper.le(Transport::getCreateTime, transport.getCreateTimeList().get(1));
+		}
+		if (transport.getUpdateTimeList() != null && transport.getUpdateTimeList().size() > 1) {//修改日期
+			lambdaQueryWrapper.ge(Transport::getUpdateTime, transport.getUpdateTimeList().get(0));
+			lambdaQueryWrapper.le(Transport::getUpdateTime, transport.getUpdateTimeList().get(1));
+		}
 		lambdaQueryWrapper.orderByDesc(Transport::getCreateTime);
 
 		List<Transport> transportList = transportService.list(lambdaQueryWrapper);

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -409,12 +409,15 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		if (ObjectUtils.isNotNull(tradingBoxItemList) && tradingBoxItemList.size() > 0) {
 			for (TradingBoxItem tradingBoxItem : tradingBoxItemList) {
 				if (tradingBox.getType().equals("ZR")) {
-					tradingBoxItem.setStatus("待使用");
 					tradingBoxItem.setBoxSource("租入");
 				} else if (tradingBox.getType().equals("ZC")) {
-					tradingBoxItem.setStatus("使用中");
+				}
+				if (ObjectUtils.isNull(tradingBoxItem.getRentEndDate()) && ObjectUtils.isNull(tradingBoxItem.getRentStartDate())){
+					tradingBoxItem.setRentEndDate(tradingBoxItem.getLeaseCommencementDate());
+					tradingBoxItem.setRentStartDate(tradingBoxItem.getLeaseCommencementDate());
 				}
 				if (tradingBoxItem.getId() == null) {
+					tradingBoxItem.setStatus("录入");
 					tradingBoxItem.setCreateUser(AuthUtil.getUserId());
 					tradingBoxItem.setCreateTime(new Date());
 					tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
@@ -914,6 +917,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				}
 			} else {
 				tradingBoxItem.setRentEndDate(tradingBox.getRentDate());
+				tradingBoxItem.setRentingOutDate(tradingBox.getRentDate());
 				tradingBoxItem.setStatus("退租");
 				if (ObjectUtils.isNotNull(tradingBoxItem.getCode())) {
 					//更新箱档案信息
@@ -1072,8 +1076,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			throw new RuntimeException("明细不能为空");
 		}
 		int days = 0;
-		if (tradingBox.getRentCalculationDateList().size() > 0) {
-			days = (int) ((tradingBox.getRentCalculationDateList().get(1).getTime() - tradingBox.getRentCalculationDateList().get(0).getTime()) / (1000 * 3600 * 24)) + 1;
+		if (ObjectUtils.isNotNull(tradingBox.getRentCalculationDate()) && ObjectUtils.isNotNull(tradingBox.getRentStartDate())) {
+			days = (int) ((tradingBox.getRentCalculationDate().getTime() - tradingBox.getRentStartDate().getTime()) / (1000 * 3600 * 24)) + 1;
 		}
 		Long pid = tradingBox.getId();
 
@@ -1112,8 +1116,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxFees.setSrcOrderNo(tradingBox.getContractNo());
 			tradingBoxFees.setUnit(tradingBoxItem.getBoxType());
 			tradingBoxFees.setExchangeRate(new BigDecimal(1));
-			tradingBoxFees.setRentStartDate(tradingBox.getRentCalculationDateList().get(0));
-			tradingBoxFees.setRentEndDate(tradingBox.getRentCalculationDateList().get(1));
+			tradingBoxFees.setRentStartDate(tradingBox.getRentStartDate());
+			tradingBoxFees.setRentEndDate(tradingBox.getRentCalculationDate());
 			tradingBoxFees.setCreateUser(AuthUtil.getUserId());
 			tradingBoxFees.setCreateTime(new Date());
 			tradingBoxFees.setTenantId(AuthUtil.getTenantId());
@@ -1124,7 +1128,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxItem.setUpdateTime(new Date());
 			tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
 			tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
-			tradingBoxItem.setRentEndDate(tradingBox.getRentCalculationDateList().get(1));
+			tradingBoxItem.setRentEndDate(tradingBox.getRentCalculationDate());
+			tradingBoxItem.setRentStartDate(tradingBox.getRentStartDate());
 			tradingBoxItemMapper.updateById(tradingBoxItem);
 
 			Items items = new Items();
@@ -1246,7 +1251,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxItem.setUpdateTime(new Date());
 			tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
 			tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
-			tradingBoxItem.setRentEndDate(tradingBoxFeesList.get(0).getRentStartDate());
+			tradingBoxItem.setRentEndDate(tradingBoxFeesList.get(0).getRentEndDate());
+			tradingBoxItem.setRentStartDate(tradingBoxFeesList.get(0).getRentStartDate());
 			tradingBoxItemMapper.updateById(tradingBoxItem);
 		}
 		tradingBox.setTradingBoxItemsList(tradingBoxItemList);
@@ -1274,7 +1280,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				if (ObjectUtils.isNull(archives)) {
 					throw new RuntimeException("箱号：" + tradingBoxItem.getCode() + "不存在，请修改后再进行操作！");
 				}
-				BeanUtil.copy(archives, tradingBoxItem);
 			}
 			if (ObjectUtils.isNull(tradingBoxItem.getAddress())) {
 				throw new RuntimeException("最新地点不能为空");
@@ -1347,7 +1352,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				if ("CYN".equals(tradingBoxItem.getCurrency())){
 					tradingBoxFees.setExchangeRate(new BigDecimal(1));
 				}else{
-					tradingBoxFees.setExchangeRate(new BigDecimal(6.30));
+					tradingBoxFees.setExchangeRate(new BigDecimal("6.30"));
 				}
 				tradingBoxFees.setAutoGenerate("1");
 				tradingBoxFees.setGenerationSource(tradingBoxItem.getCode());
@@ -1356,6 +1361,10 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				tradingBoxFees.setCode(tradingBoxItem.getCode());
 				tradingBoxFeesList.add(tradingBoxFees);
 			}
+			if("ZC".equals(billType) && ObjectUtils.isNotNull(tradingBoxItemExcelEnter.getLeaseCommencementDate())){
+				tradingBoxItem.setStatus("待使用");
+			}
+
 			tradingBoxItemList.add(tradingBoxItem);
 		}
 		if ("SELL".equals(billType) || "BUY".equals(billType)){

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -695,7 +695,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			if ("CYN".equals(transportItem.getCurrency())){
 				transportItemFees.setExchangeRate(new BigDecimal(1));
 			}else{
-				transportItemFees.setExchangeRate(new BigDecimal(6.30));
+				transportItemFees.setExchangeRate(new BigDecimal("6.30"));
 			}
 			transportItemFees.setAutoGenerate("1");
 			transportItemFees.setGenerationSource(transportItem.getCode());

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -517,8 +517,9 @@ public class CorpsDescController extends BladeController {
 					.or().isNull(CorpsDesc::getAdminProfiles));
 			}
 		}
-		lambdaQueryWrapper.orderByAsc(CorpsDesc::getCname);
-
+		if (!"234557".equals(AuthUtil.getTenantId())){
+			lambdaQueryWrapper.orderByAsc(CorpsDesc::getCname);
+		}
 		//获得客户信息
 		List<CorpsDesc> corpsDescList = corpsDescService.list(lambdaQueryWrapper);
 		List<CorpsDescVO> voList = BeanUtil.copy(corpsDescList, CorpsDescVO.class);
@@ -587,7 +588,9 @@ public class CorpsDescController extends BladeController {
 		if (StringUtils.isNotBlank(corpsDesc.getBelongtocompany())) {
 			lambdaQueryWrapper.and(i -> i.eq(CorpsDesc::getBelongtocompany, corpsDesc.getBelongtocompany()).or().isNull(CorpsDesc::getBelongtocompany));
 		}
-		lambdaQueryWrapper.orderByAsc(CorpsDesc::getCname);
+		if (!"234557".equals(AuthUtil.getTenantId())){
+			lambdaQueryWrapper.orderByAsc(CorpsDesc::getCname);
+		}
 		List<CorpsDesc> corpsDescList = corpsDescService.list(lambdaQueryWrapper);
 
 		List<CorpListVo> voList = BeanUtil.copy(corpsDescList, CorpListVo.class);
@@ -614,7 +617,9 @@ public class CorpsDescController extends BladeController {
 		lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted, 0);
 		lambdaQueryWrapper.eq(CorpsDesc::getTenantId, SecureUtil.getTenantId());
 		lambdaQueryWrapper.eq(CorpsDesc::getCorpType, "CD");
-		lambdaQueryWrapper.orderByAsc(CorpsDesc::getCname);
+		if (!"234557".equals(AuthUtil.getTenantId())){
+			lambdaQueryWrapper.orderByAsc(CorpsDesc::getCname);
+		}
 
 		List<CorpsDesc> corpsDescList = corpsDescService.list(lambdaQueryWrapper);
 
@@ -633,7 +638,9 @@ public class CorpsDescController extends BladeController {
 		lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted, 0);
 		lambdaQueryWrapper.eq(CorpsDesc::getTenantId, SecureUtil.getTenantId());
 		lambdaQueryWrapper.eq(CorpsDesc::getCorpType, "KH");
-		lambdaQueryWrapper.orderByAsc(CorpsDesc::getCname);
+		if (!"234557".equals(AuthUtil.getTenantId())){
+			lambdaQueryWrapper.orderByAsc(CorpsDesc::getCname);
+		}
 
 		List<CorpsDesc> corpsDescList = corpsDescService.list(lambdaQueryWrapper);
 
@@ -720,7 +727,9 @@ public class CorpsDescController extends BladeController {
 		lambdaQueryWrapper.eq(CorpsDesc::getId,corpsDesc.getId());
 		lambdaQueryWrapper.eq(CorpsDesc::getTenantId,SecureUtil.getTenantId());
 		lambdaQueryWrapper.eq(CorpsDesc::getCorpType,corpsDesc.getCorpType());
-		lambdaQueryWrapper.orderByAsc(CorpsDesc::getCname);
+		if (!"234557".equals(AuthUtil.getTenantId())){
+			lambdaQueryWrapper.orderByAsc(CorpsDesc::getCname);
+		}
 		List<CorpsDesc> corpsDescList = corpsDescService.list(lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(corpsDescList)) {
 			corpsDescList.forEach(item -> {
@@ -754,7 +763,9 @@ public class CorpsDescController extends BladeController {
 		queryWrapper.eq("is_deleted",0);
 		queryWrapper.eq("tenant_id",AuthUtil.getTenantId());
 		queryWrapper.apply(ObjectUtils.isNotNull(corpType),"find_in_set(corp_type,'"+corpType+"')");
-		queryWrapper.orderByAsc("cname");
+		if (!"234557".equals(AuthUtil.getTenantId())){
+			queryWrapper.orderByAsc("cname");
+		}
 		List<CorpsDesc> pages = corpsDescService.list(queryWrapper);
 		List<CorpsDescVO> corpsDescVOList = new ArrayList<>();
 		if (CollectionUtils.isNotEmpty(pages)) {

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -36,7 +36,7 @@
             and tenant_id = #{user.tenantId}
         </if>
         <if test="user.account!=null and user.account != ''">
-            and account = #{user.account}
+            and account like concat('%', #{user.account}, '%')
         </if>
         <if test="user.realName!=null and user.realName != ''">
             and real_name = #{user.realName}

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -46,8 +46,7 @@ import org.springblade.finance.excel.FeeStatisticsExcelJTMC;
 import org.springblade.finance.service.IAccService;
 import org.springblade.finance.vo.AccVO;
 import org.springblade.finance.vojo.Acc;
-import org.springblade.purchase.sales.vo.OrderSettlementVo;
-import org.springblade.purchase.sales.vo.PurchaseOrderBExcel;
+import org.springblade.finance.vojo.ExportAccOut;
 import org.springblade.system.entity.Tenant;
 import org.springblade.system.feign.ITenantClient;
 import org.springblade.system.user.feign.IUserClient;
@@ -123,19 +122,19 @@ public class AccController extends BladeController {
 	public R<IPage<Acc>> list(Acc acc, Query query) {
 		LambdaQueryWrapper<Acc> accLambdaQueryWrapper = new LambdaQueryWrapper<>();
 
-		if (ObjectUtil.isNotEmpty(acc.getSrcParentId())){
+		if (ObjectUtil.isNotEmpty(acc.getSrcParentId())) {
 			if (acc.getFlag() != null && acc.getFlag() == 1) {
 				accLambdaQueryWrapper.apply(" Amount >= Settlement_Amount");
 			} else if (acc.getFlag() != null && acc.getFlag() == 2) {
 				accLambdaQueryWrapper.apply(" Amount >= Invoice_Amount");
 			}
-		}else if (ObjectUtil.isNotEmpty(acc.getCorpId())){
+		} else if (ObjectUtil.isNotEmpty(acc.getCorpId())) {
 			if (acc.getFlag() != null && acc.getFlag() == 1) {
 				accLambdaQueryWrapper.apply(" Amount > Settlement_Amount");
 			} else if (acc.getFlag() != null && acc.getFlag() == 2) {
 				accLambdaQueryWrapper.apply(" Amount > Invoice_Amount");
 			}
-		}else {
+		} else {
 			if (acc.getFlag() != null && acc.getFlag() == 1) {
 				accLambdaQueryWrapper.apply(" Amount >= Settlement_Amount");
 			} else if (acc.getFlag() != null && acc.getFlag() == 2) {
@@ -152,6 +151,7 @@ public class AccController extends BladeController {
 			.eq(StringUtils.isNotBlank(acc.getCostType()), Acc::getCostType, acc.getCostType())
 			.eq(acc.getCreateUser() != null, Acc::getCreateUser, acc.getCreateUser())
 			.eq(acc.getSrcParentId() != null, Acc::getSrcParentId, acc.getSrcParentId())
+			.eq(acc.getSrcSysno() != null, Acc::getSrcSysno, acc.getSrcSysno())
 			.eq(StringUtils.isNotBlank(acc.getDc()), Acc::getDc, acc.getDc());
 		accLambdaQueryWrapper.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getCheckAmount, 0)
 			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getCheckAmount, 0)
@@ -566,7 +566,7 @@ public class AccController extends BladeController {
 	 */
 	@GetMapping("/selBillBalance")
 	@ApiOperation(value = "收付款余额", notes = "传入acc")
-	public R<IPage<Acc>> selBillBalance(Acc acc, Query query){
+	public R<IPage<Acc>> selBillBalance(Acc acc, Query query) {
 		acc.setTenantId(AuthUtil.getTenantId());
 		IPage<Acc> page = accService.selBillBalance(Condition.getPage(query), acc);
 		return R.data(page);
@@ -577,10 +577,101 @@ public class AccController extends BladeController {
 	 */
 	@GetMapping("/SumBillBalance")
 	@ApiOperation(value = "收付款总余额", notes = "传入acc")
-	public R<Map<String, Object>> SumBillBalance(Acc acc){
+	public R<Map<String, Object>> SumBillBalance(Acc acc) {
 		acc.setTenantId(AuthUtil.getTenantId());
 		Map<String, Object> map = accService.SumBillBalance(acc);
 		return R.data(map);
 	}
 
+	/**
+	 * 导出账单明细
+	 */
+	@GetMapping("/exportAccOut")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入acc")
+	public void exportAccOut(Acc acc, HttpServletResponse response) {
+		LambdaQueryWrapper<Acc> accLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		if (ObjectUtil.isNotEmpty(acc.getSrcParentId())) {
+			if (acc.getFlag() != null && acc.getFlag() == 1) {
+				accLambdaQueryWrapper.apply(" Amount >= Settlement_Amount");
+			} else if (acc.getFlag() != null && acc.getFlag() == 2) {
+				accLambdaQueryWrapper.apply(" Amount >= Invoice_Amount");
+			}
+		} else if (ObjectUtil.isNotEmpty(acc.getCorpId())) {
+			if (acc.getFlag() != null && acc.getFlag() == 1) {
+				accLambdaQueryWrapper.apply(" Amount > Settlement_Amount");
+			} else if (acc.getFlag() != null && acc.getFlag() == 2) {
+				accLambdaQueryWrapper.apply(" Amount > Invoice_Amount");
+			}
+		} else {
+			if (acc.getFlag() != null && acc.getFlag() == 1) {
+				accLambdaQueryWrapper.apply(" Amount >= Settlement_Amount");
+			} else if (acc.getFlag() != null && acc.getFlag() == 2) {
+				accLambdaQueryWrapper.apply(" Amount >= Invoice_Amount");
+			}
+		}
+
+		accLambdaQueryWrapper.between(StringUtils.isNotBlank(acc.getCreateStartDate()) && StringUtils.isNotBlank(acc.getCreateEndDate()), Acc::getCreateTime, acc.getCreateStartDate(), acc.getCreateEndDate())
+			.like(StringUtils.isNotBlank(acc.getBillType()), Acc::getBillType, acc.getBillType())
+			.like(StringUtils.isNotBlank(acc.getAccSysNo()), Acc::getAccSysNo, acc.getAccSysNo())
+			.like(StringUtils.isNotBlank(acc.getSrcBillNo()), Acc::getSrcBillNo, acc.getSrcBillNo())
+			.eq(acc.getCorpId() != null, Acc::getCorpId, acc.getCorpId())
+			.eq(StringUtils.isNotBlank(acc.getItemType()), Acc::getItemType, acc.getItemType())
+			.eq(StringUtils.isNotBlank(acc.getCostType()), Acc::getCostType, acc.getCostType())
+			.eq(acc.getCreateUser() != null, Acc::getCreateUser, acc.getCreateUser())
+			.eq(acc.getSrcParentId() != null, Acc::getSrcParentId, acc.getSrcParentId())
+			.eq(acc.getSrcSysno() != null, Acc::getSrcSysno, acc.getSrcSysno())
+			.eq(StringUtils.isNotBlank(acc.getDc()), Acc::getDc, acc.getDc());
+		accLambdaQueryWrapper.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getCheckAmount, 0)
+			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getCheckAmount, 0)
+			.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getSettlementAmount, 0)
+			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getSettlementAmount, 0)
+			.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getInvoiceAmount, 0)
+			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getInvoiceAmount, 0);
+
+		accLambdaQueryWrapper.eq(Acc::getTenantId, SecureUtil.getTenantId())
+			.eq(Acc::getIsDeleted, 0);
+		if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 1) {
+			accLambdaQueryWrapper.apply("Amount = Settlement_Amount");
+		} else if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 2) {
+			accLambdaQueryWrapper.apply("Amount != Settlement_Amount");
+		}
+		if ("673511".equals(AuthUtil.getTenantId())) {
+			accLambdaQueryWrapper.ge(ObjectUtils.isNotNull(acc.getCreateStartDate()), Acc::getSrcDate, acc.getCreateStartDate())
+				.le(ObjectUtils.isNotNull(acc.getCreateEndDate()), Acc::getSrcDate, acc.getCreateEndDate());
+		}
+		accLambdaQueryWrapper.eq(Acc::getStatus, 0);
+		accLambdaQueryWrapper.orderByDesc(Acc::getCreateTime);
+		List<Acc> accList = accService.list(accLambdaQueryWrapper);
+		String corpIds = "";
+		for (Acc accOne : accList) {
+			if (ObjectUtil.isNotEmpty(accOne.getCorpId())) {
+				corpIds = corpIds + accOne.getCorpId() + ",";
+			}
+		}
+		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds);
+		accList.forEach(e -> {
+			//录入人
+			e.setCreateUserName(iUserClient.userInfoById(e.getCreateUser()).getData().getRealName());
+			//费用名称
+			if (StringUtils.isNotBlank(e.getCostType())) {
+				R<FeesDesc> detail = iFeesDescClient.detail(Long.valueOf(e.getCostType()));
+				if (detail.isSuccess() && detail.getData() != null) {
+					e.setItemName(detail.getData().getCname());
+				}
+			}
+			//客户名称
+			if (e.getCorpId() != null) {
+				if (ObjectUtil.isNotEmpty(corpsDescList)) {
+					CorpsDesc corpsDesc = corpsDescList.stream().filter(d -> d.getId().equals(e.getCorpId())).findFirst().orElse(null);
+					if (ObjectUtils.isNotNull(corpsDesc)) {
+						e.setCorpName(corpsDesc.getCname());
+					}
+				}
+			}
+			e.setOutstandingAmount(e.getAmount().subtract(e.getSettlementAmount()));
+		});
+		ExcelUtil.export(response, "导出账单信息", "导出数据表", BeanUtil.copy(accList, ExportAccOut.class), ExportAccOut.class);
+	}
+
 }