From dd569475b4ec1bbffc40af2feb024919791b33a7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 07 四月 2025 15:45:42 +0800
Subject: [PATCH] 修改查询条件数据类型
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java | 12 ++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java | 28 --------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java | 21 ++++------
3 files changed, 16 insertions(+), 45 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
index 7a5d8e4..ffdb07d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
+++ b/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鏌ヨ
*
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
index 9da504d..1cdc36e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
+++ b/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;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java
index cec5aed..4fe288e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java
+++ b/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;
}
--
Gitblit v1.9.3