海运进出口导出，分批付费申请结算金额问题修改

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -40,12 +40,14 @@ import org.springblade.los.business.sea.service.IBillsService;
 import org.springblade.los.business.sea.service.ISeaBillsDetailService;
 import org.springblade.los.excel.BillsExcel;
 import org.springblade.los.excel.DeliveryPaperExcel;
+import org.springblade.los.statisticAnalysis.FeeSummaryDetailRD;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -635,6 +637,7 @@ public class BillsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bills.getCorpSource()), Bills::getCorpSource, bills.getCorpSource())
 			.like(ObjectUtils.isNotNull(bills.getBookingNo()), Bills::getBookingNo, bills.getBookingNo())
 			.like(ObjectUtils.isNotNull(bills.getCreateUserName()), Bills::getCreateUserName, bills.getCreateUserName())
+			.like(ObjectUtils.isNotNull(bills.getExtendedData()), Bills::getExtendedData, bills.getExtendedData())
 			.and(ObjectUtils.isNotNull(bills.getVesselCnName()), i -> i.like(Bills::getVesselCnName, bills.getVesselCnName()).or()
 				.like(Bills::getVesselEnName, bills.getVesselCnName()))
 			.like(ObjectUtils.isNotNull(bills.getVoyageNo()), Bills::getVoyageNo, bills.getVoyageNo())
@@ -795,6 +798,7 @@ public class BillsController extends BladeController {
 			List<SeaBillsDetail> seaBillsDetailList = seaBillsDetailService.list(new LambdaQueryWrapper<SeaBillsDetail>()
 				.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
 				.in(SeaBillsDetail::getPid, ids));
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
 			for (Bills item : list) {
 				if (!seaBillsDetailList.isEmpty()) {
 					SeaBillsDetail seaBillsDetail = seaBillsDetailList.stream().filter(e -> e.getPid().equals(item.getId())).findFirst().orElse(null);
@@ -803,6 +807,21 @@ public class BillsController extends BladeController {
 					}
 				}
 				BillsExcel billsExcel = new BillsExcel();
+				if (ObjectUtils.isNotNull(item.getEtd())){
+					billsExcel.setEtd(formatter.format(item.getEtd()));
+				}
+				if (ObjectUtils.isNotNull(item.getActualEtd())){
+					billsExcel.setActualEtd(formatter.format(item.getActualEtd()));
+				}
+				if (ObjectUtils.isNotNull(item.getActualEta())){
+					billsExcel.setActualEta(formatter.format(item.getActualEta()));
+				}
+				if (ObjectUtils.isNotNull(item.getCreateTime())){
+					billsExcel.setCreateTime(formatter.format(item.getCreateTime()));
+				}
+				if (ObjectUtils.isNotNull(item.getUpdateTime())){
+					billsExcel.setUpdateTime(formatter.format(item.getUpdateTime()));
+				}
 				BeanUtil.copyProperties(item, billsExcel);
 				if (1 == item.getIsNeedLand()) {
 					billsExcel.setIsNeedLand("是");
@@ -840,11 +859,13 @@ public class BillsController extends BladeController {
 				billsExcelList.add(billsExcel);
 			}
 		}
+		String text = "";
 		if ("SE".equals(bills.getBusinessType())) {
-			ExcelUtil.export(response, "海运出口", "海运出口", billsExcelList, BillsExcel.class);
+			text = "海运出口";
 		} else {
-			ExcelUtil.export(response, "海运进口", "海运进口", billsExcelList, BillsExcel.class);
+			text = "海运进口";
 		}
+		ExcelUtil.export(response, text, text, billsExcelList, BillsExcel.class);
 
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/excel/BillsExcel.java

@@ -89,23 +89,17 @@ public class BillsExcel implements Serializable {
 	 * 开船日期
 	 */
 	@ExcelProperty(value = "开船日期")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date etd;
+	private String etd;
 	/**
 	 * 实际开船日期
 	 */
 	@ExcelProperty(value = "实际开船日期")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date actualEtd;
+	private String actualEtd;
 	/**
 	 * 到港日期
 	 */
 	@ExcelProperty(value = "到港日期")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	private Date actualEta;
+	private String actualEta;
 	/**
 	 * 船公司英文名称
 	 */
@@ -336,9 +330,7 @@ public class BillsExcel implements Serializable {
 	 * 创建时间
 	 */
 	@ExcelProperty(value = "创建时间")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	private Date createTime;
+	private String createTime;
 	/**
 	 * 修改人
 	 */
@@ -348,9 +340,7 @@ public class BillsExcel implements Serializable {
 	 * 修改时间
 	 */
 	@ExcelProperty(value = "更新时间")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	private Date updateTime;
+	private String updateTime;
 	/**
 	 * 状态（业务参数配置）
 	 */

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -3568,7 +3568,8 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 					FeeCenter::getSignforDate, FeeCenter::getInvoiceDate, FeeCenter::getVoucherDate,
 					FeeCenter::getStlDate, FeeCenter::getCheckDate, FeeCenter::getAccDate,
 					FeeCenter::getId, FeeCenter::getAccBillId, FeeCenter::getVersion, FeeCenter::getAmount,
-					FeeCenter::getUnsettledAmount, FeeCenter::getStlTtlAmount, FeeCenter::getAppliedAmount)
+					FeeCenter::getUnsettledAmount, FeeCenter::getStlTtlAmount, FeeCenter::getAppliedAmount
+					, FeeCenter::getAppliedAmountStl, FeeCenter::getAppliedInvoiceAmountStl)
 				.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 				.eq(FeeCenter::getAccStatus, 1)
 				.in(FeeCenter::getAccBillId, finAccBillsListAll.stream().map(FinAccBills::getId).collect(Collectors.toList()))
@@ -3689,7 +3690,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 							e.setAppliedAmountStl(e.getAppliedAmountStl().add((e.getAmount().subtract(e.getStlTtlAmount()))));
 							currentStlAmount = currentStlAmount.subtract((e.getAmount().subtract(e.getStlTtlAmount())));
 							e.setStlTtlAmount(e.getAmount().subtract(e.getUnsettledAmount()));
-							e.setAppliedAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedAmountStl()));
+//							e.setAppliedAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedAmountStl()));
 						}
 						feeCenterList.add(e);
 					}
@@ -3752,7 +3753,6 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 		}
 		if (!finStlBillsItemsList.isEmpty()) {
 			String exrateType = currencyUtils.standardCurrency(finStlBills.getBranchId());
-			List<BCurExrate> curExrateList = currencyUtils.obtainRate(new Date(), "2", finStlBills.getBranchId());
 			List<FinAccBills> finAccBillsListAll = finAccBillsService.list(new LambdaQueryWrapper<FinAccBills>()
 				.eq(FinAccBills::getTenantId, AuthUtil.getTenantId())
 				.eq(FinAccBills::getIsDeleted, 0)