From 4b27dd367eae2f24958c6bb857fb6959dcdb7a4a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 13 六月 2025 18:04:46 +0800
Subject: [PATCH] 报表提交
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
index f618b41..ce24b9d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
@@ -1,10 +1,12 @@
package org.jeecg.modules.eam.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sun.org.apache.regexp.internal.RE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -20,6 +22,7 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.mapper.RepairOrderMapper;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.RepairReportExportVo;
import org.jeecg.modules.system.entity.SysUser;
@@ -74,6 +77,9 @@
private String upLoadPath;
@Autowired
private IRepairOrderService repairOrderService;
+
+ @Autowired
+ private RepairOrderMapper repairOrderMapper;
/**
@@ -280,6 +286,7 @@
}
@PutMapping("/accept")
+ @Transactional(rollbackFor = Exception.class)
public Result<?> accept(@RequestBody EquipmentReportRepair equipmentReportRepair ){
if(equipmentReportRepair.getErrUda4().equals("1")){
if(equipmentReportRepair.getErrUda1().equals("yes")){
@@ -323,13 +330,18 @@
equipmentReportRepairService.updateById(equipmentReportRepair);
RepairOrder repairOrder = repairOrderService.getOne(new QueryWrapper<RepairOrder>().eq("report_repair_id",equipmentReportRepair.getId()),false);
if(ObjectUtils.isNotNull(repairOrder)){
- repairOrder.setStatus("3");
- repairOrderService.updateById(repairOrder);
+
+ repairOrderMapper.updateRepair(repairOrder.getId());
+// repairOrder.setStatus("3");
+// repairOrder.setActualEndTime(null);
+// repairOrderService.updateById(repairOrder);
}
return Result.OK("宸查┏鍥�");
}
}
+
+
/**
* 瀵煎嚭excel
*
--
Gitblit v1.9.3