2024年3月20日12:23:49

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/dto/FeeCenterReports.java

@@ -103,5 +103,10 @@ public class FeeCenterReports implements Serializable {
 	 */
 	private String mark;
 
+	/**
+	 * 备注
+	 */
+	private String remarks;
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/service/impl/BCorpsServiceImpl.java

@@ -105,10 +105,12 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 		List<BCorps> cname = baseMapper.selectList(new LambdaQueryWrapper<BCorps>()
 			.eq(BCorps::getCnName, bCorps.getCnName())
 			.eq(BCorps::getTenantId, AuthUtil.getTenantId())
+			.eq(BCorps::getBranchId, deptUtils.getDeptPid())
 			.eq(BCorps::getIsDeleted, 0));
 		List<BCorps> uscc = baseMapper.selectList(new LambdaQueryWrapper<BCorps>()
 			.eq(BCorps::getUscc, bCorps.getUscc())
 			.eq(BCorps::getTenantId, AuthUtil.getTenantId())
+			.eq(BCorps::getBranchId, deptUtils.getDeptPid())
 			.eq(BCorps::getIsDeleted, 0));
 		//首字母为空
 		if (null == bCorps.getInitials() || bCorps.getInitials().isEmpty()) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -223,6 +223,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 								for (FeeCenter fee : feeCenterList) {
 									FeeCenterReports feeCenterReports = new FeeCenterReports();
+									feeCenterReports.setRemarks(fee.getRemarks());
 									feeCenterReports.setPid(item.getId());
 									feeCenterReports.setFeeCnName(fee.getFeeCnName());
 									feeCenterReports.setDc(fee.getDc());
@@ -292,6 +293,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 						for (FeeCenter fee : feeCenters) {
 							FeeCenterReports feeCenterReports = new FeeCenterReports();
+							feeCenterReports.setRemarks(fee.getRemarks());
 							feeCenterReports.setPid(bills.getId());
 							feeCenterReports.setFeeCnName(fee.getFeeCnName());
 							feeCenterReports.setDc(fee.getDc());
@@ -365,6 +367,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 							for (FeeCenter fee : feeCenters) {
 								FeeCenterReports feeCenterReports = new FeeCenterReports();
+								feeCenterReports.setRemarks(fee.getRemarks());
 								feeCenterReports.setPid(bills.getId());
 								feeCenterReports.setFeeCnName(fee.getFeeCnName());
 								feeCenterReports.setDc(fee.getDc());
@@ -431,6 +434,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 						for (FeeCenter fee : feeCenterList1) {
 							FeeCenterReports feeCenterReports = new FeeCenterReports();
+							feeCenterReports.setRemarks(fee.getRemarks());
 							feeCenterReports.setPid(details.getId());
 							feeCenterReports.setFeeCnName(fee.getFeeCnName());
 							feeCenterReports.setDc(fee.getDc());
@@ -708,6 +712,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					FeeCenterReports feeCenterReports = new FeeCenterReports();
+					feeCenterReports.setRemarks(item.getRemarks());
 					feeCenterReports.setPid(item.getPid());
 					feeCenterReports.setCorpCnName(item.getCorpCnName());
 					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
@@ -719,7 +724,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocD(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getAmount());
+					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				bills.setFeeCenterList(feeCenterReportsList);
@@ -814,6 +819,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					FeeCenterReports feeCenterReports = new FeeCenterReports();
+					feeCenterReports.setRemarks(item.getRemarks());
 					feeCenterReports.setPid(item.getPid());
 					feeCenterReports.setCorpCnName(item.getCorpCnName());
 					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
@@ -825,7 +831,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getAmount());
+					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				bills.setFeeCenterList(feeCenterReportsList);
@@ -901,7 +907,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FinStlBillsItems::getIsDeleted, 0)
 					.eq(FinStlBillsItems::getPid, finStlBills.getId());
 				List<FinStlBillsItems> finStlBillsItems = finStlBillsItemsService.list(lambdaQueryWrapper);
-				String quantityCntrDescr = "";
 				if (!finStlBillsItems.isEmpty()) {
 					List<FinStlBillsItems> reducelList = finStlBillsItems.stream().filter(distinctByKey(FinStlBillsItems::getMblno)).collect(Collectors.toList());
 					List<Bills> billsList = new ArrayList<>();
@@ -913,7 +918,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							.apply("find_in_set(mblno,'" + mblno + "')"));
 
 						if (!billsList.isEmpty()) {
-							quantityCntrDescr = billsList.stream().map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
 							List<Long> billCorpId = billsList.stream().map(Bills::getCorpId).distinct().collect(Collectors.toList());
 							List<AgreementPriceItems> agreementPriceItemsList = new ArrayList<>();
 							List<AgreementPrice> agreementPriceList = agreementPriceService.list(new LambdaQueryWrapper<AgreementPrice>()
@@ -951,10 +955,12 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							finStlBills.setBillCorpNameAgreement(billCorpNameAgreement.toString());
 						}
 					}
-					finStlBills.setQuantityCntrDescr(quantityCntrDescr);
 					for (FinStlBillsItems item : reducelList) {
 						FinStlBillsItemsReports finStlBillsItemsReports = new FinStlBillsItemsReports();
-						finStlBillsItemsReports.setQuantityCntrTypesDescr(item.getQuantityCntrTypesDescr());
+						if (!billsList.isEmpty()) {
+							String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
+							finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);
+						}
 						finStlBillsItemsReports.setMblno(item.getMblno());
 						finStlBillsItemsReports.setBillNo(item.getBillNo());
 						BigDecimal currentStlAmountD = finStlBillsItems.stream()
@@ -1008,7 +1014,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FinStlBillsItems::getIsDeleted, 0)
 					.eq(FinStlBillsItems::getPid, finStlBills.getId());
 				List<FinStlBillsItems> finStlBillsItems = finStlBillsItemsService.list(lambdaQueryWrapper);
-				String quantityCntrDescr = "";
 				if (!finStlBillsItems.isEmpty()) {
 					List<FinStlBillsItems> reducelList = finStlBillsItems.stream().filter(distinctByKey(FinStlBillsItems::getMblno)).collect(Collectors.toList());
 					List<Bills> billsList = new ArrayList<>();
@@ -1018,13 +1023,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							.eq(Bills::getTenantId, AuthUtil.getTenantId())
 							.eq(Bills::getIsDeleted, 0)
 							.apply("find_in_set(mblno,'" + mblno + "')"));
-
-						if (!billsList.isEmpty()) {
-							quantityCntrDescr = billsList.stream().map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
-						}
 					}
 					for (FinStlBillsItems item : finStlBillsItems) {
 						FinStlBillsItemsReports finStlBillsItemsReports = new FinStlBillsItemsReports();
+						if (!billsList.isEmpty()) {
+							String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
+							finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);
+						}
 						finStlBillsItemsReports.setMblno(item.getMblno());
 						finStlBillsItemsReports.setBillNo(item.getBillNo());
 						finStlBillsItemsReports.setAccBillNo(item.getAccBillNo());
@@ -1045,7 +1050,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						finStlBillsItemsReportsList.add(finStlBillsItemsReports);
 					}
 				}
-				finStlBills.setQuantityCntrDescr(quantityCntrDescr);
 				finStlBills.setFinStlBillsItemsReportsList(finStlBillsItemsReportsList);
 				finStlBills.setDept(dept);
 				map.put(MagicValues.DATA, finStlBills);
@@ -1075,7 +1079,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FinStlBillsItems::getDc, "D")
 					.orderByDesc(FinStlBillsItems::getVesselCnName);
 				List<FinStlBillsItems> finStlBillsItems = finStlBillsItemsService.list(lambdaQueryWrapper);
-				String quantityCntrDescr = "";
 				if (!finStlBillsItems.isEmpty()) {
 					List<FinStlBillsItems> reducelList = finStlBillsItems.stream().filter(distinctByKey(FinStlBillsItems::getMblno)).collect(Collectors.toList());
 					List<Bills> billsList = new ArrayList<>();
@@ -1085,10 +1088,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							.eq(Bills::getTenantId, AuthUtil.getTenantId())
 							.eq(Bills::getIsDeleted, 0)
 							.apply("find_in_set(mblno,'" + mblno + "')"));
-
-						if (!billsList.isEmpty()) {
-							quantityCntrDescr = billsList.stream().map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
-						}
 					}
 					for (FinStlBillsItems item : finStlBillsItems) {
 						FinStlBillsItemsReports finStlBillsItemsReports = new FinStlBillsItemsReports();
@@ -1098,7 +1097,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						finStlBillsItemsReports.setAccBillNo(item.getAccBillNo());
 						finStlBillsItemsReports.setEtd(item.getEtd());
 						finStlBillsItemsReports.setVesselCnName(item.getVesselCnName() + "/" + item.getVoyageNo());
-						finStlBillsItemsReports.setQuantityCntrTypesDescr(item.getQuantityCntrTypesDescr());
+						if (!billsList.isEmpty()) {
+							String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
+							finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);
+						}
 						finStlBillsItemsReports.setPodCnName(item.getPodCnName());
 						if (MagicValues.D.equals(item.getDc())) {
 							if (MagicValues.CNY.equals(item.getCurCode())) {
@@ -1116,7 +1118,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						finStlBillsItemsReportsList.add(finStlBillsItemsReports);
 					}
 				}
-				finStlBills.setQuantityCntrDescr(quantityCntrDescr);
 				finStlBills.setFinStlBillsItemsReportsList(finStlBillsItemsReportsList);
 				finStlBills.setDept(dept);
 				map.put(MagicValues.DATA, finStlBills);
@@ -1145,7 +1146,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FinStlBillsItems::getDc, "C")
 					.orderByDesc(FinStlBillsItems::getVesselCnName);
 				List<FinStlBillsItems> finStlBillsItems = finStlBillsItemsService.list(lambdaQueryWrapper);
-				String quantityCntrDescr = "";
 				if (!finStlBillsItems.isEmpty()) {
 					List<FinStlBillsItems> reducelList = finStlBillsItems.stream().filter(distinctByKey(FinStlBillsItems::getMblno)).collect(Collectors.toList());
 					List<Bills> billsList = new ArrayList<>();
@@ -1155,10 +1155,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							.eq(Bills::getTenantId, AuthUtil.getTenantId())
 							.eq(Bills::getIsDeleted, 0)
 							.apply("find_in_set(mblno,'" + mblno + "')"));
-
-						if (!billsList.isEmpty()) {
-							quantityCntrDescr = billsList.stream().map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
-						}
 					}
 					for (FinStlBillsItems item : finStlBillsItems) {
 						FinStlBillsItemsReports finStlBillsItemsReports = new FinStlBillsItemsReports();
@@ -1168,7 +1164,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						finStlBillsItemsReports.setAccBillNo(item.getAccBillNo());
 						finStlBillsItemsReports.setEtd(item.getEtd());
 						finStlBillsItemsReports.setVesselCnName(item.getVesselCnName() + "/" + item.getVoyageNo());
-						finStlBillsItemsReports.setQuantityCntrTypesDescr(item.getQuantityCntrTypesDescr());
+						if (!billsList.isEmpty()) {
+							String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
+							finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);
+						}
 						finStlBillsItemsReports.setPodCnName(item.getPodCnName());
 						if (MagicValues.D.equals(item.getDc())) {
 							if (MagicValues.CNY.equals(item.getCurCode())) {
@@ -1186,7 +1185,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						finStlBillsItemsReportsList.add(finStlBillsItemsReports);
 					}
 				}
-				finStlBills.setQuantityCntrDescr(quantityCntrDescr);
 				finStlBills.setFinStlBillsItemsReportsList(finStlBillsItemsReportsList);
 				finStlBills.setDept(dept);
 				map.put(MagicValues.DATA, finStlBills);
@@ -1213,8 +1211,18 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FinInvoicesItems::getPid, finStlBills.getId());
 				List<FinInvoicesItems> finStlBillsItems = finInvoicesItemsService.list(lambdaQueryWrapper);
 				if (!finStlBillsItems.isEmpty()) {
+					List<Bills> billsList = new ArrayList<>();
+					String mblno = finStlBillsItems.stream().map(FinInvoicesItems::getMblno).collect(Collectors.joining(","));
+					billsList = billsService.list(new LambdaQueryWrapper<Bills>()
+						.eq(Bills::getTenantId, AuthUtil.getTenantId())
+						.eq(Bills::getIsDeleted, 0)
+						.apply("find_in_set(mblno,'" + mblno + "')"));
 					for (FinInvoicesItems item : finStlBillsItems) {
 						FinStlBillsItemsReports finStlBillsItemsReports = new FinStlBillsItemsReports();
+						if (!billsList.isEmpty()) {
+							String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
+							finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);
+						}
 						finStlBillsItemsReports.setMblno(item.getMblno());
 						finStlBillsItemsReports.setBillNo(item.getBillNo());
 						finStlBillsItemsReports.setAccBillNo(item.getAccBillNo());
@@ -1267,6 +1275,12 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.orderByDesc(FinInvoicesItems::getVesselCnName);
 				List<FinInvoicesItems> finStlBillsItems = finInvoicesItemsService.list(lambdaQueryWrapper);
 				if (!finStlBillsItems.isEmpty()) {
+					List<Bills> billsList = new ArrayList<>();
+					String mblno = finStlBillsItems.stream().map(FinInvoicesItems::getMblno).collect(Collectors.joining(","));
+					billsList = billsService.list(new LambdaQueryWrapper<Bills>()
+						.eq(Bills::getTenantId, AuthUtil.getTenantId())
+						.eq(Bills::getIsDeleted, 0)
+						.apply("find_in_set(mblno,'" + mblno + "')"));
 					for (FinInvoicesItems item : finStlBillsItems) {
 						FinStlBillsItemsReports finStlBillsItemsReports = new FinStlBillsItemsReports();
 						finStlBillsItemsReports.setMblno(item.getMblno());
@@ -1275,7 +1289,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						finStlBillsItemsReports.setAccBillNo(item.getAccBillNo());
 						finStlBillsItemsReports.setEtd(item.getEtd());
 						finStlBillsItemsReports.setVesselCnName(item.getVesselCnName() + "/" + item.getVoyageNo());
-						finStlBillsItemsReports.setQuantityCntrTypesDescr(item.getQuantityCntrTypesDescr());
+						if (!billsList.isEmpty()) {
+							String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
+							finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);
+						}
 						finStlBillsItemsReports.setPodCnName(item.getPodCnName());
 						if (MagicValues.D.equals(item.getDc())) {
 							if (MagicValues.CNY.equals(item.getCurCode())) {
@@ -1357,6 +1374,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					FeeCenterReports feeCenterReports = new FeeCenterReports();
+					feeCenterReports.setRemarks(item.getRemarks());
 					feeCenterReports.setPid(item.getPid());
 					feeCenterReports.setCorpCnName(item.getCorpCnName());
 					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
@@ -1368,7 +1386,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getAmount());
+					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				bills.setFeeCenterList(feeCenterReportsList);
@@ -1447,6 +1465,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					FeeCenterReports feeCenterReports = new FeeCenterReports();
+					feeCenterReports.setRemarks(item.getRemarks());
 					feeCenterReports.setPid(item.getPid());
 					feeCenterReports.setCorpCnName(item.getCorpCnName());
 					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
@@ -1458,7 +1477,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getAmount());
+					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				bills.setFeeCenterList(feeCenterReportsList);
@@ -1564,6 +1583,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 									List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 									for (FeeCenter fee : feeCenterList) {
 										FeeCenterReports feeCenterReports = new FeeCenterReports();
+										feeCenterReports.setRemarks(fee.getRemarks());
 										feeCenterReports.setPid(item.getId());
 										feeCenterReports.setFeeCnName(fee.getFeeCnName());
 										feeCenterReports.setDc(fee.getDc());
@@ -1714,6 +1734,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 							for (FeeCenter fee : feeCenters) {
 								FeeCenterReports feeCenterReports = new FeeCenterReports();
+								feeCenterReports.setRemarks(fee.getRemarks());
 								feeCenterReports.setPid(bills.getId());
 								feeCenterReports.setFeeCnName(fee.getFeeCnName());
 								feeCenterReports.setReportType(fee.getReportType());
@@ -1866,6 +1887,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 								for (FeeCenter fee : feeCenters) {
 									FeeCenterReports feeCenterReports = new FeeCenterReports();
+									feeCenterReports.setRemarks(fee.getRemarks());
 									feeCenterReports.setPid(bills.getId());
 									feeCenterReports.setFeeCnName(fee.getFeeCnName());
 									feeCenterReports.setDc(fee.getDc());
@@ -2014,6 +2036,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 							for (FeeCenter fee : feeCenterList1) {
 								FeeCenterReports feeCenterReports = new FeeCenterReports();
+								feeCenterReports.setRemarks(fee.getRemarks());
 								feeCenterReports.setPid(details.getId());
 								feeCenterReports.setFeeCnName(fee.getFeeCnName());
 								feeCenterReports.setDc(fee.getDc());
@@ -2398,6 +2421,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 									List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 									for (FeeCenter fee : feeCenterList) {
 										FeeCenterReports feeCenterReports = new FeeCenterReports();
+										feeCenterReports.setRemarks(fee.getRemarks());
 										feeCenterReports.setPid(item.getId());
 										feeCenterReports.setFeeCnName(fee.getFeeCnName());
 										feeCenterReports.setDc(fee.getDc());
@@ -2548,6 +2572,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 							for (FeeCenter fee : feeCenters) {
 								FeeCenterReports feeCenterReports = new FeeCenterReports();
+								feeCenterReports.setRemarks(fee.getRemarks());
 								feeCenterReports.setPid(bills.getId());
 								feeCenterReports.setFeeCnName(fee.getFeeCnName());
 								feeCenterReports.setReportType(fee.getReportType());
@@ -2700,6 +2725,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 								for (FeeCenter fee : feeCenters) {
 									FeeCenterReports feeCenterReports = new FeeCenterReports();
+									feeCenterReports.setRemarks(fee.getRemarks());
 									feeCenterReports.setPid(bills.getId());
 									feeCenterReports.setFeeCnName(fee.getFeeCnName());
 									feeCenterReports.setDc(fee.getDc());
@@ -2848,6 +2874,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 							for (FeeCenter fee : feeCenterList1) {
 								FeeCenterReports feeCenterReports = new FeeCenterReports();
+								feeCenterReports.setRemarks(fee.getRemarks());
 								feeCenterReports.setPid(details.getId());
 								feeCenterReports.setFeeCnName(fee.getFeeCnName());
 								feeCenterReports.setDc(fee.getDc());
@@ -3187,6 +3214,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 								for (FeeCenter fee : feeCenterList) {
 									FeeCenterReports feeCenterReports = new FeeCenterReports();
+									feeCenterReports.setRemarks(fee.getRemarks());
 									feeCenterReports.setPid(item.getId());
 									feeCenterReports.setFeeCnName(fee.getFeeCnName());
 									feeCenterReports.setDc(fee.getDc());
@@ -3256,6 +3284,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 						for (FeeCenter fee : feeCenters) {
 							FeeCenterReports feeCenterReports = new FeeCenterReports();
+							feeCenterReports.setRemarks(fee.getRemarks());
 							feeCenterReports.setPid(bills.getId());
 							feeCenterReports.setFeeCnName(fee.getFeeCnName());
 							feeCenterReports.setDc(fee.getDc());
@@ -3329,6 +3358,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 							for (FeeCenter fee : feeCenters) {
 								FeeCenterReports feeCenterReports = new FeeCenterReports();
+								feeCenterReports.setRemarks(fee.getRemarks());
 								feeCenterReports.setPid(bills.getId());
 								feeCenterReports.setFeeCnName(fee.getFeeCnName());
 								feeCenterReports.setDc(fee.getDc());
@@ -3395,6 +3425,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 						for (FeeCenter fee : feeCenterList1) {
 							FeeCenterReports feeCenterReports = new FeeCenterReports();
+							feeCenterReports.setRemarks(fee.getRemarks());
 							feeCenterReports.setPid(details.getId());
 							feeCenterReports.setFeeCnName(fee.getFeeCnName());
 							feeCenterReports.setDc(fee.getDc());
@@ -3634,6 +3665,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					FeeCenterReports feeCenterReports = new FeeCenterReports();
+					feeCenterReports.setRemarks(item.getRemarks());
 					feeCenterReports.setPid(item.getPid());
 					feeCenterReports.setCorpCnName(item.getCorpCnName());
 					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
@@ -3645,7 +3677,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocD(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getAmount());
+					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				bills.setFeeCenterList(feeCenterReportsList);
@@ -3740,6 +3772,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					FeeCenterReports feeCenterReports = new FeeCenterReports();
+					feeCenterReports.setRemarks(item.getRemarks());
 					feeCenterReports.setPid(item.getPid());
 					feeCenterReports.setCorpCnName(item.getCorpCnName());
 					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
@@ -3751,7 +3784,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getAmount());
+					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				bills.setFeeCenterList(feeCenterReportsList);
@@ -3805,6 +3838,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 					for (FeeCenter fee : feeCenters) {
 						FeeCenterReports feeCenterReports = new FeeCenterReports();
+						feeCenterReports.setRemarks(fee.getRemarks());
 						feeCenterReports.setPid(bills.getId());
 						feeCenterReports.setFeeCnName(fee.getFeeCnName());
 						feeCenterReports.setDc(fee.getDc());
@@ -3968,6 +4002,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					FeeCenterReports feeCenterReports = new FeeCenterReports();
+					feeCenterReports.setRemarks(item.getRemarks());
 					feeCenterReports.setPid(item.getPid());
 					feeCenterReports.setCorpCnName(item.getCorpCnName());
 					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
@@ -3979,7 +4014,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocD(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getAmount());
+					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				bills.setFeeCenterList(feeCenterReportsList);
@@ -4063,6 +4098,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					FeeCenterReports feeCenterReports = new FeeCenterReports();
+					feeCenterReports.setRemarks(item.getRemarks());
 					feeCenterReports.setPid(item.getPid());
 					feeCenterReports.setCorpCnName(item.getCorpCnName());
 					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
@@ -4074,7 +4110,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getAmount());
+					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				bills.setFeeCenterList(feeCenterReportsList);

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -227,10 +227,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.bill_date &gt;= #{fee.etdStart}
+                and acc.account_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.bill_date &lt;= #{fee.etdEnd}
+                and acc.account_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -307,10 +307,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.bill_date &gt;= #{fee.etdStart}
+                and acc.account_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.bill_date &lt;= #{fee.etdEnd}
+                and acc.account_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -394,10 +394,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.bill_date &gt;= #{fee.etdStart}
+                and acc.account_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.bill_date &lt;= #{fee.etdEnd}
+                and acc.account_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -483,10 +483,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.bill_date &gt;= #{fee.etdStart}
+                and acc.account_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.bill_date &lt;= #{fee.etdEnd}
+                and acc.account_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -572,10 +572,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.bill_date &gt;= #{fee.etdStart}
+                and acc.account_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.bill_date &lt;= #{fee.etdEnd}
+                and acc.account_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -662,10 +662,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.bill_date &gt;= #{fee.etdStart}
+                and acc.account_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.bill_date &lt;= #{fee.etdEnd}
+                and acc.account_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -754,10 +754,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.bill_date &gt;= #{fee.etdStart}
+                and acc.account_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.bill_date &lt;= #{fee.etdEnd}
+                and acc.account_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -834,10 +834,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.bill_date &gt;= #{fee.etdStart}
+                and acc.account_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.bill_date &lt;= #{fee.etdEnd}
+                and acc.account_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>