dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dyf-device

Browse Source
This commit is contained in:
daiyongfei
2025-09-03 15:56:30 +08:00
parent d97928b38a 1a2f35a092
commit 00e345d5e5
22 changed files with 699 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.java
View File

@ -2,6 +2,11 @@ package com.fuyuanshen.equipment.controller;
import java.util.List;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
import com.fuyuanshen.equipment.domain.DeviceType;
import com.fuyuanshen.equipment.domain.query.DeviceRepairRecordsQueryCriteria;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
@ -41,8 +46,10 @@ public class DeviceRepairRecordsController extends BaseController {
*/
@SaCheckPermission("equipment:repairRecords:list")
@GetMapping("/list")
public TableDataInfo<DeviceRepairRecordsVo> list(DeviceRepairRecordsBo bo, PageQuery pageQuery) {
return deviceRepairRecordsService.queryPageList(bo, pageQuery);
@Operation(summary = "分页查询维修记录列表")
public TableDataInfo<DeviceRepairRecordsVo> list(DeviceRepairRecordsQueryCriteria criteria) {
Page<DeviceRepairRecords> page = new Page<>(criteria.getPageNum(), criteria.getPageSize());
return deviceRepairRecordsService.queryPageList(criteria, page);
}
/**
@ -51,7 +58,7 @@ public class DeviceRepairRecordsController extends BaseController {
@SaCheckPermission("equipment:repairRecords:export")
@Log(title = "设备维修记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DeviceRepairRecordsBo bo, HttpServletResponse response) {
public void export(DeviceRepairRecordsQueryCriteria bo, HttpServletResponse response) {
List<DeviceRepairRecordsVo> list = deviceRepairRecordsService.queryList(bo);
ExcelUtil.exportExcel(list, "设备维修记录", DeviceRepairRecordsVo.class, response);
}
@ -74,8 +81,8 @@ public class DeviceRepairRecordsController extends BaseController {
@SaCheckPermission("equipment:repairRecords:add")
@Log(title = "设备维修记录", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceRepairRecordsBo bo) {
@PostMapping(consumes = "multipart/form-data")
public R<Void> add(@Validated(AddGroup.class) DeviceRepairRecordsBo bo) {
return toAjax(deviceRepairRecordsService.insertByBo(bo));
}
@ -85,8 +92,8 @@ public class DeviceRepairRecordsController extends BaseController {
@SaCheckPermission("equipment:repairRecords:edit")
@Log(title = "设备维修记录", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceRepairRecordsBo bo) {
@PutMapping(consumes = "multipart/form-data")
public R<Void> edit(@Validated(EditGroup.class) DeviceRepairRecordsBo bo) {
return toAjax(deviceRepairRecordsService.updateByBo(bo));
}