project发版提交

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,
@@ -229,7 +230,7 @@ public class ProjectController {
 
 		  LambdaQueryWrapper<ServiceProjectItem> itemLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		  itemLambdaQueryWrapper
-			  .like(StringUtils.isNotBlank(userName),ServiceProjectItem::getUserName,userName)
+			  .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

@@ -265,6 +265,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 		//明细已结算之后, 修改主表的已收款项 和 未收款项
 		else if(status==5)
 		{
+			serviceProjectItem.setStatus(5);
 			serviceProjectItem.setPayTime(payTime);
 
 			ServiceProject targetServiceProject = serviceProjectMapper.selectById(serviceProjectItem.getPId());