From baed9b68c8cb6b693d3c010f039d2c55bf242e0e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 十月 2025 18:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java
index 904166f..6351495 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java
@@ -21,7 +21,7 @@
import com.ruoyi.system.dto.AddReimbursementDTO;
import com.ruoyi.system.emums.ApprovalStatusEnum;
import com.ruoyi.system.emums.ApprovalTypeEnum;
-import com.ruoyi.system.model.OaApprovalApplicationAdvertisement;
+import com.ruoyi.system.model.OaApprovalApplicationAd;
import com.ruoyi.system.model.OaApprovalApplicationAttendance;
import com.ruoyi.system.model.OaApprovalApplicationContact;
import com.ruoyi.system.model.OaApprovalApplicationContract;
@@ -32,7 +32,7 @@
import com.ruoyi.system.model.OaApprovalApplications;
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.OaApprovalApplicationAdvertisementService;
+import com.ruoyi.system.service.OaApprovalApplicationAdService;
import com.ruoyi.system.service.OaApprovalApplicationAttendanceService;
import com.ruoyi.system.service.OaApprovalApplicationContactService;
import com.ruoyi.system.service.OaApprovalApplicationContractService;
@@ -80,7 +80,7 @@
@Resource
private OaApprovalApplicationsService approvalApplicationsService;
@Resource
- private OaApprovalApplicationAdvertisementService approvalApplicationAdvertisementService;
+ private OaApprovalApplicationAdService approvalApplicationAdvertisementService;
@Resource
private OaApprovalApplicationContactService approvalApplicationContactService;
@Resource
@@ -601,15 +601,15 @@
.one();
oaApprovalApplications.setCurrentFlowNodeId(approvalFlowNode.getId());
approvalApplicationsService.save(oaApprovalApplications);
- OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = new OaApprovalApplicationAdvertisement();
- oaApprovalApplicationAdvertisement.setApprovalApplicationId(oaApprovalApplications.getId());
- oaApprovalApplicationAdvertisement.setTitle(dto.getTitle());
- oaApprovalApplicationAdvertisement.setContent(dto.getContent());
- oaApprovalApplicationAdvertisement.setNumber(dto.getNumber());
- oaApprovalApplicationAdvertisement.setTotalAmount(dto.getTotalAmount());
- oaApprovalApplicationAdvertisement.setSpec(dto.getSpec());
- oaApprovalApplicationAdvertisement.setStatus(false);
- approvalApplicationAdvertisementService.save(oaApprovalApplicationAdvertisement);
+ OaApprovalApplicationAd oaApprovalApplicationAd = new OaApprovalApplicationAd();
+ oaApprovalApplicationAd.setApprovalApplicationId(oaApprovalApplications.getId());
+ oaApprovalApplicationAd.setTitle(dto.getTitle());
+ oaApprovalApplicationAd.setContent(dto.getContent());
+ oaApprovalApplicationAd.setNumber(dto.getNumber());
+ oaApprovalApplicationAd.setTotalAmount(dto.getTotalAmount());
+ oaApprovalApplicationAd.setSpec(dto.getSpec());
+ oaApprovalApplicationAd.setStatus(false);
+ approvalApplicationAdvertisementService.save(oaApprovalApplicationAd);
// 根据节点类型 生成代办
oaApprovalTodoService.createApprovalTodos(oaApprovalApplications.getId(), code, approvalFlowNode,
Integer.valueOf(sysUser.getDeptId()));
--
Gitblit v1.7.1