From ee2ccfdef2c4883ed5d9dc0d392e99f527de46bf Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Thu, 14 Nov 2024 14:06:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E5=AE=A1=E6=A0=B8--=E4=BB=A3?= =?UTF-8?q?=E7=A0=81y=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RepairAuditDetailsController.java | 18 ++++++++++-------- .../repair/domain/RepairAuditDetails.java | 17 +++++++++-------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java index dd8d914a..147a3670 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java @@ -1,5 +1,6 @@ package com.bonus.material.repair.controller; +import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.Resource; @@ -54,14 +55,15 @@ public class RepairAuditDetailsController extends BaseController { @RequiresPermissions("service:auditing:list") public TableDataInfo questList(RepairAuditDetails repairAuditDetails) { startPage(); - Map params = repairAuditDetails.getParams(); - if (params != null && !params.isEmpty()) { - String beginTime = (String) params.get("beginTime"); - String endTime = (String) params.get("endTime"); - params.put("beginTime", beginTime + " 00:00:00"); - params.put("endTime", endTime + " 23:59:59"); - repairAuditDetails.setParams(params); - } +// Map params = repairAuditDetails.getParams(); + Map params = new HashMap<>(); +// if (params != null && !params.isEmpty()) { +// String beginTime = (String) params.get("beginTime"); +// String endTime = (String) params.get("endTime"); +// params.put("beginTime", beginTime + " 00:00:00"); +// params.put("endTime", endTime + " 23:59:59"); +// repairAuditDetails.setParams(params); +// } List list = repairAuditDetailsService.selectRepairQuestList(repairAuditDetails); return getDataTable(list); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java index e46bcfd1..5ae3910e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java @@ -5,21 +5,21 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; /** * 修试审核详细对象 repair_audit_details * - * @author xsheng - * @date 2024-10-16 + * @author syruan */ - - +@EqualsAndHashCode(callSuper = false) @Data @ToString public class RepairAuditDetails extends BaseEntity { - private static final long serialVersionUID = 1L; + + private static final long serialVersionUID = -8752731235584328836L; /** ID */ private Long id; @@ -71,8 +71,8 @@ public class RepairAuditDetails extends BaseEntity { private Date auditTime; /** 备注备注 */ - @Excel(name = "备注备注") - @ApiModelProperty(value = "备注备注") + @Excel(name = "审核备注") + @ApiModelProperty(value = "审核备注") private String auditRemark; /** 0未审核1已审核2驳回 */ @@ -85,5 +85,6 @@ public class RepairAuditDetails extends BaseEntity { @ApiModelProperty(value = "数据所属组织") private Integer companyId; - + @ApiModelProperty(value = "关键字") + private String keyWord; }