同海-统计列表-退费负数问题解决

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

@@ -74,6 +74,23 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 		  if(!CollectionUtils.isEmpty(itemList))
 		  {
 			  itemList.forEach(e->{
+			  	//如果是退费,需要取反
+				  if(e.getProjectType()==2)
+				  {
+					  if(e.getServiceCharge().compareTo(BigDecimal.ZERO)==1)
+					  {
+						  e.setServiceCharge(e.getServiceCharge()!=null?e.getServiceCharge().negate():new BigDecimal("0"));
+					  }
+					  if(e.getMatMoney().compareTo(BigDecimal.ZERO)==1)
+					  {
+						  e.setMatMoney(e.getMatMoney()!=null?e.getMatMoney().negate():new BigDecimal("0"));
+					  }
+					  if(e.getAmount().compareTo(BigDecimal.ZERO)==1)
+					  {
+						  e.setAmount(e.getAmount()!=null?e.getAmount().negate():new BigDecimal("0"));
+					  }
+
+				  }
 			  	e.setTenantId(AuthUtil.getTenantId());
 			  	e.setPId(serviceProject.getId());
                 e.setCreateTime(new Date());
@@ -116,6 +133,22 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 				  //修改
 				  if(null!=ls.getId())
 				  {
+					  if(ls.getProjectType()==2)
+					  {
+					  	  if(ls.getServiceCharge().compareTo(BigDecimal.ZERO)==1)
+					  	   {
+							 ls.setServiceCharge(ls.getServiceCharge()!=null?ls.getServiceCharge().negate():new BigDecimal("0"));
+					  	   }
+						  if(ls.getMatMoney().compareTo(BigDecimal.ZERO)==1)
+						  {
+							  ls.setMatMoney(ls.getMatMoney()!=null?ls.getMatMoney().negate():new BigDecimal("0"));
+						  }
+						  if(ls.getAmount().compareTo(BigDecimal.ZERO)==1)
+						  {
+							  ls.setAmount(ls.getAmount()!=null?ls.getAmount().negate():new BigDecimal("0"));
+						  }
+
+					  }
 					  ls.setUpdateUser(SecureUtil.getUserId());
 					  ls.setUpdateTime(new Date());
 					  ls.setUpdateUserName(SecureUtil.getUser().getUserName());
@@ -124,6 +157,22 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 				  //新增
 				  else
 				  {
+					  if(ls.getProjectType()==2)
+					  {
+						  if(ls.getServiceCharge().compareTo(BigDecimal.ZERO)==1)
+						  {
+							  ls.setServiceCharge(ls.getServiceCharge()!=null?ls.getServiceCharge().negate():new BigDecimal("0"));
+						  }
+						  if(ls.getMatMoney().compareTo(BigDecimal.ZERO)==1)
+						  {
+							  ls.setMatMoney(ls.getMatMoney()!=null?ls.getMatMoney().negate():new BigDecimal("0"));
+						  }
+						  if(ls.getAmount().compareTo(BigDecimal.ZERO)==1)
+						  {
+							  ls.setAmount(ls.getAmount()!=null?ls.getAmount().negate():new BigDecimal("0"));
+						  }
+
+					  }
 					  ls.setTenantId(AuthUtil.getTenantId());
 				  	  ls.setPId(serviceProject.getId());
 					  ls.setCreateTime(new Date());