From 7828b982da116070fe11526733609ecce23631b6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 15 五月 2026 19:55:28 +0800
Subject: [PATCH] feat: 设备维修新增报修人、验收人、维修人
---
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 23 +++-
doc/device_repair_add_acceptance_name.sql | 14 ++
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 179 ++++++++++++++++++++++++++++++-----
src/main/resources/mapper/device/DeviceRepairMapper.xml | 6 +
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 13 ++
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 11 ++
src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java | 4
src/main/java/com/ruoyi/device/service/IDeviceRepairService.java | 11 +
src/main/java/com/ruoyi/common/enums/FileNameType.java | 4
9 files changed, 224 insertions(+), 41 deletions(-)
diff --git a/doc/device_repair_add_acceptance_name.sql b/doc/device_repair_add_acceptance_name.sql
new file mode 100644
index 0000000..af66e2a
--- /dev/null
+++ b/doc/device_repair_add_acceptance_name.sql
@@ -0,0 +1,14 @@
+-- ============================================================================
+-- 璁惧鎶ヤ慨 device_repair
+-- ============================================================================
+
+ALTER TABLE `device_repair`
+ ADD COLUMN `acceptance_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '楠屾敹浜�' AFTER `repair_name`;
+
+ALTER TABLE `device_repair`
+ ADD COLUMN `acceptance_time` datetime NULL DEFAULT NULL COMMENT '楠屾敹鏃堕棿' AFTER `acceptance_name`;
+
+ALTER TABLE `device_repair`
+ ADD COLUMN `acceptance_remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '楠屾敹澶囨敞' AFTER `acceptance_time`;
+
+-- 鐘舵�佽鏄庯細0-寰呯淮淇� 1-瀹屾垚 2-缁翠慨澶辫触 3-寰呴獙鏀�
diff --git a/src/main/java/com/ruoyi/common/enums/FileNameType.java b/src/main/java/com/ruoyi/common/enums/FileNameType.java
index c1c6a85..114d52d 100644
--- a/src/main/java/com/ruoyi/common/enums/FileNameType.java
+++ b/src/main/java/com/ruoyi/common/enums/FileNameType.java
@@ -17,7 +17,9 @@
INSPECTION_PRODUCTION_BEFORE(10),
INSPECTION_PRODUCTION_AFTER(11),
INSPECTION(12),//宸℃ 鐢熶骇鍓�
- EQUIPMENT_WARRANTY(13); // 璁惧淇濅慨
+ EQUIPMENT_WARRANTY(13), // 璁惧淇濅慨
+ EQUIPMENT_REPAIR_PROBLEM(14), // 璁惧鎶ヤ慨-璁惧闂鍥剧墖
+ EQUIPMENT_REPAIR_MAINTAIN(15); // 璁惧鎶ヤ慨-缁翠慨瀹屾垚鍥剧墖
private final int value;
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 6933851..51c1d37 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -10,7 +10,6 @@
import com.ruoyi.sales.pojo.CommonFile;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -39,7 +38,8 @@
@PostMapping()
@ApiOperation("娣诲姞璁惧鎶ヤ慨")
public AjaxResult add(@RequestBody DeviceRepair deviceRepair) {
- return deviceRepairService.saveDeviceRepair(deviceRepair);
+ Long id = deviceRepairService.saveDeviceRepair(deviceRepair);
+ return AjaxResult.success("娣诲姞鎴愬姛", id);
}
@ApiOperation("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@@ -52,13 +52,22 @@
@PutMapping()
@ApiOperation("淇敼璁惧鎶ヤ慨")
public AjaxResult update(@RequestBody DeviceRepair deviceRepair) {
- return deviceRepairService.updateDeviceRepair(deviceRepair);
+ deviceRepairService.updateDeviceRepair(deviceRepair);
+ return AjaxResult.success();
}
@PostMapping("repair")
@ApiOperation("璁惧缁翠慨")
public AjaxResult repair(@RequestBody DeviceRepair deviceRepair) {
- return deviceRepairService.updateDeviceRepair(deviceRepair);
+ deviceRepairService.submitDeviceMaintain(deviceRepair);
+ return AjaxResult.success();
+ }
+
+ @PostMapping("acceptance")
+ @ApiOperation("璁惧鎶ヤ慨楠屾敹")
+ public AjaxResult acceptance(@RequestBody DeviceRepair deviceRepair) {
+ deviceRepairService.acceptDeviceRepair(deviceRepair);
+ return AjaxResult.success();
}
@DeleteMapping("/{ids}")
@@ -78,9 +87,9 @@
}
@PostMapping("/uploadFile")
- @ApiOperation("璁惧淇濅慨-闄勪欢涓婁紶")
- public AjaxResult uploadFile(MultipartFile file, Long deviceRepairId) {
- deviceRepairService.uploadFile(file, deviceRepairId);
+ @ApiOperation("璁惧淇濅慨-闄勪欢涓婁紶锛坒ileType: 14璁惧闂 15缁翠慨瀹屾垚锛�")
+ public AjaxResult uploadFile(MultipartFile file, Long deviceRepairId, Integer fileType) {
+ deviceRepairService.uploadFile(file, deviceRepairId, fileType);
return AjaxResult.success();
}
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 92cfe8c..4ce9600 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -32,6 +32,17 @@
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
+ @ApiModelProperty("楠屾敹浜�")
+ private String acceptanceName;
+
+ @ApiModelProperty("楠屾敹鏃堕棿")
+ private Date acceptanceTime;
+
+ private String acceptanceTimeStr;
+
+ @ApiModelProperty("楠屾敹澶囨敞")
+ private String acceptanceRemark;
+
@ApiModelProperty("鎶ヤ慨鍐呭")
private String remark;
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
index 9d16e4d..251f9d6 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
@@ -27,6 +27,10 @@
@Excel(name = "鎶ヤ慨浜�")
private String repairName;
+ @ApiModelProperty("楠屾敹浜�")
+ @Excel(name = "楠屾敹浜�")
+ private String acceptanceName;
+
@ApiModelProperty("鎶ヤ慨鍐呭")
@Excel(name = "鎶ヤ慨鍐呭")
private String remark;
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index a567366..b125e31 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -31,6 +31,17 @@
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
+ @ApiModelProperty("楠屾敹浜�")
+ private String acceptanceName;
+
+ @ApiModelProperty("楠屾敹鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime acceptanceTime;
+
+ @ApiModelProperty("楠屾敹澶囨敞")
+ private String acceptanceRemark;
+
@ApiModelProperty("鎶ヤ慨鍐呭")
private String remark;
@@ -45,7 +56,7 @@
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨 2 澶辫触")
+ @ApiModelProperty("鐘舵�� 0寰呯淮淇� 1瀹屾垚 2缁翠慨澶辫触 3寰呴獙鏀�")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
index b2774b9..a10a5b1 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.pojo.CommonFile;
import org.springframework.web.multipart.MultipartFile;
@@ -18,15 +17,19 @@
IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto);
- AjaxResult saveDeviceRepair(DeviceRepair deviceRepair);
+ Long saveDeviceRepair(DeviceRepair deviceRepair);
- AjaxResult updateDeviceRepair(DeviceRepair deviceRepair);
+ void updateDeviceRepair(DeviceRepair deviceRepair);
+
+ void submitDeviceMaintain(DeviceRepair deviceRepair);
+
+ void acceptDeviceRepair(DeviceRepair deviceRepair);
void export(HttpServletResponse response, Long[] ids);
DeviceRepairDto detailById(Long id);
- void uploadFile(MultipartFile file, Long deviceRepairId);
+ void uploadFile(MultipartFile file, Long deviceRepairId, Integer fileType);
List<CommonFile> getFiles(Long deviceRepairId);
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index 064bcce..23ec164 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
@@ -17,7 +19,6 @@
import com.ruoyi.device.service.DeviceDefectRecordService;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.other.service.TempFileService;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
@@ -31,11 +32,13 @@
import javax.servlet.http.HttpServletResponse;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
@Service
@AllArgsConstructor
@@ -62,35 +65,132 @@
}
@Override
- public AjaxResult saveDeviceRepair(DeviceRepair deviceRepair) {
+ public Long saveDeviceRepair(DeviceRepair deviceRepair) {
DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
+ if (byId == null) {
+ throw new ServiceException("璁惧鍙拌处涓嶅瓨鍦�");
+ }
deviceRepair.setDeviceName(byId.getDeviceName());
deviceRepair.setDeviceModel(byId.getDeviceModel());
- boolean save = this.save(deviceRepair);
- if (save) {
- return AjaxResult.success();
+ if (!this.save(deviceRepair)) {
+ throw new ServiceException("娣诲姞澶辫触");
}
- return AjaxResult.error();
+ return deviceRepair.getId();
}
@Override
- public AjaxResult updateDeviceRepair(DeviceRepair deviceRepair) {
- if (this.updateById(deviceRepair)) {
- Long id = deviceRepair.getId();
- //
- DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
- deviceDefectRecordDto.setDeviceLedgerId(id);
- deviceDefectRecordDto.setStatus("涓ラ噸缂洪櫡");
- List<DeviceDefectRecordDto> records = deviceDefectRecordService.listPage(new Page<>(1, -1), deviceDefectRecordDto).getRecords();
- if (!records.isEmpty()) {
- records.forEach(deviceDefectRecord -> {
- deviceDefectRecord.setStatus("姝ｅ父");
- deviceDefectRecordService.updateByDDR(deviceDefectRecord);
- });
- }
- return AjaxResult.success();
+ public void updateDeviceRepair(DeviceRepair deviceRepair) {
+ DeviceRepair existing = this.getById(deviceRepair.getId());
+ if (existing == null) {
+ throw new ServiceException("鎶ヤ慨鍗曚笉瀛樺湪");
}
- return AjaxResult.error();
+ if (!Objects.equals(existing.getStatus(), 0)) {
+ throw new ServiceException("浠呭緟缁翠慨鐘舵�佸彲缂栬緫");
+ }
+ if (!this.updateById(deviceRepair)) {
+ throw new ServiceException("淇敼澶辫触");
+ }
+ clearDefectRecordsIfNeeded(deviceRepair.getId());
+ }
+
+ @Override
+ public void submitDeviceMaintain(DeviceRepair deviceRepair) {
+ if (deviceRepair == null || deviceRepair.getId() == null) {
+ throw new ServiceException("鎶ヤ慨鍗旾D涓嶈兘涓虹┖");
+ }
+ DeviceRepair existing = this.getById(deviceRepair.getId());
+ if (existing == null) {
+ throw new ServiceException("鎶ヤ慨鍗曚笉瀛樺湪");
+ }
+ if (!Objects.equals(existing.getStatus(), 0)) {
+ throw new ServiceException("浠呭緟缁翠慨鐘舵�佸彲鎻愪氦缁翠慨");
+ }
+ if (StringUtils.isEmpty(deviceRepair.getMaintenanceResult())) {
+ throw new ServiceException("璇峰～鍐欑淮淇粨鏋�");
+ }
+ String loginNick = SecurityUtils.getLoginUser().getNickName();
+ if (StringUtils.isEmpty(existing.getMaintenanceName())) {
+ throw new ServiceException("鏈寚瀹氱淮淇汉锛屾棤娉曠淮淇�");
+ }
+ if (!Objects.equals(existing.getMaintenanceName(), loginNick)) {
+ throw new ServiceException("浠呮寚瀹氱殑缁翠慨浜哄彲杩涜缁翠慨");
+ }
+ existing.setMaintenanceResult(deviceRepair.getMaintenanceResult());
+ existing.setMaintenanceTime(deviceRepair.getMaintenanceTime() != null
+ ? deviceRepair.getMaintenanceTime() : LocalDateTime.now());
+ // 缁翠慨澶辫触=2锛屽惁鍒欒繘鍏ュ緟楠屾敹=3
+ if (Objects.equals(deviceRepair.getStatus(), 2)) {
+ existing.setStatus(2);
+ } else {
+ existing.setStatus(3);
+ }
+ if (!this.updateById(existing)) {
+ throw new ServiceException("鎻愪氦缁翠慨澶辫触");
+ }
+ clearDefectRecordsIfNeeded(existing.getId());
+ }
+
+ @Override
+ public void acceptDeviceRepair(DeviceRepair deviceRepair) {
+ if (deviceRepair == null || deviceRepair.getId() == null) {
+ throw new ServiceException("鎶ヤ慨鍗旾D涓嶈兘涓虹┖");
+ }
+ DeviceRepair existing = this.getById(deviceRepair.getId());
+ if (existing == null) {
+ throw new ServiceException("鎶ヤ慨鍗曚笉瀛樺湪");
+ }
+ if (!Objects.equals(existing.getStatus(), 3)) {
+ throw new ServiceException("褰撳墠鐘舵�佷笉鍙獙鏀�");
+ }
+ String loginNick = SecurityUtils.getLoginUser().getNickName();
+ if (StringUtils.isEmpty(existing.getAcceptanceName())) {
+ throw new ServiceException("鏈寚瀹氶獙鏀朵汉锛屾棤娉曢獙鏀�");
+ }
+ if (!Objects.equals(existing.getAcceptanceName(), loginNick)) {
+ throw new ServiceException("浠呮寚瀹氱殑楠屾敹浜哄彲杩涜楠屾敹");
+ }
+ if (StringUtils.isEmpty(deviceRepair.getAcceptanceRemark())) {
+ throw new ServiceException("璇峰～鍐欓獙鏀跺娉�");
+ }
+ existing.setAcceptanceTime(deviceRepair.getAcceptanceTime() != null
+ ? deviceRepair.getAcceptanceTime() : LocalDateTime.now());
+ existing.setAcceptanceRemark(deviceRepair.getAcceptanceRemark());
+ existing.setStatus(1);
+ if (!this.updateById(existing)) {
+ throw new ServiceException("楠屾敹澶辫触");
+ }
+ clearDefectRecordsIfNeeded(existing.getId());
+ }
+
+ private void clearDefectRecordsIfNeeded(Long repairId) {
+ DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
+ deviceDefectRecordDto.setDeviceLedgerId(repairId);
+ deviceDefectRecordDto.setStatus("涓ラ噸缂洪櫡");
+ List<DeviceDefectRecordDto> records = deviceDefectRecordService.listPage(new Page<>(1, -1), deviceDefectRecordDto).getRecords();
+ if (!records.isEmpty()) {
+ records.forEach(deviceDefectRecord -> {
+ deviceDefectRecord.setStatus("姝ｅ父");
+ deviceDefectRecordService.updateByDDR(deviceDefectRecord);
+ });
+ }
+ }
+
+ private static String statusLabel(Integer status) {
+ if (status == null) {
+ return "";
+ }
+ switch (status) {
+ case 0:
+ return "寰呯淮淇�";
+ case 1:
+ return "瀹屾垚";
+ case 2:
+ return "缁翠慨澶辫触";
+ case 3:
+ return "寰呴獙鏀�";
+ default:
+ return "";
+ }
}
@Override
@@ -101,7 +201,7 @@
supplierManageList.stream().forEach(deviceRepair -> {
DeviceRepairExeclDto deviceRepairExeclDto = new DeviceRepairExeclDto();
BeanUtils.copyProperties(deviceRepair, deviceRepairExeclDto);
- deviceRepairExeclDto.setStatusStr(deviceRepair.getStatus() == 0 ? "寰呯淮淇�" : deviceRepair.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
+ deviceRepairExeclDto.setStatusStr(statusLabel(deviceRepair.getStatus()));
deviceLedgerExeclDtos.add(deviceRepairExeclDto);
});
@@ -117,7 +217,7 @@
supplierManageList.stream().forEach(deviceRepair -> {
DeviceRepairExeclDto deviceRepairExeclDto = new DeviceRepairExeclDto();
BeanUtils.copyProperties(deviceRepair, deviceRepairExeclDto);
- deviceRepairExeclDto.setStatusStr(deviceRepair.getStatus() == 0 ? "寰呯淮淇�" : deviceRepair.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
+ deviceRepairExeclDto.setStatusStr(statusLabel(deviceRepair.getStatus()));
deviceLedgerExeclDtos.add(deviceRepairExeclDto);
});
@@ -134,19 +234,41 @@
}
@Override
- public void uploadFile(MultipartFile file, Long deviceRepairId) {
+ public void uploadFile(MultipartFile file, Long deviceRepairId, Integer fileType) {
if (file == null || file.isEmpty()) {
throw new ServiceException("涓婁紶澶辫触,鏂囦欢涓嶈兘涓虹┖");
}
if (deviceRepairId == null || deviceRepairId <= 0) {
throw new ServiceException("涓婁紶澶辫触,璁惧鎶ヤ慨ID涓嶈兘涓虹┖");
}
+ int resolvedType = resolveRepairFileType(fileType);
try {
- tempFileService.uploadByCommon(file, FileNameType.EQUIPMENT_WARRANTY.getValue(), deviceRepairId);
+ tempFileService.uploadByCommon(file, resolvedType, deviceRepairId);
} catch (Exception e) {
throw new ServiceException("涓婁紶澶辫触," + e.getMessage());
}
+ }
+
+ /** 璁惧鎶ヤ慨闄勪欢绫诲瀷锛�14璁惧闂 15缁翠慨瀹屾垚锛�13涓哄巻鍙茬被鍨嬪綊鍏ヨ澶囬棶棰� */
+ private int resolveRepairFileType(Integer fileType) {
+ if (fileType == null) {
+ return FileNameType.EQUIPMENT_REPAIR_PROBLEM.getValue();
+ }
+ if (Objects.equals(fileType, FileNameType.EQUIPMENT_REPAIR_PROBLEM.getValue())
+ || Objects.equals(fileType, FileNameType.EQUIPMENT_REPAIR_MAINTAIN.getValue())
+ || Objects.equals(fileType, FileNameType.EQUIPMENT_WARRANTY.getValue())) {
+ return fileType;
+ }
+ throw new ServiceException("涓婁紶澶辫触,闄勪欢绫诲瀷鏃犳晥");
+ }
+
+ private List<Integer> repairFileTypes() {
+ return Arrays.asList(
+ FileNameType.EQUIPMENT_REPAIR_PROBLEM.getValue(),
+ FileNameType.EQUIPMENT_REPAIR_MAINTAIN.getValue(),
+ FileNameType.EQUIPMENT_WARRANTY.getValue()
+ );
}
@Override
@@ -157,7 +279,8 @@
return commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
.eq(CommonFile::getCommonId, deviceRepairId)
- .eq(CommonFile::getType, FileNameType.EQUIPMENT_WARRANTY.getValue()));
+ .in(CommonFile::getType, repairFileTypes())
+ .orderByAsc(CommonFile::getId));
}
@Override
@@ -190,7 +313,7 @@
List<CommonFile> fileList = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
.in(CommonFile::getCommonId, ids)
- .eq(CommonFile::getType, FileNameType.EQUIPMENT_WARRANTY.getValue()));
+ .in(CommonFile::getType, repairFileTypes()));
for (CommonFile commonFile : fileList) {
deleteFile(commonFile.getId());
}
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index d093980..5c73e4f 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -10,6 +10,9 @@
dr.device_ledger_id,
dr.repair_time,
dr.repair_name,
+ dr.acceptance_name,
+ dr.acceptance_time,
+ dr.acceptance_remark,
dr.remark,
dr.maintenance_name,
dr.maintenance_time,
@@ -55,6 +58,9 @@
dr.device_ledger_id,
dr.repair_time,
dr.repair_name,
+ dr.acceptance_name,
+ dr.acceptance_time,
+ dr.acceptance_remark,
dr.remark,
dr.maintenance_name,
dr.maintenance_time,
--
Gitblit v1.9.3