lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
lcj
2025-09-30 23:16:30 +08:00
parent 334ff20129
commit 3630c13f59
3 changed files with 190 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueRangeServiceImpl.java
View File

@ -175,6 +175,17 @@ public class OutConstructionValueRangeServiceImpl extends ServiceImpl<OutConstru
OutConstructionValueRange byId = this.getById(Convert.toLong(processEvent.getBusinessId()));
byId.setAuditStatus(processEvent.getStatus());
if (processEvent.getSubmit()) {
// 设置确认数量默认值
List<OutConstructionValue> valueList = constructionValueService.lambdaQuery()
.eq(OutConstructionValue::getRangeId, byId.getId())
.list();
List<OutConstructionValue> list = valueList.stream()
.filter(value -> value.getConfirmNum() == null || value.getConfirmNum() == 0)
.peek(value -> value.setConfirmNum(value.getArtificialNum() != null ? value.getArtificialNum() : value.getUavNum()))
.toList();
if (CollUtil.isNotEmpty(list)) {
constructionValueService.updateBatchById(list);
}
byId.setAuditStatus(BusinessStatusEnum.WAITING.getStatus());
}
// 如果为完成状态，则锁定对应进度计划详情

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java
View File

@ -965,7 +965,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
value.setArtificialNum(finishedNumber.subtract(aiFill).intValue());
value.setUavNum(aiFill.intValue());
value.setPlanNum(planDetail.getPlanNumber().intValue());
value.setReportDate(now.minusDays(1));
value.setReportDate(planDetail.getDate());
value.setPlanDate(planDetail.getDate());
// 计算产值
BigDecimal constructionPrice = category.getConstructionPrice();
@ -1042,7 +1042,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
value.setArtificialNum(finishedNumber.subtract(aiFill).intValue());
value.setUavNum(aiFill.intValue());
value.setPlanNum(planDetail.getPlanNumber().intValue());
value.setReportDate(now.minusDays(1));
value.setReportDate(planDetail.getDate());
value.setPlanDate(planDetail.getDate());
// 计算产值
BigDecimal constructionPrice = category.getConstructionPrice();