2024年1月25日17:44:22

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/amends/entity/Amends.java

@@ -509,5 +509,17 @@ public class Amends implements Serializable {
 	@TableField(exist = false)
 	private String businessTypeCode;
 
+	/**
+	 * 默认团队id
+	 */
+	@ApiModelProperty(value = "默认团队id")
+	private String teamId;
+
+	/**
+	 * 默认团队名
+	 */
+	@ApiModelProperty(value = "默认团队名")
+	private String teamName;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/vo/FinAccBillsVO.java

@@ -288,4 +288,9 @@ public class FinAccBillsVO extends FinAccBills {
 	 */
 	private BigDecimal reconciliationCurrentAmount;
 
+	/**
+	 * 本次申请发票金额
+	 */
+	private BigDecimal appliedInvoiceCurrentAmount;
+
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/stl/entity/FinStlBillsItems.java

@@ -702,5 +702,11 @@ public class FinStlBillsItems implements Serializable {
 	@TableField(exist = false)
 	private BigDecimal reconciliationCurrentAmount;
 
+	/**
+	 * 本次申请发票金额
+	 */
+	@TableField(exist = false)
+	private BigDecimal appliedInvoiceCurrentAmount;
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/controller/AmendsController.java

@@ -92,6 +92,9 @@ public class AmendsController extends BladeController {
 			.le(ObjectUtils.isNotNull(amends.getEtaEnd()), Amends::getEta, amends.getEtaEnd())
 			.eq(Amends::getIsDeleted, 0)
 			.orderByDesc(Amends::getCreateTime);
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
 		IPage<Amends> pages = amendsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/controller/FinAccBillsController.java

@@ -346,6 +346,8 @@ public class FinAccBillsController extends BladeController {
 			item.setAppliedCurrentStlAmount(item.getAmount().subtract(amount).subtract(item.getStlTtlAmount()));
 			item.setAppliedInvoiceCurrentStlAmount(item.getAmount().subtract(item.getStlTtlAmount()));
 			item.setReconciliationCurrentAmount(item.getAmount().subtract(item.getReconciliationAmount()));
+			BigDecimal invoice = item.getAppliedInvoiceAmount().subtract(item.getAppliedInvoiceAmountStl());
+			item.setAppliedInvoiceCurrentAmount(item.getAmount().subtract(invoice).subtract(item.getUninvoicedAmount()));
 			if ("2".equals(type)) {
 				//收
 				if ("D".equals(listAccBillVO.getDc())) {
@@ -417,6 +419,8 @@ public class FinAccBillsController extends BladeController {
 			BigDecimal amount = item.getAppliedAmount().subtract(item.getAppliedAmountStl());
 			item.setAppliedCurrentStlAmount(item.getAmount().subtract(amount).subtract(item.getStlTtlAmount()));
 			item.setAppliedInvoiceCurrentStlAmount(item.getAmount().subtract(item.getStlTtlAmount()));
+			BigDecimal invoice = item.getAppliedInvoiceAmount().subtract(item.getAppliedInvoiceAmountStl());
+			item.setAppliedInvoiceCurrentAmount(item.getAmount().subtract(invoice).subtract(item.getUninvoicedAmount()));
 			item.setReconciliationCurrentAmount(item.getAmount().subtract(item.getReconciliationAmount()));
 			if ("2".equals(type)) {
 				//收

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -196,7 +196,8 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 			data.setBranchId(branchId);
 			data.setDeptId(Long.parseLong(deptId));
 			data.setDeptName(deptName);
-
+			data.setTeamId(finAccBills.getTeamId());
+			data.setTeamId(finAccBills.getTeamName());
 			BusinessBillNo businessBillNo = new BusinessBillNo();
 			businessBillNo.setBusinessTypeId(businessType.getId());
 			businessBillNo.setCode(finAccBills.getBillNoFormat());
@@ -440,7 +441,9 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 
 	@Override
 	public List<FinAccBillsVO> listAccBill(ListAccBillVO finAccBills) {
-		finAccBills.setPostId(AuthUtil.getPostId());
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			finAccBills.setPostId(AuthUtil.getPostId());
+		}
 		return billsMapper.listAccBill(finAccBills);
 	}
 

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

@@ -1605,6 +1605,8 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 				item.setAppliedInvoiceCurrentStlAmount(item.getAmount().subtract(finAccBillsVO.getStlTtlAmount()));
 				item.setCurrentStlAmount(item.getAmount().subtract(finAccBillsVO.getStlTtlAmount()));
 				item.setReconciliationCurrentAmount(item.getAmount().subtract(item.getReconciliationAmount()));
+				BigDecimal invoice = finAccBillsVO.getAppliedInvoiceAmount().subtract(finAccBillsVO.getAppliedInvoiceAmountStl());
+				item.setAppliedInvoiceCurrentAmount(finAccBillsVO.getAmount().subtract(invoice).subtract(finAccBillsVO.getUninvoicedAmount()));
 			} else {
 				item.setAppliedAmount(new BigDecimal("0.00"));
 				item.setAppliedInvoiceAmount(new BigDecimal("0.00"));