From 0c52c579bc04a2a5ebe2607a8828576f1cd8ad4d Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Fri, 31 May 2024 16:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=96=B0=E5=A2=9E=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zc/business/domain/DcEmployees.java   | 22 ++++++++--------
 .../zc/business/domain/DcOrganization.java    | 26 +++++++++----------
 .../mapper/business/DcEmployeesMapper.xml     | 11 ++++----
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEmployees.java b/zc-business/src/main/java/com/zc/business/domain/DcEmployees.java
index ef2635f2..ea44e535 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcEmployees.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcEmployees.java
@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 值班人员信息对象 dc_employees
- * 
+ *
  * @author ruoyi
  * @date 2024-01-04
  */
@@ -50,7 +50,7 @@ public class DcEmployees extends BaseEntity
 
     private  Long parentId;
     //人员类型1为路管人员2为应急人员
-    @Excel(name = "人员类型 1-路管人员 2-交警人员")
+    @Excel(name = "人员类型",readConverterExp = "1=路管人员,2=交警人员")
     private Long employeesType;
     //类型参数
     private String type;
@@ -100,43 +100,43 @@ public class DcEmployees extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setPostId(String postId) 
+    public void setPostId(String postId)
     {
         this.postId = postId;
     }
 
-    public String getPostId() 
+    public String getPostId()
     {
         return postId;
     }
-    public void setOrganizationId(Long organizationId) 
+    public void setOrganizationId(Long organizationId)
     {
         this.organizationId = organizationId;
     }
 
-    public Long getOrganizationId() 
+    public Long getOrganizationId()
     {
         return organizationId;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setContactNumber(String contactNumber) 
+    public void setContactNumber(String contactNumber)
     {
         this.contactNumber = contactNumber;
     }
 
-    public String getContactNumber() 
+    public String getContactNumber()
     {
         return contactNumber;
     }
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java b/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java
index f396054a..094ed367 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java
@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.TreeEntity;
 
 /**
  * 机构管理对象 dc_organization
- * 
+ *
  * @author ruoyi
  * @date 2024-01-04
  */
@@ -23,7 +23,7 @@ public class DcOrganization extends TreeEntity
 
     /** 1-运管中心2-驻点 */
     @ApiModelProperty(value = "类型1-运管中心 2-驻点", required = true)
-    @Excel(name = "1-运管中心 2-驻点")
+    @Excel(name = "类型",readConverterExp = "1=运管中心,2=驻点")
     private Integer organizationType;
 
     /** 名称 */
@@ -88,34 +88,34 @@ public class DcOrganization extends TreeEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setOrganizationType(Integer organizationType) 
+    public void setOrganizationType(Integer organizationType)
     {
         this.organizationType = organizationType;
     }
 
-    public Integer getOrganizationType() 
+    public Integer getOrganizationType()
     {
         return organizationType;
     }
-    public void setOrganizationName(String organizationName) 
+    public void setOrganizationName(String organizationName)
     {
         this.organizationName = organizationName;
     }
 
-    public String getOrganizationName() 
+    public String getOrganizationName()
     {
         return organizationName;
     }
-    public void setOrganizationAddress(String organizationAddress) 
+    public void setOrganizationAddress(String organizationAddress)
     {
         this.organizationAddress = organizationAddress;
     }
 
-    public String getOrganizationAddress() 
+    public String getOrganizationAddress()
     {
         return organizationAddress;
     }
@@ -128,21 +128,21 @@ public class DcOrganization extends TreeEntity
     {
         return stakeMark;
     }
-    public void setRescueUnit(String rescueUnit) 
+    public void setRescueUnit(String rescueUnit)
     {
         this.rescueUnit = rescueUnit;
     }
 
-    public String getRescueUnit() 
+    public String getRescueUnit()
     {
         return rescueUnit;
     }
-    public void setDescription(String description) 
+    public void setDescription(String description)
     {
         this.description = description;
     }
 
-    public String getDescription() 
+    public String getDescription()
     {
         return description;
     }
diff --git a/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml b/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml
index 5b64de76..2df32584 100644
--- a/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zc.business.mapper.DcEmployeesMapper">
-    
+
     <resultMap type="DcEmployees" id="DcEmployeesResult">
         <result property="id"    column="id"    />
         <result property="postId"    column="post_id"    />
@@ -33,13 +33,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDcEmployeesList" parameterType="DcEmployees" resultMap="DcEmployeesResult">
         <include refid="selectDcEmployeesVo"/>
-        <where>  
+        <where>
             <if test="postId != null  and postId != ''"> and employees.post_id = #{postId}</if>
             <if test="organizationId != null "> and employees.organization_id = #{organizationId}</if>
             <if test="name != null  and name != ''"> and CONCAT(employees.name,employees.contact_number) like concat('%', #{name}, '%')</if>
+            <if test="employeesType != null "> and employees.employees_type = #{employeesType}</if>
         </where>
     </select>
-    
+
     <select id="selectDcEmployeesById" parameterType="Long" resultMap="DcEmployeesResult">
         <include refid="selectDcEmployeesVo"/>
         where employees.id = #{id}
@@ -90,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDcEmployeesByIds" parameterType="String">
-        delete from dc_employees where id in 
+        delete from dc_employees where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -126,4 +127,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateJobInformation">
         update dc_employees set  organization_id=#{station} where employees_id=#{employeesId}
     </update>
-</mapper>
\ No newline at end of file
+</mapper>