From be9eaa59298523bb8eb644d8f38b507d24ca5fb7 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 11:47:36 +0800
Subject: [PATCH] 1.固定资产核算接口、采购异常类-至军泰伟业 2.选择工艺路线项目后选择工序,点击提交报错,修改bug

---
 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index e866bbf..404d594 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -15,6 +15,7 @@
 import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
 import com.ruoyi.approve.vo.ApproveProcessVO;
 import com.ruoyi.common.enums.FileNameType;
+import com.ruoyi.common.utils.OrderUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.other.service.impl.TempFileServiceImpl;
 import com.ruoyi.project.system.domain.SysDept;
@@ -25,6 +26,7 @@
 import com.ruoyi.sales.pojo.CommonFile;
 import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -87,6 +89,8 @@
         approveProcess.setApproveUserNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
         approveProcess.setApproveTime(StringUtils.isEmpty(approveProcessVO.getApproveTime()) ? null : dateFormat.parse(approveProcessVO.getApproveTime()));
         approveProcess.setApproveReason(approveProcessVO.getApproveReason());
+        approveProcess.setDeviceRepairId(approveProcessVO.getDeviceRepairId());
+        approveProcess.setMaintenancePrice(approveProcessVO.getMaintenancePrice());
         approveProcess.setApproveOverTime(null);
         approveProcess.setApproveStatus(0);
         approveProcess.setApproveDelete(0);
@@ -171,6 +175,7 @@
     @Override
     public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
         ApproveProcess approve = approveProcessMapper.selectById(approveGetAndUpdateVo.getId());
+        BeanUtils.copyProperties(approveGetAndUpdateVo, approve);
         approve.setApproveUserIds(approveGetAndUpdateVo.getApproveUserIds());
         approve.setApproveReason(approveGetAndUpdateVo.getApproveReason());
         SysUser sysUser = sysUserMapper.selectUserById(approveGetAndUpdateVo.getApproveUser());

--
Gitblit v1.9.3