Browse Source

统计分析,提成统计业务日期改为任务开始日期

wangzhuo 2 years ago
parent
commit
0d02b5a6ea

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

@@ -1045,8 +1045,9 @@ public class ProjectController {
 			.eq(ServiceProjectItem::getTenantId, AuthUtil.getTenantId())
 			.ge(StringUtils.isNotBlank(beginTimeStart), ServiceProjectItem::getBeginTime, beginTimeStart)
 			.le(StringUtils.isNotBlank(beginTimeEnd), ServiceProjectItem::getBeginTime, beginTimeEnd)
-			.ge(StringUtils.isNotBlank(actualDateStart), ServiceProjectItem::getActualDate, actualDateStart)
-			.le(StringUtils.isNotBlank(actualDateEnd), ServiceProjectItem::getActualDate, actualDateEnd);
+			.ge(StringUtils.isNotBlank(actualDateStart), ServiceProjectItem::getCreateTime, actualDateStart)
+			.le(StringUtils.isNotBlank(actualDateEnd), ServiceProjectItem::getCreateTime, actualDateEnd)
+			.orderByDesc(ServiceProjectItem::getCreateTime);
 
 		// 承做人
 		if (StringUtils.isNotBlank(userName)) {