From f3a2e64d96e59bed492bb3eec8705a5f9ca269d7 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 15 一月 2026 09:11:37 +0800
Subject: [PATCH] 设备校准修改
---
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 57 +++++++++++++++++++--------------------------------------
1 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 130e5df..d9f4e5c 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -5,27 +5,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
-import com.ruoyi.approve.vo.ApproveProcessVO;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.dto.DeviceRepairDto;
-import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
-import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysDept;
-import com.ruoyi.project.system.domain.SysUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
@@ -53,35 +44,25 @@
@ApiModelProperty("娣诲姞璁惧鎶ヤ慨")
public AjaxResult add( @RequestBody DeviceRepair deviceRepair) throws Exception {
deviceRepairService.saveDeviceRepair(deviceRepair);
- ApproveProcessVO approveProcessVO = new ApproveProcessVO();
- LoginUser loginUser = SecurityUtils.getLoginUser();
- SysUser user = loginUser.getUser();
- // 鑾峰彇褰撳墠鐧诲綍鍏徃
- Long tenantId = loginUser.getTenantId();
- if(null != tenantId){
- LambdaQueryWrapper<DeviceRepair> QueryWrapper = new LambdaQueryWrapper<>();
- QueryWrapper.eq(DeviceRepair::getDeviceLedgerId,deviceRepair.getDeviceLedgerId())
- .eq(DeviceRepair::getRemark,deviceRepair.getRemark())
- .eq(DeviceRepair::getDeviceName,deviceRepair.getDeviceName())
- .eq(DeviceRepair::getApproverId,deviceRepair.getApproverId())
- .eq(DeviceRepair::getRepairTime,deviceRepair.getRepairTime());
- DeviceRepair one = deviceRepairService.getOne(QueryWrapper);
- if(ObjectUtils.isEmpty(one)){
- return AjaxResult.error("璁惧鎶ヤ慨涓嶅瓨鍦�");
- }
- //鑾峰彇褰撳墠鐧诲綍閮ㄩ棬id
- approveProcessVO.setApproveDeptId(tenantId);
- //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
- approveProcessVO.setApproveUser(loginUser.getUserId());
- //鑾峰彇褰撳墠鏃堕棿
- approveProcessVO.setApproveTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- approveProcessVO.setApproveType(4);
- approveProcessVO.setApproveUserIds(deviceRepair.getApproverId().toString());
- approveProcessVO.setApproveReason(deviceRepair.getRemark());
- approveProcessVO.setDeviceRepairId(one.getId());
- approveProcessVO.setMaintenancePrice(deviceRepair.getMaintenancePrice());
- approveProcessService.addApprove(approveProcessVO);
- }
+ // todo 鍓嶇浠ｇ爜涓嶅尮閰嶏紝寰呭鐞�
+// ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+// LoginUser loginUser = SecurityUtils.getLoginUser();
+// // 鑾峰彇褰撳墠鐧诲綍鍏徃
+// Long tenantId = loginUser.getTenantId();
+// if(null != tenantId){
+// //鑾峰彇褰撳墠鐧诲綍閮ㄩ棬id
+// approveProcessVO.setApproveDeptId(tenantId);
+// //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+// approveProcessVO.setApproveUser(loginUser.getUserId());
+// //鑾峰彇褰撳墠鏃堕棿
+// approveProcessVO.setApproveTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+// approveProcessVO.setApproveType(4);
+// approveProcessVO.setApproveUserIds(deviceRepair.getApproverId().toString());
+// approveProcessVO.setApproveReason(deviceRepair.getRemark());
+// approveProcessVO.setDeviceRepairId(deviceRepair.getId());
+// approveProcessVO.setMaintenancePrice(deviceRepair.getMaintenancePrice());
+// approveProcessService.addApprove(approveProcessVO);
+// }
return AjaxResult.success();
}
--
Gitblit v1.9.3