project修改发版

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

@@ -223,13 +223,15 @@ 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
+			  .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)

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

@@ -253,7 +253,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());