提交保存修改

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -851,32 +851,9 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 		//绑定开票信息
 		List<InvoiceItem> invoiceItemList = settlementDTO.getInvoiceItemList();
-		if(CollectionUtils.isNotEmpty(invoiceItemList))
-		{
-			invoiceItemList.forEach(e->{
-				 //新增
-				if(e.getId()==null)
-				 {
-				 	e.setPid(settlementDTO.getId());
-				 	e.setCreateTime(new Date());
-				 	e.setTenantId(AuthUtil.getTenantId());
-				 	e.setCreateUser(AuthUtil.getUserId());
-				 	invoiceItemMapper.insert(e);
-				 }
-				//修改
-				else
-				{
-					e.setUpdateTime(new Date());
-					e.setUpdateUser(AuthUtil.getUserId());
-					invoiceItemMapper.updateById(e);
-				}
-			});
 
 
 
-		}
-
-
 		Settlement model = new Settlement();
 		BeanUtils.copyProperties(settlementDTO, model);
 		List<Files> filesList = settlementDTO.getFilesList();
@@ -903,7 +880,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			settlementDTO.setFinanceStatus("待结算");
 			settlementDTO.setCreateTime(new Date());
 			settlementDTO.setCreateUserName(AuthUtil.getUserName());
-			if (CollectionUtils.isNotEmpty(itemsList)) {
+			if (CollectionUtils.isNotEmpty(itemsList))
+			{
 				itemsList.forEach(e -> {
 
 					e.setPid(model.getId());
@@ -914,6 +892,18 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 					itemsMapper.insert(e);
 				});
 			}
+			if(CollectionUtils.isNotEmpty(invoiceItemList))
+			{
+				invoiceItemList.forEach(l->{
+					l.setPid(settlementDTO.getId());
+					l.setCreateTime(new Date());
+					l.setTenantId(AuthUtil.getTenantId());
+					l.setCreateUser(AuthUtil.getUserId());
+					invoiceItemMapper.insert(l);
+				});
+			}
+
+
 		}
 		//主表更新, 从表视情况更新新增
 		else {
@@ -946,6 +936,28 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				});
 			}
 
+			if(CollectionUtils.isNotEmpty(invoiceItemList))
+			{
+				invoiceItemList.forEach(e->{
+					//新增
+					if(e.getId()==null)
+					{
+						e.setPid(settlementDTO.getId());
+						e.setCreateTime(new Date());
+						e.setTenantId(AuthUtil.getTenantId());
+						e.setCreateUser(AuthUtil.getUserId());
+						invoiceItemMapper.insert(e);
+					}
+					//修改
+					else
+					{
+						e.setUpdateTime(new Date());
+						e.setUpdateUser(AuthUtil.getUserId());
+						invoiceItemMapper.updateById(e);
+					}
+				});
+			}
+
 		}
 		return settlementDTO;
 	}