lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
@@ -119,34 +119,6 @@ return Result.OK("批量作废成功!"); } // /** // * 通过id删除 // * // * @param id // * @return // */ // @AutoLog(value = "故障报修-通过id删除") // @ApiOperation(value = "故障报修-通过id删除", notes = "故障报修-通过id删除") // @DeleteMapping(value = "/delete") // public Result<?> delete(@RequestParam(name = "id", required = true) String id) { // eamReportRepairService.removeById(id); // return Result.OK("删除成功!"); // } // // /** // * 批量删除 // * // * @param ids // * @return // */ // @AutoLog(value = "故障报修-批量删除") // @ApiOperation(value = "故障报修-批量删除", notes = "故障报修-批量删除") // @DeleteMapping(value = "/deleteBatch") // public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { // this.eamReportRepairService.removeByIds(Arrays.asList(ids.split(","))); // return Result.OK("批量删除成功!"); // } /** * 通过id查询 * lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
@@ -38,6 +38,13 @@ @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code") private String equipmentId; /** * 设备名称 */ @Excel(name = "设备名称", width = 15) @TableField(exist = false) @ApiModelProperty(value = "设备名称") private String equipmentName; /** * 删除标记 */ @ApiModelProperty(value = "删除标记") @@ -87,7 +94,7 @@ /** * 照片文件ids;id以逗号分隔 */ @Excel(name = "照片", width = 15) @Excel(name = "照片", width = 15, type = 2) @ApiModelProperty(value = "照片") private String imageFiles; /** @@ -97,7 +104,4 @@ @ApiModelProperty(value = "备注") private String remark; @TableField(exist = false) @ApiModelProperty(value = "设备名称") private String equipmentName; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java
@@ -1,16 +1,12 @@ package org.jeecg.modules.eam.request; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.modules.eam.entity.EamReportRepair; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; /** * @Author: Lius @@ -25,13 +21,12 @@ private static final long serialVersionUID = -7111580122226167877L; @ApiModelProperty(value = "开始时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; @ApiModelProperty(value = "结束时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** * 开始时间 */ private String startTime; /** * 结束时间 */ private String endTime; }