From a63783ddbf3184600a7b69c7e5bede99532b4784 Mon Sep 17 00:00:00 2001
From: 15036302109 <zhp5211314>
Date: Wed, 27 Dec 2023 11:10:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=9F=E4=BC=8D=EF=BC=8C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ehs/EhsFloodDroughtTeamController.java    |  6 +-
 .../ehs/EhsFloodDroughtWorkerController.java  |  6 +-
 .../ehs/EhsRescueTeamController.java          |  6 +-
 .../ehs/EhsRescueTeamWorkerController.java    |  4 +-
 .../domain/EhsFloodDroughtTeam.java           | 28 ++++++-
 .../FloodDroughtTeamImportTemplate.java       | 20 ++++-
 .../impl/EhsFloodDroughtTeamServiceImpl.java  | 10 ++-
 .../domain/EhsFloodDroughtWorker.java         | 17 +++--
 .../FloodDroughtWorkerImportTemplate.java     | 11 ++-
 .../EhsFloodDroughtWorkerServiceImpl.java     |  8 +-
 .../ehsRescueTeam/domain/EhsRescueTeam.java   | 28 ++++++-
 .../domain/RescueTeamImportTemplate.java      | 20 ++++-
 .../impl/EhsRescueTeamServiceImpl.java        | 10 ++-
 .../domain/EhsRescueTeamWorker.java           | 18 +++--
 .../RescueTeamWorkerImportTemplate.java       | 20 +++--
 .../impl/EhsRescueTeamWorkerServiceImpl.java  |  9 ++-
 .../mapper/ehs/EhsFloodDroughtTeamMapper.xml  | 10 ++-
 .../ehs/EhsFloodDroughtWorkerMapper.xml       | 13 ++--
 .../mapper/ehs/EhsRescueTeamMapper.xml        | 14 +++-
 .../mapper/ehs/EhsRescueTeamWorkerMapper.xml  | 10 ++-
 .../views/ehs/ehsFloodDroughtTeam/index.vue   | 72 ++++++++++++++++--
 .../views/ehs/ehsFloodDroughtWorker/index.vue | 52 +++++++------
 .../src/views/ehs/ehsRescueTeam/index.vue     | 76 +++++++++++++++++--
 .../views/ehs/ehsRescueTeamWorker/index.vue   | 57 +++++++-------
 24 files changed, 413 insertions(+), 112 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsFloodDroughtTeamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsFloodDroughtTeamController.java
index 02f2b38..294a4a7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsFloodDroughtTeamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsFloodDroughtTeamController.java
@@ -125,7 +125,11 @@ public class EhsFloodDroughtTeamController extends BaseController {
         String[] header =
                 {"队伍名称#",
                         "队伍级别#",
-                        "队伍性质(0-其他,1-政府,2-企业,3-社会)#",
+                        "负责人#",
+                        "联系电话#",
+                        "所属单位#",
+                        "驻地#",
+                        "队伍属性(0-其他,1-政府,2-企业,3-社会)#",
                         "备注#"};
         ExcelExp e1 = new ExcelExp("防汛抗旱队伍信息", header, ehsFloodDroughtTeams, EhsFloodDroughtTeam.class);
         List<ExcelExp> mysheet = new ArrayList<>();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsFloodDroughtWorkerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsFloodDroughtWorkerController.java
index c03a332..135743d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsFloodDroughtWorkerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsFloodDroughtWorkerController.java
@@ -122,12 +122,14 @@ public class EhsFloodDroughtWorkerController extends BaseController {
         List<EhsFloodDroughtWorker> workerList = new ArrayList<>();
         String[] header =
                 {"人员姓名#",
-                        "性别(0-男,1-女)#",
-                        "出生年月(格式为:2023-12-12)#",
+                        "年龄#",
+                        "性别(0男 1女)#",
                         "身份证号#",
                         "联系方式#",
+                        "队内职务#",
                         "工作年限#",
                         "技能特长#",
+                        "培训次数#",
                         "备注#"};
         ExcelExp e1 = new ExcelExp("防汛抗旱队伍人员信息", header, workerList, EhsFloodDroughtWorker.class);
         List<ExcelExp> mysheet = new ArrayList<>();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamController.java
index e28fe99..3329799 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamController.java
@@ -81,7 +81,11 @@ public class EhsRescueTeamController extends BaseController {
         String[] header =
                 {"队伍名称#",
                         "队伍级别#",
-                        "队伍性质(0-其他,1-政府,2-企业,3-社会)#",
+                        "负责人#",
+                        "联系电话#",
+                        "所属单位#",
+                        "驻地#",
+                        "队伍属性(0-其他,1-政府,2-企业,3-社会)#",
                         "备注#"};
         ExcelExp e1 = new ExcelExp("应急救援队伍信息", header, ehsRescueTeamList, EhsRescueTeam.class);
         List<ExcelExp> mysheet = new ArrayList<>();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java
index 25e5550..0be4cb8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java
@@ -124,12 +124,14 @@ public class EhsRescueTeamWorkerController extends BaseController {
         List<EhsRescueTeamWorker> teamWorkerList = new ArrayList<>();
         String[] header =
                 {"人员姓名#",
+                        "年龄#",
                         "性别(0男 1女)#",
-                        "出生年月(格式为2023-12-12)#",
                         "身份证号#",
                         "联系方式#",
+                        "队内职务#",
                         "工作年限#",
                         "救援技能特长#",
+                        "培训次数#",
                         "备注#"};
         ExcelExp e1 = new ExcelExp("应急救援队伍人员信息", header, teamWorkerList, EhsRescueTeamWorker.class);
         List<ExcelExp> mysheet = new ArrayList<>();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/domain/EhsFloodDroughtTeam.java b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/domain/EhsFloodDroughtTeam.java
index c74a153..3cdb498 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/domain/EhsFloodDroughtTeam.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/domain/EhsFloodDroughtTeam.java
@@ -39,9 +39,33 @@ public class EhsFloodDroughtTeam extends BaseEntity
     private String teamLevel;
 
     /**
-     * 队伍性质
+     * 负责人
      */
-    @Excel(name = "队伍性质(0-其他,1-政府,2-企业,3-社会)")
+    @Excel(name = "负责人")
+    private String dutyer;
+
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /**
+     * 所属单位
+     */
+    @Excel(name = "所属单位")
+    private String unit;
+
+    /**
+     * 驻地
+     */
+    @Excel(name = "驻地")
+    private String station;
+
+    /**
+     * 队伍属性
+     */
+    @Excel(name = "队伍属性(0-其他,1-政府,2-企业,3-社会)")
     private Integer teamProperty;
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/domain/FloodDroughtTeamImportTemplate.java b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/domain/FloodDroughtTeamImportTemplate.java
index 9a2e767..d26ea54 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/domain/FloodDroughtTeamImportTemplate.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/domain/FloodDroughtTeamImportTemplate.java
@@ -13,8 +13,24 @@ public class FloodDroughtTeamImportTemplate {
     @Excel(name = "队伍级别",type = Excel.Type.ALL)
     private String teamLevel;
 
-    /** 队伍性质 */
-    @Excel(name = "队伍性质(0-其他,1-政府,2-企业,3-社会)",type = Excel.Type.ALL)
+    /** 负责人 */
+    @Excel(name = "负责人",type = Excel.Type.ALL)
+    private String dutyer;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话",type = Excel.Type.ALL)
+    private String phone;
+
+    /** 所属单位 */
+    @Excel(name = "所属单位",type = Excel.Type.ALL)
+    private String unit;
+
+    /** 驻地 */
+    @Excel(name = "驻地",type = Excel.Type.ALL)
+    private String station;
+
+    /** 队伍属性 */
+    @Excel(name = "队伍属性(0-其他,1-政府,2-企业,3-社会)",type = Excel.Type.ALL)
     private Integer teamProperty;
 
     /** 备注 */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/service/impl/EhsFloodDroughtTeamServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/service/impl/EhsFloodDroughtTeamServiceImpl.java
index 99bf6e1..cc38fd7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/service/impl/EhsFloodDroughtTeamServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/service/impl/EhsFloodDroughtTeamServiceImpl.java
@@ -91,7 +91,11 @@ public class EhsFloodDroughtTeamServiceImpl extends ServiceImpl<EhsFloodDroughtT
             // temp.setId(IdUtils.fastSimpleUUID());
             temp.setTeamName(floodDroughtTeamTemplate.getTeamName());  //队伍名称
             temp.setTeamLevel(floodDroughtTeamTemplate.getTeamLevel()); //队伍级别
-            temp.setTeamProperty(floodDroughtTeamTemplate.getTeamProperty());// 队伍性质
+            temp.setDutyer(floodDroughtTeamTemplate.getDutyer());// 负责人
+            temp.setPhone(floodDroughtTeamTemplate.getPhone());// 联系电话
+            temp.setUnit(floodDroughtTeamTemplate.getUnit());// 所属单位
+            temp.setStation(floodDroughtTeamTemplate.getStation());// 驻地
+            temp.setTeamProperty(floodDroughtTeamTemplate.getTeamProperty());// 队伍属性
             temp.setRemark(floodDroughtTeamTemplate.getRemark()); // 备注
 
             try {
@@ -118,6 +122,10 @@ public class EhsFloodDroughtTeamServiceImpl extends ServiceImpl<EhsFloodDroughtT
         lqw.eq(StringUtils.isNotBlank(query.getTeamLevel()), EhsFloodDroughtTeam::getTeamLevel, query.getTeamLevel());
         lqw.orderByDesc(EhsFloodDroughtTeam::getCreateTime);
         lqw.eq(query.getDeptId() != null, EhsFloodDroughtTeam::getDeptId, query.getDeptId());
+        lqw.like(StringUtils.isNotBlank(query.getDutyer()), EhsFloodDroughtTeam::getDutyer, query.getDutyer());
+        lqw.eq(StringUtils.isNotBlank(query.getPhone()), EhsFloodDroughtTeam::getPhone, query.getPhone());
+        lqw.eq(StringUtils.isNotBlank(query.getUnit()), EhsFloodDroughtTeam::getUnit, query.getUnit());
+        lqw.like(StringUtils.isNotBlank(query.getStation()), EhsFloodDroughtTeam::getStation, query.getStation());
         return lqw;
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/domain/EhsFloodDroughtWorker.java b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/domain/EhsFloodDroughtWorker.java
index 7c95d6c..6ec4fdd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/domain/EhsFloodDroughtWorker.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/domain/EhsFloodDroughtWorker.java
@@ -43,15 +43,14 @@ public class EhsFloodDroughtWorker extends BaseEntity
     @Excel(name = "人员姓名")
     private String workerName;
 
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private Integer workerAge;
+
     /** 性别 */
     @Excel(name = "性别(0-男,1-女)")
     private Integer gender;
 
-    /** 出生年月日 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出生年月(格式为:2023-12-12)", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date birthday;
-
     /** 身份证号 */
     @Excel(name = "身份证号")
     private String idCard;
@@ -60,6 +59,10 @@ public class EhsFloodDroughtWorker extends BaseEntity
     @Excel(name = "联系方式")
     private String phone;
 
+    /** 队内职务 */
+    @Excel(name = "队内职务")
+    private String teamPost;
+
     /** 工作年限 */
     @Excel(name = "工作年限")
     private String workYear;
@@ -68,4 +71,8 @@ public class EhsFloodDroughtWorker extends BaseEntity
     @Excel(name = "技能特长")
     private String speciality;
 
+    /** 培训次数 */
+    @Excel(name = "培训次数")
+    private Integer trainNum;
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/domain/FloodDroughtWorkerImportTemplate.java b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/domain/FloodDroughtWorkerImportTemplate.java
index 268b26e..38e7937 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/domain/FloodDroughtWorkerImportTemplate.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/domain/FloodDroughtWorkerImportTemplate.java
@@ -10,11 +10,8 @@ import java.util.Date;
 public class FloodDroughtWorkerImportTemplate {
     @Excel(name = "人员姓名", type = Excel.Type.ALL)
     private String workerName;
-    @Excel(name = "性别(0-男,1-女)", type = Excel.Type.ALL)
+    @Excel(name = "性别(0男 1女)", type = Excel.Type.ALL)
     private Integer gender;
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出生年月(格式为:2023-12-12)", width = 30, dateFormat = "yyyy-MM-dd", type = Excel.Type.ALL)
-    private Date birthday;
     @Excel(name = "身份证号", type = Excel.Type.ALL)
     private String idCard;
     @Excel(name = "联系方式", type = Excel.Type.ALL)
@@ -25,4 +22,10 @@ public class FloodDroughtWorkerImportTemplate {
     private String speciality;
     @Excel(name = "备注", type = Excel.Type.ALL)
     private String remark;
+    @Excel(name = "年龄", type = Excel.Type.ALL)
+    private Integer workerAge;
+    @Excel(name = "队内职务", type = Excel.Type.ALL)
+    private String teamPost;
+    @Excel(name = "培训次数", type = Excel.Type.ALL)
+    private Integer trainNum;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/service/impl/EhsFloodDroughtWorkerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/service/impl/EhsFloodDroughtWorkerServiceImpl.java
index c917eec..3bc93f1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/service/impl/EhsFloodDroughtWorkerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtWorker/service/impl/EhsFloodDroughtWorkerServiceImpl.java
@@ -95,12 +95,14 @@ public class EhsFloodDroughtWorkerServiceImpl extends ServiceImpl<EhsFloodDrough
             temp.setTeamName(floodDroughtTeamVo.getTeamName());// 队伍名称
             temp.setWorkerName(workerTemplate.getWorkerName());// 人员姓名
             temp.setGender(workerTemplate.getGender());// 性别
-            temp.setBirthday(workerTemplate.getBirthday());// 出生年月
             temp.setIdCard(workerTemplate.getIdCard());// 身份证号
             temp.setPhone(workerTemplate.getPhone());// 联系方式
             temp.setWorkYear(workerTemplate.getWorkYear());// 工作年限
             temp.setSpeciality(workerTemplate.getSpeciality());// 特长
             temp.setRemark(workerTemplate.getRemark());// 备注
+            temp.setWorkerAge(workerTemplate.getWorkerAge());// 年龄
+            temp.setTeamPost(workerTemplate.getTeamPost());// 队内职务
+            temp.setTrainNum(workerTemplate.getTrainNum());// 培训次数
             try {
                 //插入数据
                 this.save(temp);
@@ -125,12 +127,14 @@ public class EhsFloodDroughtWorkerServiceImpl extends ServiceImpl<EhsFloodDrough
         lqw.like(StringUtils.isNotBlank(query.getTeamName()), EhsFloodDroughtWorker::getTeamName, query.getTeamName());
         lqw.like(StringUtils.isNotBlank(query.getWorkerName()), EhsFloodDroughtWorker::getWorkerName, query.getWorkerName());
         lqw.eq(query.getGender() != null, EhsFloodDroughtWorker::getGender, query.getGender());
-        lqw.eq(query.getBirthday() != null, EhsFloodDroughtWorker::getBirthday, query.getBirthday());
         lqw.eq(StringUtils.isNotBlank(query.getIdCard()), EhsFloodDroughtWorker::getIdCard, query.getIdCard());
         lqw.eq(StringUtils.isNotBlank(query.getPhone()), EhsFloodDroughtWorker::getPhone, query.getPhone());
         lqw.eq(StringUtils.isNotBlank(query.getWorkYear()), EhsFloodDroughtWorker::getWorkYear, query.getWorkYear());
         lqw.eq(StringUtils.isNotBlank(query.getSpeciality()), EhsFloodDroughtWorker::getSpeciality, query.getSpeciality());
         lqw.orderByDesc(EhsFloodDroughtWorker::getCreateTime);
+        lqw.eq(query.getWorkerAge() != null, EhsFloodDroughtWorker::getWorkerAge, query.getWorkerAge());
+        lqw.eq(StringUtils.isNotBlank(query.getTeamPost()), EhsFloodDroughtWorker::getTeamPost, query.getTeamPost());
+        lqw.eq(query.getTrainNum() != null, EhsFloodDroughtWorker::getTrainNum, query.getTrainNum());
         lqw.eq(query.getDeptId() != null, EhsFloodDroughtWorker::getDeptId, query.getDeptId());
         return lqw;
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/domain/EhsRescueTeam.java b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/domain/EhsRescueTeam.java
index 3a0049d..fe5ef06 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/domain/EhsRescueTeam.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/domain/EhsRescueTeam.java
@@ -44,9 +44,33 @@ public class EhsRescueTeam extends BaseEntity {
     private String teamLevel;
 
     /**
-     * 队伍性质
+     * 负责人
      */
-    @Excel(name = "队伍性质(0-其他,1-政府,2-企业,3-社会)")
+    @Excel(name = "负责人")
+    private String dutyer;
+
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /**
+     * 所属单位
+     */
+    @Excel(name = "所属单位")
+    private String unit;
+
+    /**
+     * 驻地
+     */
+    @Excel(name = "驻地")
+    private String station;
+
+    /**
+     * 队伍属性
+     */
+    @Excel(name = "队伍属性(0-其他,1-政府,2-企业,3-社会)")
     private Integer teamProperty;
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/domain/RescueTeamImportTemplate.java b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/domain/RescueTeamImportTemplate.java
index f2acd40..e6b7d97 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/domain/RescueTeamImportTemplate.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/domain/RescueTeamImportTemplate.java
@@ -13,8 +13,24 @@ public class RescueTeamImportTemplate {
     @Excel(name = "队伍级别",type = Excel.Type.ALL)
     private String teamLevel;
 
-    /** 队伍性质 */
-    @Excel(name = "队伍性质(0-其他,1-政府,2-企业,3-社会)",type = Excel.Type.ALL)
+    /** 负责人 */
+    @Excel(name = "负责人",type = Excel.Type.ALL)
+    private String dutyer;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话",type = Excel.Type.ALL)
+    private String phone;
+
+    /** 所属单位 */
+    @Excel(name = "所属单位",type = Excel.Type.ALL)
+    private String unit;
+
+    /** 驻地 */
+    @Excel(name = "驻地",type = Excel.Type.ALL)
+    private String station;
+
+    /** 队伍属性 */
+    @Excel(name = "队伍属性(0-其他,1-政府,2-企业,3-社会)",type = Excel.Type.ALL)
     private Integer teamProperty;
 
     /** 备注 */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/service/impl/EhsRescueTeamServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/service/impl/EhsRescueTeamServiceImpl.java
index 1af8bc9..4e2f25a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/service/impl/EhsRescueTeamServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/service/impl/EhsRescueTeamServiceImpl.java
@@ -102,7 +102,11 @@ public class EhsRescueTeamServiceImpl extends ServiceImpl<EhsRescueTeamMapper, E
             // temp.setId(IdUtils.fastSimpleUUID());
             temp.setTeamName(rescueTeamTemplate.getTeamName());  //队伍名称
             temp.setTeamLevel(rescueTeamTemplate.getTeamLevel()); //队伍级别
-            temp.setTeamProperty(rescueTeamTemplate.getTeamProperty());// 队伍性质
+            temp.setDutyer(rescueTeamTemplate.getDutyer());// 负责人
+            temp.setPhone(rescueTeamTemplate.getPhone());// 联系电话
+            temp.setUnit(rescueTeamTemplate.getUnit());// 所属单位
+            temp.setStation(rescueTeamTemplate.getStation());// 驻地
+            temp.setTeamProperty(rescueTeamTemplate.getTeamProperty());// 队伍属性
             temp.setRemark(rescueTeamTemplate.getRemark()); // 备注
             try {
                 //插入数据
@@ -128,6 +132,10 @@ public class EhsRescueTeamServiceImpl extends ServiceImpl<EhsRescueTeamMapper, E
         lqw.like(StringUtils.isNotBlank(query.getTeamName()), EhsRescueTeam::getTeamName, query.getTeamName());
         lqw.like(StringUtils.isNotBlank(query.getTeamLevel()), EhsRescueTeam::getTeamLevel, query.getTeamLevel());
         lqw.orderByDesc(EhsRescueTeam::getCreateTime);
+        lqw.like(StringUtils.isNotBlank(query.getDutyer()), EhsRescueTeam::getDutyer, query.getDutyer());
+        lqw.eq(StringUtils.isNotBlank(query.getPhone()), EhsRescueTeam::getPhone, query.getPhone());
+        lqw.eq(StringUtils.isNotBlank(query.getUnit()), EhsRescueTeam::getUnit, query.getUnit());
+        lqw.like(StringUtils.isNotBlank(query.getStation()), EhsRescueTeam::getStation, query.getStation());
         return lqw;
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/domain/EhsRescueTeamWorker.java b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/domain/EhsRescueTeamWorker.java
index d3c5b7b..fb29edf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/domain/EhsRescueTeamWorker.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/domain/EhsRescueTeamWorker.java
@@ -52,18 +52,16 @@ public class EhsRescueTeamWorker extends BaseEntity {
     @Excel(name = "人员姓名")
     private String workerName;
 
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private Integer workerAge;
+
     /**
      * 性别
      */
     @Excel(name = "性别(0男 1女)")
     private Integer gender;
 
-    /**
-     * 出生年月
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出生年月(格式为2023-12-12)", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date birthday;
 
     /**
      * 身份证号
@@ -77,6 +75,10 @@ public class EhsRescueTeamWorker extends BaseEntity {
     @Excel(name = "联系方式")
     private String phone;
 
+    /** 队内职务 */
+    @Excel(name = "队内职务")
+    private String teamPost;
+
     /**
      * 工作年限
      */
@@ -89,4 +91,8 @@ public class EhsRescueTeamWorker extends BaseEntity {
     @Excel(name = "救援技能特长")
     private String speciality;
 
+    /** 培训次数 */
+    @Excel(name = "培训次数")
+    private Integer trainNum;
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/domain/RescueTeamWorkerImportTemplate.java b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/domain/RescueTeamWorkerImportTemplate.java
index 8af3bed..f3046ea 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/domain/RescueTeamWorkerImportTemplate.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/domain/RescueTeamWorkerImportTemplate.java
@@ -18,12 +18,7 @@ public class RescueTeamWorkerImportTemplate {
      */
     @Excel(name = "性别(0男 1女)", type = Excel.Type.ALL)
     private Integer gender;
-    /**
-     * 出生年月
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出生年月(格式为2023-12-12)", width = 30, dateFormat = "yyyy-MM-dd", type = Excel.Type.ALL)
-    private Date birthday;
+
     /**
      * 身份证号
      */
@@ -53,4 +48,17 @@ public class RescueTeamWorkerImportTemplate {
      */
     @Excel(name = "备注", type = Excel.Type.ALL)
     private String remark;
+
+    /** 年龄 */
+    @Excel(name = "年龄", type = Excel.Type.ALL)
+    private Integer workerAge;
+
+    /** 队内职务 */
+    @Excel(name = "队内职务", type = Excel.Type.ALL)
+    private String teamPost;
+
+    /** 培训次数 */
+    @Excel(name = "培训次数", type = Excel.Type.ALL)
+    private Integer trainNum;
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/service/impl/EhsRescueTeamWorkerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/service/impl/EhsRescueTeamWorkerServiceImpl.java
index b51a4e7..ed3fde9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/service/impl/EhsRescueTeamWorkerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeamWorker/service/impl/EhsRescueTeamWorkerServiceImpl.java
@@ -92,12 +92,14 @@ public class EhsRescueTeamWorkerServiceImpl extends ServiceImpl<EhsRescueTeamWor
             temp.setRescueTeamName(teamResponseVo.getRescueTeamName());// 队伍名称
             temp.setWorkerName(rescueTeamWorkerTemplate.getWorkerName());// 人员姓名
             temp.setGender(rescueTeamWorkerTemplate.getGender());// 性别(0男 1女)
-            temp.setBirthday(rescueTeamWorkerTemplate.getBirthday());// 出生年月(格式为2023-12-12)
             temp.setIdCard(rescueTeamWorkerTemplate.getIdCard());// 身份证号
             temp.setPhone(rescueTeamWorkerTemplate.getPhone());// 联系方式
             temp.setWorkYear(rescueTeamWorkerTemplate.getWorkYear());// 工作年限
             temp.setSpeciality(rescueTeamWorkerTemplate.getSpeciality());// 救援技能特长
             temp.setRemark(rescueTeamWorkerTemplate.getRemark());// 备注
+            temp.setWorkerAge(rescueTeamWorkerTemplate.getWorkerAge());// 年龄
+            temp.setTeamPost(rescueTeamWorkerTemplate.getTeamPost());// 队内职务
+            temp.setTrainNum(rescueTeamWorkerTemplate.getTrainNum());// 培训次数
 
             try {
                 //插入数据
@@ -132,11 +134,14 @@ public class EhsRescueTeamWorkerServiceImpl extends ServiceImpl<EhsRescueTeamWor
         lqw.like(StringUtils.isNotBlank(query.getRescueTeamName()), EhsRescueTeamWorker::getRescueTeamName, query.getRescueTeamName());
         lqw.like(StringUtils.isNotBlank(query.getWorkerName()), EhsRescueTeamWorker::getWorkerName, query.getWorkerName());
         lqw.eq(query.getGender() != null, EhsRescueTeamWorker::getGender, query.getGender());
-        lqw.eq(query.getBirthday() != null, EhsRescueTeamWorker::getBirthday, query.getBirthday());
         lqw.eq(StringUtils.isNotBlank(query.getIdCard()), EhsRescueTeamWorker::getIdCard, query.getIdCard());
         lqw.eq(StringUtils.isNotBlank(query.getPhone()), EhsRescueTeamWorker::getPhone, query.getPhone());
         lqw.eq(StringUtils.isNotBlank(query.getWorkYear()), EhsRescueTeamWorker::getWorkYear, query.getWorkYear());
         lqw.eq(StringUtils.isNotBlank(query.getSpeciality()), EhsRescueTeamWorker::getSpeciality, query.getSpeciality());
+
+        lqw.eq(query.getWorkerAge() != null, EhsRescueTeamWorker::getWorkerAge, query.getWorkerAge());
+        lqw.eq(StringUtils.isNotBlank(query.getTeamPost()), EhsRescueTeamWorker::getTeamPost, query.getTeamPost());
+        lqw.eq(query.getTrainNum() != null, EhsRescueTeamWorker::getTrainNum, query.getTrainNum());
         lqw.orderByDesc(EhsRescueTeamWorker::getCreateTime);
         return lqw;
     }
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsFloodDroughtTeamMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsFloodDroughtTeamMapper.xml
index 035d2eb..2bbe249 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsFloodDroughtTeamMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsFloodDroughtTeamMapper.xml
@@ -8,6 +8,10 @@
         <result property="id" column="id"/>
         <result property="teamName" column="team_name"/>
         <result property="teamLevel" column="team_level"/>
+        <result property="dutyer" column="dutyer"/>
+        <result property="phone" column="phone"/>
+        <result property="unit" column="unit"/>
+        <result property="station" column="station"/>
         <result property="teamProperty" column="team_property"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -20,7 +24,7 @@
     </resultMap>
 
     <sql id="selectEhsFloodDroughtTeamVo">
-        select id, team_name, team_level, team_property, create_by, create_time, update_by, update_time, remark, dept_id, create_user_id, update_user_id from ehs_flood_drought_team
+        select id, team_name, team_level, dutyer, phone, unit, station, team_property, create_by, create_time, update_by, update_time, remark, dept_id, create_user_id, update_user_id from ehs_flood_drought_team
     </sql>
 
     <select id="selectEhsFloodDroughtTeamList" parameterType="EhsFloodDroughtTeam"
@@ -31,6 +35,10 @@
             <if test="teamLevel != null  and teamLevel != ''">and team_level = #{teamLevel}</if>
             <if test="teamProperty != null">and team_property = #{teamProperty}</if>
             <if test="deptId != null ">and dept_id = #{deptId}</if>
+            <if test="dutyer != null and dutyer != ''">and dutyer like concat('%', #{dutyer}, '%')</if>
+            <if test="phone != null and phone != ''">and phone = #{phone}</if>
+            <if test="unit != null and unit != ''">and unit = #{unit}</if>
+            <if test="station != null and station != ''">and station like concat('%', #{station}, '%')</if>
         </where>
     </select>
 
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsFloodDroughtWorkerMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsFloodDroughtWorkerMapper.xml
index 416a400..d2417fd 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsFloodDroughtWorkerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsFloodDroughtWorkerMapper.xml
@@ -10,11 +10,13 @@
         <result property="teamName" column="team_name"/>
         <result property="workerName" column="worker_name"/>
         <result property="gender" column="gender"/>
-        <result property="birthday" column="birthday"/>
         <result property="idCard" column="id_card"/>
         <result property="phone" column="phone"/>
         <result property="workYear" column="work_year"/>
         <result property="speciality" column="speciality"/>
+        <result property="workerAge"    column="worker_age"    />
+        <result property="teamPost"    column="team_post"    />
+        <result property="trainNum"    column="train_num"    />
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -26,7 +28,7 @@
     </resultMap>
 
     <sql id="selectEhsFloodDroughtWorkerVo">
-        select id, team_id, team_name, worker_name, gender, birthday, id_card, phone, work_year, speciality, create_by, create_time, update_by, update_time, remark, dept_id, create_user_id, update_user_id from ehs_flood_drought_worker
+        select id, team_id, team_name, worker_name, worker_age, team_post, train_num,  gender, id_card, phone, work_year, speciality, create_by, create_time, update_by, update_time, remark, dept_id, create_user_id, update_user_id from ehs_flood_drought_worker
     </sql>
     <select id="selectEhsFloodDroughtWorkerList" parameterType="EhsFloodDroughtWorker"
             resultMap="EhsFloodDroughtWorkerResult">
@@ -34,15 +36,16 @@
         <where>
             <if test="teamId != null ">and team_id = #{teamId}</if>
             <if test="teamName != null  and teamName != ''">and team_name like concat('%', #{teamName}, '%')</if>
-            <if test="workerName != null  and workerName != ''">and worker_name like concat('%', #{workerName}, '%')
-            </if>
+            <if test="workerName != null  and workerName != ''">and worker_name like concat('%', #{workerName}, '%')</if>
             <if test="gender != null ">and gender = #{gender}</if>
-            <if test="birthday != null ">and birthday = #{birthday}</if>
             <if test="idCard != null  and idCard != ''">and id_card = #{idCard}</if>
             <if test="phone != null  and phone != ''">and phone = #{phone}</if>
             <if test="workYear != null  and workYear != ''">and work_year = #{workYear}</if>
             <if test="speciality != null  and speciality != ''">and speciality = #{speciality}</if>
             <if test="deptId != null ">and dept_id = #{deptId}</if>
+            <if test="workerAge != null"> and worker_age = #{workerAge}</if>
+            <if test="teamPost != null  and teamPost != ''"> and team_post = #{teamPost}</if>
+            <if test="trainNum != null"> and train_num = #{trainNum}</if>
         </where>
     </select>
 
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamMapper.xml
index ecaed70..0dd04d2 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamMapper.xml
@@ -8,6 +8,13 @@
         <result property="id" column="id"/>
         <result property="teamName" column="team_name"/>
         <result property="teamLevel" column="team_level"/>
+
+        <result property="dutyer" column="dutyer"/>
+        <result property="phone" column="phone"/>
+        <result property="unit" column="unit"/>
+        <result property="station" column="station"/>
+
+
         <result property="teamProperty" column="team_property"/>
         <!--<result property="rescueWorkerNum"    column="rescue_worker_num"    />-->
         <result property="createBy" column="create_by"/>
@@ -21,7 +28,7 @@
     </resultMap>
 
     <sql id="selectEhsRescueTeamVo">
-        select id, team_name, team_level, team_property, create_by, create_time, update_by, update_time, remark, dept_id, create_user_id, update_user_id from ehs_rescue_team
+        select id, team_name, team_level, dutyer, phone, unit, station, team_property, create_by, create_time, update_by, update_time, remark, dept_id, create_user_id, update_user_id from ehs_rescue_team
     </sql>
 
     <select id="selectEhsRescueTeamList" parameterType="EhsRescueTeam" resultMap="EhsRescueTeamResult">
@@ -31,6 +38,11 @@
             <if test="teamLevel != null  and teamLevel != ''">and team_level like concat('%', #{teamLevel}, '%')</if>
             <if test="teamProperty != null">and team_property = #{teamProperty}</if>
             <if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
+
+            <if test="dutyer != null and dutyer != ''">and dutyer like concat('%', #{dutyer}, '%')</if>
+            <if test="phone != null and phone != ''">and phone = #{phone}</if>
+            <if test="unit != null and unit != ''">and unit = #{unit}</if>
+            <if test="station != null and station != ''">and station like concat('%', #{station}, '%')</if>
         </where>
     </select>
 
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamWorkerMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamWorkerMapper.xml
index 17beece..e76d1ce 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamWorkerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamWorkerMapper.xml
@@ -10,7 +10,9 @@
             <result property="rescueTeamName"    column="rescue_team_name"    />
             <result property="workerName"    column="worker_name"    />
             <result property="gender"    column="gender"    />
-            <result property="birthday"    column="birthday"    />
+            <result property="workerAge"    column="worker_age"    />
+            <result property="teamPost"    column="team_post"    />
+            <result property="trainNum"    column="train_num"    />
             <result property="idCard"    column="id_card"    />
             <result property="phone"    column="phone"    />
             <result property="workYear"    column="work_year"    />
@@ -26,7 +28,7 @@
     </resultMap>
 
     <sql id="selectEhsRescueTeamWorkerVo">
-        select id, rescue_team_id, rescue_team_name, worker_name, gender, birthday, id_card, phone, work_year, speciality, create_by, create_time, update_by, update_time, remark, dept_id, create_user_id, update_user_id from ehs_rescue_team_worker
+        select id, rescue_team_id, rescue_team_name, worker_name, worker_age, gender, id_card, phone, team_post, work_year, speciality, train_num, create_by, create_time, update_by, update_time, remark, dept_id, create_user_id, update_user_id from ehs_rescue_team_worker
     </sql>
     <update id="updateWorkerByTeamId">
         update ehs_rescue_team_worker
@@ -45,11 +47,13 @@
                         <if test="rescueTeamName != null  and rescueTeamName != ''"> and rescue_team_name like concat('%', #{rescueTeamName}, '%')</if>
                         <if test="workerName != null  and workerName != ''"> and worker_name like concat('%', #{workerName}, '%')</if>
                         <if test="gender != null "> and gender = #{gender}</if>
-                        <if test="birthday != null "> and birthday = #{birthday}</if>
                         <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
                         <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
                         <if test="workYear != null  and workYear != ''"> and work_year = #{workYear}</if>
                         <if test="speciality != null  and speciality != ''"> and speciality = #{speciality}</if>
+                        <if test="workerAge != null"> and worker_age = #{workerAge}</if>
+                        <if test="teamPost != null  and teamPost != ''"> and team_post = #{teamPost}</if>
+                        <if test="trainNum != null"> and train_num = #{trainNum}</if>
         </where>
     </select>
 
diff --git a/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue b/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue
index ee232dc..25a0eac 100644
--- a/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue
@@ -27,8 +27,34 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="队伍性质" prop="teamProperty">
-        <el-select v-model="queryParams.teamProperty" placeholder="请选择队伍性质" clearable>
+      <el-form-item label="负责人" prop="dutyer">
+        <el-input
+          v-model="queryParams.dutyer"
+          placeholder="请输入负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入联系电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="驻地" prop="station">
+        <el-input
+          v-model="queryParams.station"
+          placeholder="请输入驻地"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
+      <el-form-item label="队伍属性" prop="teamProperty">
+        <el-select v-model="queryParams.teamProperty" placeholder="请选择队伍属性" clearable>
           <el-option
             v-for="dict in dict.type.team_property"
             :key="dict.value"
@@ -108,7 +134,11 @@
       </el-table-column>
       <el-table-column label="队伍名称" align="center" prop="teamName" />
       <el-table-column label="队伍级别" align="center" prop="teamLevel" />
-      <el-table-column label="队伍性质" align="center" prop="teamProperty">
+      <el-table-column label="负责人" align="center" prop="dutyer" />
+      <el-table-column label="联系电话" align="center" prop="phone" />
+      <el-table-column label="所属单位" align="center" prop="unit" />
+      <el-table-column label="驻地" align="center" prop="station" />
+      <el-table-column label="队伍属性" align="center" prop="teamProperty">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.team_property" :value="scope.row.teamProperty"/>
         </template>
@@ -158,8 +188,27 @@
         <el-form-item label="队伍级别" prop="teamLevel">
           <el-input v-model="form.teamLevel" placeholder="请输入队伍级别" />
         </el-form-item>
-        <el-form-item label="队伍性质" prop="teamProperty">
-          <el-select v-model="form.teamProperty" placeholder="请选择队伍性质">
+        <el-form-item label="负责人" prop="dutyer">
+          <el-input v-model="form.dutyer" placeholder="请输入负责人" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="所属单位" prop="unit">
+          <el-select v-model="form.unit" filterable placeholder="请选择所属单位" clearable>
+            <el-option
+              v-for="dict in allDeptList"
+              :key="dict.deptName"
+              :label="dict.deptName"
+              :value="dict.deptName"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="驻地" prop="station">
+          <el-input v-model="form.station" placeholder="请输入驻地" />
+        </el-form-item>
+        <el-form-item label="队伍属性" prop="teamProperty">
+          <el-select v-model="form.teamProperty" placeholder="请选择队伍属性">
             <el-option
               v-for="dict in dict.type.team_property"
               :key="dict.value"
@@ -241,6 +290,10 @@ export default {
         teamLevel: null,
         deptId: null,
         teamProperty: null,
+        dutyer: null,
+        phone: null,
+        unit: null,
+        station: null,
       },
       // 表单参数
       form: {},
@@ -249,6 +302,9 @@ export default {
         teamName: [
           { required: true, message: "队伍名称不能为空", trigger: "blur" }
         ],
+        phone: [
+          { pattern:/^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/, message: "联系方式必须是手机或固话(区号-固话)", trigger: "change" }
+        ],
       },
       // teamId
       id: "",
@@ -303,7 +359,11 @@ export default {
         remark: null,
         deptId: null,
         createUserId: null,
-        updateUserId: null
+        updateUserId: null,
+        dutyer: null,
+        phone: null,
+        unit: null,
+        station: null,
       };
       this.resetForm("form");
     },
diff --git a/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue b/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue
index 9567869..6e76e59 100644
--- a/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue
@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="队伍名称" prop="teamName">
-        <el-input
-          v-model="queryParams.teamName"
-          placeholder="请输入防汛抗旱队伍名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="人员姓名" prop="workerName">
         <el-input
           v-model="queryParams.workerName"
@@ -44,6 +36,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="队内职务" prop="teamPost">
+        <el-input
+          v-model="queryParams.teamPost"
+          placeholder="请输入队内职务"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="工作年限" prop="workYear">
         <el-input
           v-model="queryParams.workYear"
@@ -127,20 +127,19 @@
       </el-table-column>
       <el-table-column label="队伍名称" align="center" prop="teamName" />
       <el-table-column label="人员姓名" align="center" prop="workerName" />
+      <el-table-column label="年龄" align="center" prop="workerAge" />
       <el-table-column label="性别" align="center" prop="gender">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.gender"/>
         </template>
       </el-table-column>
-      <el-table-column label="出生年月" align="center" prop="birthday" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+
       <el-table-column label="身份证号" align="center" prop="idCard" />
       <el-table-column label="联系方式" align="center" prop="phone" />
+      <el-table-column label="队内职务" align="center" prop="teamPost" />
       <el-table-column label="工作年限" align="center" prop="workYear" />
       <el-table-column label="技能特长" align="center" prop="speciality" />
+      <el-table-column label="培训次数" align="center" prop="trainNum" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -186,6 +185,9 @@
           <el-form-item label="人员姓名" prop="workerName">
             <el-input v-model="form.workerName" placeholder="请输入人员姓名" />
           </el-form-item>
+          <el-form-item label="年龄" prop="workerAge">
+            <el-input v-model="form.workerAge" placeholder="请输入年龄" />
+          </el-form-item>
           <el-form-item label="性别" prop="gender">
             <el-select v-model="form.gender" placeholder="请选择性别">
               <el-option
@@ -196,26 +198,24 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="出生年月" prop="birthday">
-            <el-date-picker clearable
-              v-model="form.birthday"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择出生年月日">
-            </el-date-picker>
-          </el-form-item>
           <el-form-item label="身份证号" prop="idCard">
             <el-input v-model="form.idCard" placeholder="请输入身份证号" />
           </el-form-item>
           <el-form-item label="联系方式" prop="phone">
             <el-input v-model="form.phone" placeholder="请输入联系方式" />
           </el-form-item>
+          <el-form-item label="队内职务" prop="teamPost">
+            <el-input v-model="form.teamPost" placeholder="请输入队内职务" />
+          </el-form-item>
           <el-form-item label="工作年限" prop="workYear">
             <el-input v-model="form.workYear" placeholder="请输入工作年限" />
           </el-form-item>
           <el-form-item label="技能特长" prop="speciality">
             <el-input v-model="form.speciality" placeholder="请输入技能特长" />
           </el-form-item>
+          <el-form-item label="培训次数" prop="trainNum">
+            <el-input v-model="form.trainNum" placeholder="请输入培训次数" />
+          </el-form-item>
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" placeholder="请输入备注" />
           </el-form-item>
@@ -273,12 +273,14 @@ export default {
         teamName: null,
         workerName: null,
         gender: null,
-        birthday: null,
         idCard: null,
         phone: null,
         workYear: null,
         speciality: null,
         deptId: null,
+        workerAge: null,
+        teamPost: null,
+        trainNum: null,
       },
       // 表单参数
       form: {},
@@ -327,7 +329,6 @@ export default {
         teamName: null,
         workerName: null,
         gender: null,
-        birthday: null,
         idCard: null,
         phone: null,
         workYear: null,
@@ -339,7 +340,10 @@ export default {
         remark: null,
         deptId: null,
         createUserId: null,
-        updateUserId: null
+        updateUserId: null,
+        workerAge: null,
+        teamPost: null,
+        trainNum: null,
       };
       this.resetForm("form");
     },
diff --git a/ruoyi-ui/src/views/ehs/ehsRescueTeam/index.vue b/ruoyi-ui/src/views/ehs/ehsRescueTeam/index.vue
index 42c4067..526369c 100644
--- a/ruoyi-ui/src/views/ehs/ehsRescueTeam/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsRescueTeam/index.vue
@@ -28,8 +28,34 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="队伍性质" prop="teamProperty">
-        <el-select v-model="queryParams.teamProperty" placeholder="请选择队伍性质" clearable>
+      <el-form-item label="负责人" prop="dutyer">
+        <el-input
+          v-model="queryParams.dutyer"
+          placeholder="请输入负责人名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入联系人电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="驻地" prop="station">
+        <el-input
+          v-model="queryParams.station"
+          placeholder="请输入驻地"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
+      <el-form-item label="队伍属性" prop="teamProperty">
+        <el-select v-model="queryParams.teamProperty" placeholder="请选择队伍属性" clearable>
           <el-option
             v-for="dict in dict.type.team_property"
             :key="dict.value"
@@ -110,7 +136,11 @@
       </el-table-column>
       <el-table-column label="队伍名称" align="center" prop="teamName" />
       <el-table-column label="队伍级别" align="center" prop="teamLevel" />
-      <el-table-column label="队伍性质" align="center" prop="teamProperty">
+      <el-table-column label="负责人" align="center" prop="dutyer" />
+      <el-table-column label="联系电话" align="center" prop="phone" />
+      <el-table-column label="所属单位" align="center" prop="unit" />
+      <el-table-column label="驻地" align="center" prop="station" />
+      <el-table-column label="队伍属性" align="center" prop="teamProperty">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.team_property" :value="scope.row.teamProperty"/>
         </template>
@@ -161,8 +191,31 @@
         <el-form-item label="队伍级别" prop="teamLevel">
           <el-input v-model="form.teamLevel" placeholder="请输入队伍级别" />
         </el-form-item>
-        <el-form-item label="队伍性质" prop="teamProperty">
-          <el-select v-model="form.teamProperty" placeholder="请选择队伍性质">
+
+        <el-form-item label="负责人" prop="dutyer">
+          <el-input v-model="form.dutyer" placeholder="请输入负责人" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入联系电话" />
+        </el-form-item>
+
+        <el-form-item label="所属单位" prop="unit">
+          <el-select v-model="form.unit" filterable placeholder="请选择所属单位" clearable>
+            <el-option
+              v-for="dict in allDeptList"
+              :key="dict.deptName"
+              :label="dict.deptName"
+              :value="dict.deptName"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="驻地" prop="station">
+          <el-input v-model="form.station" placeholder="请输入驻地" />
+        </el-form-item>
+
+        <el-form-item label="队伍属性" prop="teamProperty">
+          <el-select v-model="form.teamProperty" placeholder="请选择队伍属性">
             <el-option
               v-for="dict in dict.type.team_property"
               :key="dict.value"
@@ -247,6 +300,10 @@ export default {
         pageSize: 10,
         teamName: null,
         teamLevel: null,
+        dutyer: null,
+        phone: null,
+        unit: null,
+        station: null,
         deptId: null,
         teamProperty: null,
       },
@@ -257,6 +314,9 @@ export default {
         teamName: [
           { required: true, message: "队伍名称不能为空", trigger: "blur" }
         ],
+        phone: [
+          { pattern:/^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/, message: "联系方式必须是手机或固话(区号-固话)", trigger: "change" }
+        ],
       }
     };
   },
@@ -308,7 +368,11 @@ export default {
         remark: null,
         deptId: null,
         createUserId: null,
-        updateUserId: null
+        updateUserId: null,
+        dutyer: null,
+        phone: null,
+        unit: null,
+        station: null,
       };
       this.resetForm("form");
     },
diff --git a/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue b/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue
index 8f3425e..fdc3ccb 100644
--- a/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue
@@ -9,14 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="队伍名称" prop="rescueTeamName">
+<!--      <el-form-item label="队伍名称" prop="rescueTeamName">
         <el-input
           v-model="queryParams.rescueTeamName"
           placeholder="请输入应急救援队伍名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="人员姓名" prop="workerName">
         <el-input
           v-model="queryParams.workerName"
@@ -35,14 +35,7 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="出生年月" prop="birthday">
-        <el-date-picker clearable
-          v-model="queryParams.birthday"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择出生年月">
-        </el-date-picker>
-      </el-form-item>-->
+
 <!--      <el-form-item label="身份证号" prop="idCard">
         <el-input
           v-model="queryParams.idCard"
@@ -59,6 +52,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="队内职务" prop="teamPost">
+        <el-input
+          v-model="queryParams.teamPost"
+          placeholder="请输入队内职务"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="工作年限" prop="workYear">
         <el-input
           v-model="queryParams.workYear"
@@ -152,20 +153,19 @@
 <!--      <el-table-column label="应急救援队伍id" align="center" prop="rescueTeamId" />-->
       <el-table-column label="队伍名称" align="center" prop="rescueTeamName" />
       <el-table-column label="人员姓名" align="center" prop="workerName" />
+      <el-table-column label="年龄" align="center" prop="workerAge" />
       <el-table-column label="性别" align="center" prop="gender">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.gender"/>
         </template>
       </el-table-column>
-      <el-table-column label="出生年月" align="center" prop="birthday" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+
       <el-table-column label="身份证号" align="center" prop="idCard" />
       <el-table-column label="联系方式" align="center" prop="phone" />
+      <el-table-column label="队内职务" align="center" prop="teamPost" />
       <el-table-column label="工作年限" align="center" prop="workYear" />
       <el-table-column label="救援技能特长" align="center" prop="speciality" />
+      <el-table-column label="培训次数" align="center" prop="trainNum" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -211,6 +211,9 @@
           <el-form-item label="人员姓名" prop="workerName">
             <el-input v-model="form.workerName" placeholder="请输入人员姓名" />
           </el-form-item>
+          <el-form-item label="年龄" prop="workerAge">
+            <el-input v-model="form.workerAge" placeholder="请输入年龄" />
+          </el-form-item>
           <el-form-item label="性别" prop="gender">
             <el-select v-model="form.gender" placeholder="请选择性别">
               <el-option
@@ -221,26 +224,24 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="出生年月" prop="birthday">
-            <el-date-picker clearable
-              v-model="form.birthday"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择出生年月">
-            </el-date-picker>
-          </el-form-item>
           <el-form-item label="身份证号" prop="idCard">
             <el-input v-model="form.idCard" placeholder="请输入身份证号" />
           </el-form-item>
           <el-form-item label="联系方式" prop="phone">
             <el-input v-model="form.phone" placeholder="请输入联系方式" />
           </el-form-item>
+          <el-form-item label="队内职务" prop="teamPost">
+            <el-input v-model="form.teamPost" placeholder="请输入队内职务" />
+          </el-form-item>
           <el-form-item label="工作年限" prop="workYear">
             <el-input v-model="form.workYear" placeholder="请输入工作年限" />
           </el-form-item>
           <el-form-item label="救援技能特长" prop="speciality">
             <el-input v-model="form.speciality" placeholder="请输入救援技能特长" />
           </el-form-item>
+          <el-form-item label="培训次数" prop="trainNum">
+            <el-input v-model="form.trainNum" placeholder="请输入培训次数" />
+          </el-form-item>
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" placeholder="请输入备注" />
           </el-form-item>
@@ -307,11 +308,13 @@ export default {
         rescueTeamName: null,
         workerName: null,
         gender: null,
-        birthday: null,
         idCard: null,
         phone: null,
         workYear: null,
         speciality: null,
+        workerAge: null,
+        teamPost: null,
+        trainNum: null,
       },
       // 表单参数
       form: {},
@@ -360,7 +363,6 @@ export default {
         rescueTeamName: null,
         workerName: null,
         gender: null,
-        birthday: null,
         idCard: null,
         phone: null,
         workYear: null,
@@ -372,7 +374,10 @@ export default {
         remark: null,
         deptId: null,
         createUserId: null,
-        updateUserId: null
+        updateUserId: null,
+        workerAge: null,
+        teamPost: null,
+        trainNum: null,
       };
       this.resetForm("form");
     },