在库在用设备维保删除功能

This commit is contained in:
hongchao 2025-08-11 09:25:50 +08:00
parent 7eb1976939
commit 4fbb8a2672
3 changed files with 29 additions and 12 deletions

View File

@ -133,4 +133,17 @@ public class EquipmentToRepairController extends BaseController {
AjaxResult ajaxResult = service.deleteEquipmentNew(bean); AjaxResult ajaxResult = service.deleteEquipmentNew(bean);
return ajaxResult; return ajaxResult;
} }
/**
* 导出维保列表
*/
@Log(title = "导出维保列表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
// @RequiresPermissions("repair:manage:export")
public void export(HttpServletResponse response, EquipmentTask bean)
{
List<EquipmentTask> list = service.getEquipmentList(bean);
ExcelUtil<EquipmentTask> util = new ExcelUtil<EquipmentTask>(EquipmentTask.class);
util.exportExcel(response, list, "维保列表");
}
} }

View File

@ -27,7 +27,7 @@ public class EquipmentTask {
/** /**
* 编码 * 编码
*/ */
@ApiModelProperty(value = "编码") @Excel(name = "机具编号",sort = 3)
private String maCode; private String maCode;
/** /**
@ -47,12 +47,14 @@ public class EquipmentTask {
* 维保时间 * 维保时间
*/ */
@ApiModelProperty(value = "维保时间") @ApiModelProperty(value = "维保时间")
@Excel(name = "维修时间",sort = 6)
private String repairTime; private String repairTime;
/** /**
* 维保状态 * 维保状态
*/ */
@ApiModelProperty(value = "维保状态") @ApiModelProperty(value = "维保状态")
@Excel(name = "维保状态",sort = 7,readConverterExp = "0=待提交,1=已提交")
private Integer repairStatus; private Integer repairStatus;
/** /**
* 关键字 * 关键字
@ -69,30 +71,31 @@ public class EquipmentTask {
private Long companyId; private Long companyId;
private Long agreementId; private Long agreementId;
/**
* 维修机具类型
*/
@ApiModelProperty(value = "维修规格型号")
@Excel(name = "维修规格型号",sort = 1)
private String typeModelName;
/** /**
* 规格型号 * 规格型号
*/ */
@ApiModelProperty(value = "维修机具类型") @ApiModelProperty(value = "规格型号")
@Excel(name = "维修机具类型",sort = 2) @Excel(name = "规格型号",sort = 2)
private String typeModelName;
/**
* 机具名称
*/
@ApiModelProperty(value = "机具名称")
@Excel(name = "机具名称",sort = 1)
private String typeName; private String typeName;
/** /**
* 维修总量 * 维修总量
*/ */
@ApiModelProperty(value = "维修总量") @ApiModelProperty(value = "维修")
@Excel(name = "维修总量",sort = 3) @Excel(name = "维修数量",sort = 4)
private int repairNum; private int repairNum;
/** /**
* 维修人员 * 维修人员
*/ */
@ApiModelProperty(value = "维修人员") @ApiModelProperty(value = "维修人")
@Excel(name = "维修人",sort = 5)
private String repairer; private String repairer;
//类型ID //类型ID

View File

@ -280,6 +280,7 @@ public class EquipmentToRepairServiceImpl implements EquipmentToRepairService {
//删除sys_file_info表 //删除sys_file_info表
mapper.deleteFileEquipmentList(record); mapper.deleteFileEquipmentList(record);
} }
//新增配件和文件数据
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
bean.setUpdateBy(loginUser.getUserid().toString()); bean.setUpdateBy(loginUser.getUserid().toString());
bean.setCreateBy(loginUser.getUserid()); bean.setCreateBy(loginUser.getUserid());