DeXun/be-process-control-system
9
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix():时间排序

Browse Source
This commit is contained in:
Penknife
2025-01-18 13:10:11 +08:00
parent a8c0907d69
commit 7933570244
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
View File

@@ -78,7 +78,7 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00"); queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00");
queryWrapper.le("start_date", form.getEndDate() + " 23:59:59"); queryWrapper.le("start_date", form.getEndDate() + " 23:59:59");
queryWrapper.orderByDesc("end_data");
return baseMapper.selectList(queryWrapper); return baseMapper.selectList(queryWrapper);
} }
} }

3
business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java
View File

@@ -23,7 +23,8 @@ public class ProStoppageServiceImpl extends ServiceImpl<ProStoppageMapper, ProSt
queryWrapper.ge("end_date", form.getStartDate() + " 00:00:00") queryWrapper.ge("end_date", form.getStartDate() + " 00:00:00")
.le("end_date", form.getEndDate() + " 23:59:59") .le("end_date", form.getEndDate() + " 23:59:59")
.ge("duration", 300); .ge("duration", 300)
.orderByDesc("end_date");
List<ProStoppage> list = baseMapper.selectList(queryWrapper); List<ProStoppage> list = baseMapper.selectList(queryWrapper);
list.forEach(item->item.setDuration(item.getDuration().divide(BigDecimal.valueOf(60),2))); list.forEach(item->item.setDuration(item.getDuration().divide(BigDecimal.valueOf(60),2)));