修改

zhsq_qk-system/src/main/java/zhsq_qk/system/domain/QkEmergencyRescueTeam.java

@@ -11,193 +11,250 @@ import zhsq_qk.common.core.domain.BaseEntity;
  * @author lc
  * @date 2024-07-18
  */
-public class QkEmergencyRescueTeam extends BaseEntity
-        {
-private static final long serialVersionUID = 1L;
-
-        /** 主键id */
-        private Long id;
-
-        /** 姓名 */
-                @Excel(name = "姓名")
-        private String name;
-
-        /** 账号 */
-                @Excel(name = "账号")
-        private String userName;
-
-        /** 组织归属 */
-                @Excel(name = "组织归属")
-        private String dept;
-
-        /** 职务 */
-                @Excel(name = "职务")
-        private String post;
-
-        /** 单位 */
-                @Excel(name = "单位")
-        private String company;
-
-        /** 救援队 */
-                @Excel(name = "救援队")
-        private String emergencyRescue;
-
-        /** 市 */
-                @Excel(name = "市")
-        private String city;
-
-        /** 区县 */
-                @Excel(name = "区县")
-        private String area;
-
-        /** 乡镇 */
-                @Excel(name = "乡镇")
-        private String township;
-
-        /** 村 */
-                @Excel(name = "村")
-        private String village;
-
-        /** 手机号 */
-                @Excel(name = "手机号")
-        private String phone;
-
-        /** 防汛抗旱 */
-                @Excel(name = "防汛抗旱")
-        private String effect;
-
-        /** 经度 */
-                @Excel(name = "经度")
-        private String longitude;
-
-        /** 纬度 */
-                @Excel(name = "纬度")
-        private String latitude;
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public Long getId() {
-            return id;
-        }
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-        public void setUserName(String userName) {
-            this.userName = userName;
-        }
-
-        public String getUserName() {
-            return userName;
-        }
-        public void setDept(String dept) {
-            this.dept = dept;
-        }
-
-        public String getDept() {
-            return dept;
-        }
-        public void setPost(String post) {
-            this.post = post;
-        }
-
-        public String getPost() {
-            return post;
-        }
-        public void setCompany(String company) {
-            this.company = company;
-        }
-
-        public String getCompany() {
-            return company;
-        }
-        public void setEmergencyRescue(String emergencyRescue) {
-            this.emergencyRescue = emergencyRescue;
-        }
-
-        public String getEmergencyRescue() {
-            return emergencyRescue;
-        }
-        public void setCity(String city) {
-            this.city = city;
-        }
-
-        public String getCity() {
-            return city;
-        }
-        public void setArea(String area) {
-            this.area = area;
-        }
-
-        public String getArea() {
-            return area;
-        }
-        public void setTownship(String township) {
-            this.township = township;
-        }
-
-        public String getTownship() {
-            return township;
-        }
-        public void setVillage(String village) {
-            this.village = village;
-        }
-
-        public String getVillage() {
-            return village;
-        }
-        public void setPhone(String phone) {
-            this.phone = phone;
-        }
-
-        public String getPhone() {
-            return phone;
-        }
-        public void setEffect(String effect) {
-            this.effect = effect;
-        }
-
-        public String getEffect() {
-            return effect;
-        }
-        public void setLongitude(String longitude) {
-            this.longitude = longitude;
-        }
-
-        public String getLongitude() {
-            return longitude;
-        }
-        public void setLatitude(String latitude) {
-            this.latitude = latitude;
-        }
-
-        public String getLatitude() {
-            return latitude;
-        }
-
-@Override
-public String toString() {
-    return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-        .append("id", getId())
-        .append("name", getName())
-        .append("userName", getUserName())
-        .append("dept", getDept())
-        .append("post", getPost())
-        .append("company", getCompany())
-        .append("emergencyRescue", getEmergencyRescue())
-        .append("city", getCity())
-        .append("area", getArea())
-        .append("township", getTownship())
-        .append("village", getVillage())
-        .append("phone", getPhone())
-        .append("effect", getEffect())
-        .append("longitude", getLongitude())
-        .append("latitude", getLatitude())
-            .toString();
-}
+public class QkEmergencyRescueTeam extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名")
+    private String name;
+
+    /**
+     * 账号
+     */
+    @Excel(name = "账号")
+    private String userName;
+
+    /**
+     * 组织归属
+     */
+    @Excel(name = "组织归属")
+    private String dept;
+
+    /**
+     * 职务
+     */
+    @Excel(name = "职务")
+    private String post;
+
+    /**
+     * 单位
+     */
+    @Excel(name = "单位")
+    private String company;
+
+    /**
+     * 救援队
+     */
+    @Excel(name = "救援队")
+    private String emergencyRescue;
+
+    /**
+     * 市
+     */
+    @Excel(name = "市")
+    private String city;
+
+    /**
+     * 区县
+     */
+    @Excel(name = "区县")
+    private String area;
+
+    /**
+     * 乡镇
+     */
+    @Excel(name = "乡镇")
+    private String township;
+
+    /**
+     * 村
+     */
+    @Excel(name = "村")
+    private String village;
+
+    /**
+     * 手机号
+     */
+    @Excel(name = "手机号")
+    private String phone;
+
+    /**
+     * 防汛抗旱
+     */
+    @Excel(name = "防汛抗旱")
+    private String effect;
+
+    /**
+     * 经度
+     */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @Excel(name = "纬度")
+    private String latitude;
+
+    /**
+     * 所属部门id
+     */
+    private Long deptId;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setDept(String dept) {
+        this.dept = dept;
+    }
+
+    public String getDept() {
+        return dept;
+    }
+
+    public void setPost(String post) {
+        this.post = post;
+    }
+
+    public String getPost() {
+        return post;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setEmergencyRescue(String emergencyRescue) {
+        this.emergencyRescue = emergencyRescue;
+    }
+
+    public String getEmergencyRescue() {
+        return emergencyRescue;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setTownship(String township) {
+        this.township = township;
+    }
+
+    public String getTownship() {
+        return township;
+    }
+
+    public void setVillage(String village) {
+        this.village = village;
+    }
+
+    public String getVillage() {
+        return village;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setEffect(String effect) {
+        this.effect = effect;
+    }
+
+    public String getEffect() {
+        return effect;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("userName", getUserName())
+                .append("dept", getDept())
+                .append("post", getPost())
+                .append("company", getCompany())
+                .append("emergencyRescue", getEmergencyRescue())
+                .append("city", getCity())
+                .append("area", getArea())
+                .append("township", getTownship())
+                .append("village", getVillage())
+                .append("phone", getPhone())
+                .append("effect", getEffect())
+                .append("longitude", getLongitude())
+                .append("latitude", getLatitude())
+                .append("deptId", getDeptId())
+                .toString();
+    }
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/domain/QkRescueSupplies.java

@@ -55,6 +55,11 @@ public class QkRescueSupplies extends BaseEntity {
     @Excel(name = "所属部门")
     private String dept;
 
+    /**
+     * 所属部门id
+     */
+    private Long deptId;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -110,6 +115,13 @@ public class QkRescueSupplies extends BaseEntity {
     public String getDept() {
         return dept;
     }
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
 
     @Override
     public String toString() {
@@ -121,6 +133,7 @@ public class QkRescueSupplies extends BaseEntity {
                 .append("longitude", getLongitude())
                 .append("latitude", getLatitude())
                 .append("dept", getDept())
+                .append("deptId", getDeptId())
                 .toString();
     }
 }

zhsq_qk-system/src/main/resources/mapper/system/QkEmergencyRescueTeamMapper.xml

@@ -9,6 +9,7 @@
             <result property="name" column="name"/>
             <result property="userName" column="user_name"/>
             <result property="dept" column="dept"/>
+            <result property="deptId" column="dept_id"/>
             <result property="post" column="post"/>
             <result property="company" column="company"/>
             <result property="emergencyRescue" column="emergency_rescue"/>
@@ -213,6 +214,7 @@
     <select id="selectQkEmergencyRescueTeamAllList" parameterType="QkEmergencyRescueTeam" resultMap="QkEmergencyRescueTeamResult">
         SELECT
             id,
+            sd.dept_id,
             sd.dept_name as dept,
             longitude,
             latitude

zhsq_qk-system/src/main/resources/mapper/system/QkRescueSuppliesMapper.xml

@@ -9,6 +9,7 @@
             <result property="varieties" column="varieties"/>
             <result property="cost" column="cost"/>
             <result property="dept" column="dept"/>
+            <result property="deptId" column="dept_id"/>
             <result property="remarks" column="remarks"/>
             <result property="longitude" column="longitude"/>
             <result property="latitude" column="latitude"/>
@@ -112,6 +113,7 @@
     <select id="selectQkRescueSuppliesAllList" parameterType="QkRescueSupplies" resultMap="QkRescueSuppliesResult">
         SELECT
             id,
+            sd.dept_id,
             sd.dept_name AS dept,
             longitude,
             latitude