From 81a00e19f33166f541da16a52a575ae9b6a62b2a Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 13:34:27 +0800
Subject: [PATCH] 巡检计划筛选

---
 ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
index 5a39143..8700302 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
@@ -18,29 +18,31 @@
 {
     private static final long serialVersionUID = 1L;
 
-    /** 缁撴潫鏃堕棿(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙) */
-    @Excel(name = "缁撴潫鏃堕棿(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙)")
-    private String patroEndTime;
-
-    /** 鍒跺畾浜轰富閿� */
-    @Excel(name = "鍒跺畾浜轰富閿�")
-    private String userId;
-
-    /** 鍛ㄦ湡 */
-    @Excel(name = "鍛ㄦ湡")
-    private String cycle;
-
     /** 涓婚敭 */
     private String id;
+
+    /** 鍒跺畾浜轰富閿� */
+    private String userId;
+
+    @Excel(name = "鍒跺畾浜�")
+    private String nickName;
+
+    /** 鍛ㄦ湡 */
+    @Excel(name = "鍛ㄦ湡",readConverterExp = "day=姣忔棩,once=鍗曟")
+    private String cycle;
 
     /** 宸℃璁″垝鍚嶇О */
     @Excel(name = "宸℃璁″垝鍚嶇О")
     private String planName;
 
-    /** 寮�濮嬫椂闂�(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙) */
-    @Excel(name = "寮�濮嬫椂闂�(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙)")
+    /** 寮�濮嬫椂闂� */
+    @Excel(name = "寮�濮嬫椂闂�")
     private String patroBeginTime;
 
+    /** 缁撴潫鏃堕棿(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙) */
+    @Excel(name = "缁撴潫鏃堕棿")
+    private String patroEndTime;
+
     /**
      * 宸℃鐐�
      */

--
Gitblit v1.9.3