From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 27 六月 2025 13:42:41 +0800 Subject: [PATCH] 去除多余引用 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 15 +++++++++++++-- 1 files changed, 13 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..aeb6e40 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,6 +1,7 @@ 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; @@ -20,6 +21,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 +76,9 @@ private String upLoadPath; @Autowired private IRepairOrderService repairOrderService; + + @Autowired + private RepairOrderMapper repairOrderMapper; /** @@ -280,6 +285,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 +329,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