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

bug

Browse Source
This commit is contained in:
zt
2025-09-08 11:47:14 +08:00
parent 78829ef5e7
commit 998547e63f
1 changed files with 64 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,7 @@ public class OutMonthPlanServiceImpl extends ServiceImpl<OutMonthPlanMapper, Out
private final IBusMaterialsorderService busMaterialsorderService; private final IBusMaterialsorderService busMaterialsorderService;
/** /**
* 查询月度产值计划 * 查询月度产值计划
* *
@ -306,15 +307,32 @@ public class OutMonthPlanServiceImpl extends ServiceImpl<OutMonthPlanMapper, Out
updateById(outMonthPlan); updateById(outMonthPlan);
if (BusinessStatusEnum.FINISH.getStatus().equals(processEvent.getStatus())) { if (BusinessStatusEnum.FINISH.getStatus().equals(processEvent.getStatus())) {
OutMonthPlanAudit outMonthPlanAudit = getOutMonthPlanAudit(outMonthPlan); OutMonthPlanAudit outMonthPlanAudit = getOutMonthPlanAudit(outMonthPlan);
outMonthPlanAuditService.save(outMonthPlanAudit); outMonthPlanAuditService.saveOrUpdate(outMonthPlanAudit);
} }
} }
private static @NotNull OutMonthPlanAudit getOutMonthPlanAudit(OutMonthPlan outMonthPlan) { private OutMonthPlanAudit getOutMonthPlanAudit(OutMonthPlan outMonthPlan) {
OutMonthPlanAudit outMonthPlanAudit = new OutMonthPlanAudit();
OutMonthPlanAudit one = outMonthPlanAuditService.getOne(Wrappers.lambdaQuery(OutMonthPlanAudit.class)
.eq(OutMonthPlanAudit::getProjectId, outMonthPlan.getProjectId())
.eq(OutMonthPlanAudit::getPlanMonth, outMonthPlan.getPlanMonth())
.eq(OutMonthPlanAudit::getType, outMonthPlan.getType())
.last("limit 1")
);
OutMonthPlanAudit outMonthPlanAudit;
if (one != null) {
outMonthPlanAudit = one;
} else {
outMonthPlanAudit = new OutMonthPlanAudit();
outMonthPlanAudit.setProjectId(outMonthPlan.getProjectId());
outMonthPlanAudit.setPlanMonth(outMonthPlan.getPlanMonth());
outMonthPlanAudit.setType(outMonthPlan.getType());
}
outMonthPlanAudit.setProjectId(outMonthPlan.getProjectId()); outMonthPlanAudit.setProjectId(outMonthPlan.getProjectId());
outMonthPlanAudit.setPlanMonth(outMonthPlan.getPlanMonth()); outMonthPlanAudit.setPlanMonth(outMonthPlan.getPlanMonth());
outMonthPlanAudit.setType(outMonthPlan.getType());
BigDecimal designValue = BigDecimal.ZERO; BigDecimal designValue = BigDecimal.ZERO;
BigDecimal purchaseValue = BigDecimal.ZERO; BigDecimal purchaseValue = BigDecimal.ZERO;
BigDecimal constructionValue = BigDecimal.ZERO; BigDecimal constructionValue = BigDecimal.ZERO;
@ -336,7 +354,6 @@ public class OutMonthPlanServiceImpl extends ServiceImpl<OutMonthPlanMapper, Out
} }
/** /**
* 计算完成值和差异 * 计算完成值和差异
*/ */
@ -417,9 +434,6 @@ public class OutMonthPlanServiceImpl extends ServiceImpl<OutMonthPlanMapper, Out
} }
/** /**
* 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等) * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
* 正常使用只需#processEvent.flowCode=='leave1' * 正常使用只需#processEvent.flowCode=='leave1'