暂提

blade-service-api/blade-project-api/src/main/java/org/springblade/project/entity/ServiceProjectItem.java

@@ -124,5 +124,9 @@ public class ServiceProjectItem extends TenantEntity implements Serializable {
 	@TableField(exist = false)
 	private String deptName;
 
+	private BigDecimal serviceCharge;
+
+	private BigDecimal matMoney;
+
 
 }

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

@@ -198,7 +198,11 @@ public class ProjectController {
 						  @RequestParam(name = "actualDate",  required = false) String actualDate,
 						  @RequestParam(name = "userName",  required = false) String userName,
 						  @RequestParam(name = "deptid",  required = false) Long deptid,
-						  @RequestParam(name = "status",  required = true) String status
+						  @RequestParam(name = "status",  required = true) String status,
+						  @RequestParam(name = "payStartTime",  required = false) String payStartTime,
+						  @RequestParam(name = "payEndTime",  required = false) String payEndTime,
+						  @RequestParam(name = "createStartTime",  required = false) String createStartTime,
+						  @RequestParam(name = "createEndTime",  required = false) String createEndTime
 						 )
 	{
 		List<User> users=null;
@@ -212,6 +216,8 @@ public class ProjectController {
 		  LambdaQueryWrapper<ServiceProjectItem> itemLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		  itemLambdaQueryWrapper
 			  .eq(ServiceProjectItem::getTenantId,AuthUtil.getTenantId())
+			  .between(StringUtils.isNotBlank(createStartTime)&&StringUtils.isNotBlank(createEndTime),ServiceProjectItem::getCreateTime,createStartTime,createEndTime)
+			  .between(StringUtils.isNotBlank(payStartTime)&&StringUtils.isNotBlank(payEndTime),ServiceProjectItem::getPayTime,payStartTime,payEndTime)
 			  .like(StringUtils.isNotBlank(pName),ServiceProjectItem::getPName,pName)
 			  .apply(StringUtils.isNotBlank(beginTime),"date_format(begin_time,'%Y-%m-%d') = '"+beginTime+"'")
 			  .apply(StringUtils.isNotBlank(actualDate),"date_format(actual_date,'%Y-%m-%d') = '"+actualDate+"'");