Merge remote-tracking branch 'origin/dev' into dev

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

@@ -74,7 +74,7 @@ public class ProjectController {
 			.eq(ServiceProject::getTenantId, AuthUtil.getTenantId())
 			.like(StringUtils.isNotBlank(dutyName), ServiceProject::getDutyName, dutyName)
 			.like(StringUtils.isNotBlank(remark), ServiceProject::getRemark, remark)
-			.like(StringUtils.isNotBlank(corpAttn), ServiceProject::getCorpAttn, corpAttn)
+			.eq(StringUtils.isNotBlank(corpAttn), ServiceProject::getCorpAttn, corpAttn)
 			.like(StringUtils.isNotBlank(cName), ServiceProject::getCName, cName)
 			.like(StringUtils.isNotBlank(code), ServiceProject::getCode, code)
 			.eq(StringUtils.isNotBlank(corpId), ServiceProject::getCorpId, corpId)
@@ -213,6 +213,7 @@ public class ProjectController {
 						  @RequestParam(name = "cornId",  required = false) Long cornId,
 						  @RequestParam(name = "deptName",  required = false) String deptName,
 
+
 						  @RequestParam(name = "actualDate",  required = false) String actualDate,
 						  @RequestParam(name = "userName",  required = false) String userName,
 						  @RequestParam(name = "deptid",  required = false) Long deptid,
@@ -222,14 +223,16 @@ public class ProjectController {
 						  @RequestParam(name = "createStartTime",  required = false) String createStartTime,
 						  @RequestParam(name = "createEndTime",  required = false) String createEndTime,
 						  @RequestParam(name = "beginStartTime",  required = false) String beginStartTime,
-						  @RequestParam(name = "beginEndTime",  required = false) String beginEndTime
+						  @RequestParam(name = "beginEndTime",  required = false) String beginEndTime,
+						  @RequestParam(name = "projectType",  required = false) Integer projectType
 						 )
 	{
 		List<String> listStatus=Arrays.asList(status.split(","));
 
 		  LambdaQueryWrapper<ServiceProjectItem> itemLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		  itemLambdaQueryWrapper
-			  .like(StringUtils.isNotBlank(userName),ServiceProjectItem::getUserName,userName)
+			  .eq(projectType!=null,ServiceProjectItem::getProjectType,projectType)
+			  .eq(StringUtils.isNotBlank(userName),ServiceProjectItem::getUserName,userName)
 			  .eq(ServiceProjectItem::getTenantId,AuthUtil.getTenantId())
 			  .between(StringUtils.isNotBlank(beginStartTime)&&StringUtils.isNotBlank(beginEndTime),ServiceProjectItem::getBeginTime,beginStartTime,beginEndTime)
 			  .between(StringUtils.isNotBlank(createStartTime)&&StringUtils.isNotBlank(createEndTime),ServiceProjectItem::getCreateTime,createStartTime,createEndTime)

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());
@@ -253,7 +302,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 		}
 		//明细已请核之后, 修改主表的status状态为1
 		if(status==1)
-		{
+		{	serviceProjectItem.setStatus(1);
 			ServiceProject serviceProject=new ServiceProject();
 			serviceProject.setStatus(1);
 			serviceProject.setId(serviceProjectItem.getPId());
@@ -265,6 +314,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 		//明细已结算之后, 修改主表的已收款项 和 未收款项
 		else if(status==5)
 		{
+			serviceProjectItem.setStatus(5);
 			serviceProjectItem.setPayTime(payTime);
 
 			ServiceProject targetServiceProject = serviceProjectMapper.selectById(serviceProjectItem.getPId());