提交发版

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

@@ -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

@@ -282,7 +282,8 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 		else if(status==6)
 		{
 			ServiceProject targetServiceProject = serviceProjectMapper.selectById(serviceProjectItem.getPId());
-
+			//status=6代表撤回, item状态回到4
+			serviceProjectItem.setStatus(4);
 			//撤回时候,主表已收款项减少
 			targetServiceProject.setSettlmentAmount(targetServiceProject.getSettlmentAmount().subtract(serviceProjectItem.getAmount()));
 			//撤回时候,主表未收款项增加
@@ -292,11 +293,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 			targetServiceProject.setUpdateUserName(SecureUtil.getUser().getUserName());
 			serviceProjectMapper.updateById(targetServiceProject);
 		}
-		//status=6代表撤回, item状态回到4
-		if(status==6)
-		{
-			serviceProjectItem.setStatus(4);
-		}
+
 		else
 		{
 			serviceProjectItem.setStatus(status);