暂提

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

@@ -31,10 +31,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import javax.management.relation.RoleResult;
 import java.security.Security;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @NonDS
@@ -195,6 +192,10 @@ public class ProjectController {
 						  @RequestParam(name = "size", defaultValue = "10") Integer size,
 						  @RequestParam(name = "pname",  required = false) String pName,
 						  @RequestParam(name = "beginTime",  required = false) String beginTime,
+
+						  @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,
@@ -205,12 +206,6 @@ public class ProjectController {
 						  @RequestParam(name = "createEndTime",  required = false) String createEndTime
 						 )
 	{
-		List<User> users=null;
-		if(StringUtils.isNotBlank(userName))
-        {
-			users= userClient.userInfoByName(userName, AuthUtil.getTenantId());
-		}
-
 		List<String> listStatus=Arrays.asList(status.split(","));
 
 		  LambdaQueryWrapper<ServiceProjectItem> itemLambdaQueryWrapper=new LambdaQueryWrapper<>();
@@ -222,11 +217,32 @@ public class ProjectController {
 			  .apply(StringUtils.isNotBlank(beginTime),"date_format(begin_time,'%Y-%m-%d') = '"+beginTime+"'")
 			  .apply(StringUtils.isNotBlank(actualDate),"date_format(actual_date,'%Y-%m-%d') = '"+actualDate+"'");
 
-			  if(!CollectionUtils.isEmpty(users))
+		      //客户名称
+              if(cornId!=null)
+              {
+              	LambdaQueryWrapper<ServiceProject> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+				  lambdaQueryWrapper.eq(ServiceProject::getCorpId,cornId);
+				  List<ServiceProject> list = serviceProjectService.list(lambdaQueryWrapper);
+				  if(!CollectionUtils.isEmpty(list))
+				  {
+					  itemLambdaQueryWrapper.in(ServiceProjectItem::getPId,list.stream().map(ServiceProject::getId).collect(Collectors.toList()));
+				  }
+				  else
+				  {
+					  return R.data(Collections.EMPTY_LIST);
+				  }
+			  }
+
+              // 承做人
+			/*  if(!CollectionUtils.isEmpty(users))
 			  {
 				  List<Long> userIds = users.stream().map(User::getId).collect(Collectors.toList());
 				  itemLambdaQueryWrapper .in(ServiceProjectItem::getUserid,userIds);
 			  }
+			  else
+			  {
+			  	return R.data(Collections.EMPTY_LIST);
+			  }*/
 		      itemLambdaQueryWrapper.orderByDesc(ServiceProjectItem::getUpdateTime)
 			  .eq(deptid!=null,ServiceProjectItem::getDeptid,deptid)
 			  /*.eq(ServiceProjectItem::getIsDeleted,0)*/