提交发版

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -171,7 +171,7 @@ public class ProjectController {
 
 		if(!CollectionUtils.isEmpty(serviceProjectItems))
 		{
-			String[] str = new String[]{"录入","已请核","审核中","审核通过","正在结算","结算完成","追加","退费"};
+			String[] str = new String[]{"录入","已请核","审核中","审核通过","正在结算","结算完成","","追加","退费"};
 			serviceProjectItems.forEach(e->{
 
 				e.setStrStatus(str[e.getStatus()]);
@@ -272,7 +272,7 @@ public class ProjectController {
 		  IPage<ServiceProjectItem> iPage = serviceProjectItemService.page(page, itemLambdaQueryWrapper);
 		  if(!CollectionUtils.isEmpty(iPage.getRecords()))
 		  {
-			  String[] str = new String[]{"录入","已请核","审核中","审核通过","正在结算","结算完成","追加","退费"};
+			  String[] str = new String[]{"录入","已请核","审核中","审核通过","正在结算","结算完成","","追加","退费"};
 			  iPage.getRecords().forEach(e->{
 				  e.setStrStatus(str[e.getStatus()]);
 				  Long corpId = serviceProjectService.getOne(new LambdaQueryWrapper<ServiceProject>()

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/ServiceProjectServiceImpl.java

@@ -212,7 +212,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 		itemLambdaQueryWrapper.eq(ServiceProjectItem::getPId,serviceProject.getId());
 		List<ServiceProjectItem> serviceProjectItems = serviceProjectItemMapper.selectList(itemLambdaQueryWrapper);
         //检查金额是否超额
-		checkMoney(serviceProject.getId(),serviceProjectItems);
+		//checkMoney(serviceProject.getId(),serviceProjectItems);
         //绑定主表对应的额度
 		BigDecimal totalServiceCharge = serviceProjectItems.stream().filter(e -> e.getServiceCharge() != null).map(ServiceProjectItem::getServiceCharge).reduce(BigDecimal.ZERO, BigDecimal::add);
 		BigDecimal totalMatMoney = serviceProjectItems.stream().filter(e -> e.getMatMoney() != null).map(ServiceProjectItem::getMatMoney).reduce(BigDecimal.ZERO, BigDecimal::add);