From 81be4a862c884c94bd01568331978a438a0757d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Mon, 27 Oct 2025 19:57:35 +0800 Subject: [PATCH] =?UTF-8?q?10-27-=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/xzd/domain/XzdProject.java | 5 ++ .../xzd/domain/XzdProjectManagerApproval.java | 5 ++ .../dromara/xzd/domain/bo/XzdProjectBo.java | 5 ++ .../bo/XzdProjectManagerApprovalBo.java | 5 ++ .../vo/XzdProjectManagerApprovalVo.java | 5 ++ .../dromara/xzd/domain/vo/XzdProjectVo.java | 5 ++ .../impl/XzdContractAccountServiceImpl.java | 4 +- .../impl/XzdContractAgreementServiceImpl.java | 4 +- .../impl/XzdContractChangeServiceImpl.java | 4 +- .../impl/XzdContractDetailsServiceImpl.java | 4 +- ...ContractProgressSettlementServiceImpl.java | 4 +- .../XzdContractTerminationServiceImpl.java | 4 +- .../XzdProjectManagerApprovalServiceImpl.java | 54 +++++++++++++++++++ .../service/impl/XzdProjectServiceImpl.java | 52 ++++++++++++++++++ .../impl/XzdSupplierInfoServiceImpl.java | 4 +- ...rkcontractCompletionAdjustServiceImpl.java | 4 +- .../impl/XzdContractPaymentServiceImpl.java | 29 ++++++++++ .../impl/XzdSkyfkFbhtfkServiceImpl.java | 33 +++++++++++- .../service/impl/XzdSpykpKpsqServiceImpl.java | 29 ++++++++++ .../impl/XzdSpykpSjsqdServiceImpl.java | 29 ++++++++++ 20 files changed, 270 insertions(+), 18 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java index 574c8bbe..6925399a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java @@ -32,6 +32,11 @@ public class XzdProject extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 区域码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectManagerApproval.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectManagerApproval.java index dedb906d..73ca4739 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectManagerApproval.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectManagerApproval.java @@ -29,6 +29,11 @@ public class XzdProjectManagerApproval extends BaseEntity { @TableId(value = "id") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 区域码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java index 8acf9ddb..969714b6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java @@ -28,6 +28,11 @@ public class XzdProjectBo extends BaseEntity { */ private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 区域码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectManagerApprovalBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectManagerApprovalBo.java index c51b1452..c88be4f3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectManagerApprovalBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectManagerApprovalBo.java @@ -29,6 +29,11 @@ public class XzdProjectManagerApprovalBo extends BaseEntity { @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 区域码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectManagerApprovalVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectManagerApprovalVo.java index 4496957d..685303fd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectManagerApprovalVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectManagerApprovalVo.java @@ -32,6 +32,11 @@ public class XzdProjectManagerApprovalVo implements Serializable { @ExcelProperty(value = "主键ID") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 区域码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java index a2ed2000..b694707c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java @@ -37,6 +37,11 @@ public class XzdProjectVo implements Serializable { @ExcelProperty(value = "主键ID") private Long id; + /** + * 审核状态 + */ + private String shzt; + /** * 区域码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java index afeb7add..8e01ae49 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java @@ -448,7 +448,7 @@ public class XzdContractAccountServiceImpl extends ServiceImpl implements IXzdProjectManagerApprovalService { private final XzdProjectManagerApprovalMapper baseMapper; @@ -182,4 +188,52 @@ public class XzdProjectManagerApprovalServiceImpl extends ServiceImpl 0; } + + /** + * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等) + * 正常使用只需#processEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processEvent 参数 + */ + @EventListener(condition = "#processEvent.flowCode.endsWith('ManagerApproval')") + @Transactional + public void processPlansHandler(ProcessEvent processEvent) { + log.info("项目经理推荐及审批审核任务执行了{}", processEvent.toString()); + String id = processEvent.getBusinessId(); + XzdProjectManagerApproval byId = this.getById(Long.valueOf(id)); + byId.setShzt(processEvent.getStatus()); + boolean b = this.updateById(byId); + if (!b) { + log.error("供应商审核任务更新状态失败"); + } + } + + /** + * 执行任务创建监听 + * 示例：也可通过 @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断 + * 在方法中判断流程节点key + * if ("xxx".equals(processTaskEvent.getNodeCode())) { + * //执行业务逻辑 + * } + * + * @param processTaskEvent 参数 + */ + @org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('ManagerApproval')") + public void processTaskPlansHandlerEquipmentList(ProcessTaskEvent processTaskEvent) { + log.info("项目经理推荐及审批审核任务创建了{}", processTaskEvent.toString()); + } + + /** + * 监听删除流程事件 + * 正常使用只需#processDeleteEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processDeleteEvent 参数 + */ + @EventListener(condition = "#processDeleteEvent.flowCode.endsWith('ManagerApproval')") + public void processDeletePlansHandlerEquipmentList(ProcessDeleteEvent processDeleteEvent) { + log.info("项目经理推荐及审批计划删除流程事件{}", processDeleteEvent.toString()); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java index 6aeae358..5c736252 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java @@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.event.ProcessDeleteEvent; +import org.dromara.common.core.domain.event.ProcessEvent; +import org.dromara.common.core.domain.event.ProcessTaskEvent; import org.dromara.common.core.service.XzdProjectService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; @@ -27,6 +30,7 @@ import org.dromara.xzd.service.IXzdCorrespondentList; import org.dromara.xzd.service.IXzdProjectService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -677,4 +681,52 @@ public class XzdProjectServiceImpl extends ServiceImpl