admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-07-27 09:39:49 +08:00
parent d417d20c37
commit a6e4e7c3b2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
View File

@ -228,7 +228,7 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
BigDecimal pcfglMax = new BigDecimal(100).multiply(new BigDecimal(0.6)).setScale(2, RoundingMode.HALF_UP); BigDecimal pcfglMax = new BigDecimal(100).multiply(new BigDecimal(0.6)).setScale(2, RoundingMode.HALF_UP);
BigDecimal pzjlMax = new BigDecimal(100).multiply(new BigDecimal(0.4)).setScale(2, RoundingMode.HALF_UP); BigDecimal pzjlMax = new BigDecimal(100).multiply(new BigDecimal(0.4)).setScale(2, RoundingMode.HALF_UP);
if (list.size() > 0) { if (list.size() > 0) {
List<DangerousEngineeringRecord> list1 = list.stream().filter(l -> DateUtil.compare(DateUtil.parseDate(l.getPlanEndTime()), DateUtil.beginOfMonth(date), "yyyy-MM-dd") >= 0 List<DangerousEngineeringRecord> list1 = list.stream().filter(l -> l.getPlanEndTime() != null && l.getPlanStartTime() != null && DateUtil.compare(DateUtil.parseDate(l.getPlanEndTime()), DateUtil.beginOfMonth(date), "yyyy-MM-dd") >= 0
&& DateUtil.compare(DateUtil.parseDate(DateUtil.formatDateTime(DateUtil.endOfMonth(date))), DateUtil.parseDate(l.getPlanStartTime()), "yyyy-MM-dd") >= 0).collect(Collectors.toList()); && DateUtil.compare(DateUtil.parseDate(DateUtil.formatDateTime(DateUtil.endOfMonth(date))), DateUtil.parseDate(l.getPlanStartTime()), "yyyy-MM-dd") >= 0).collect(Collectors.toList());
int totalDay = 0; int totalDay = 0;
for (DangerousEngineeringRecord dangerousEngineeringRecord : list1) { for (DangerousEngineeringRecord dangerousEngineeringRecord : list1) {