四长制增加姓名模糊查询

src/main/java/com/sooka/sponest/data/digitalenvironment/domain/bo/EnvironmentLeaderBO.java

@@ -12,5 +12,8 @@ public class EnvironmentLeaderBO {
     String nickName;
     String deptName;
     Long userId;
+    String phone;
+    String environmentJob;
+    String environmentLabel;
 
 }

src/main/java/com/sooka/sponest/data/digitalenvironment/domain/vo/EnvironmentLeaderVO.java

@@ -17,4 +17,6 @@ public class EnvironmentLeaderVO extends BaseBusinessEntity {
     private Long trackById;
 
     private String deptId;
+
+    private String name;
 }

src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/bo/VisuForestLeaderBO.java

@@ -14,5 +14,7 @@ public class VisuForestLeaderBO {
     String userId;
     String phonenumber;
     String linPhone;
+    String firecontrolJob;
+    String firecontrolLabel;
 
 }

src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/vo/VisuForestLeaderVO.java

@@ -16,5 +16,8 @@ public class VisuForestLeaderVO extends BaseBusinessEntity {
     @ApiModelProperty(value = "轨迹id", required = false)
     private Long trackById;
 
+    //姓名
+    private String name;
+
     private String deptId;
 }

src/main/java/com/sooka/sponest/data/digitalforest/domain/bo/ForestLeaderBO.java

@@ -15,4 +15,7 @@ public class ForestLeaderBO {
     String phonenumber;
     String linPhone;
 
+    String linJob;
+    String linLabel;
+
 }

src/main/java/com/sooka/sponest/data/digitalforest/domain/vo/ForestLeaderVO.java

@@ -17,4 +17,6 @@ public class ForestLeaderVO extends BaseBusinessEntity {
     private Long trackById;
 
     private String deptId;
+
+    private String name;
 }

src/main/resources/mapper/digitalenvironment/EnvironmentViewMapper.xml

@@ -34,16 +34,24 @@
 	<select id="getEnvironmentLeader" parameterType="EnvironmentLeaderVO" resultType="EnvironmentLeaderBO">
 		SELECT
 		a.name as nickName,
-		u.user_id as userId
+		u.user_id as userId,
+		a.phone phone,
+		d.dept_name deptName,
+		a.environment_job environmentJob,
+		b.dict_label environmentLabel
 		FROM
 		centerdata_t_environment_person a
 		LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
 		LEFT JOIN ${database_system}.sys_user u ON a.user_id = u.user_id
+		left join ${database_system}.sys_dict_data b on a.environment_job = b.dict_value
 		WHERE
 		1 = 1
 		<if test="environmentJob != null and environmentJob != ''">
 			and a.environment_job=#{environmentJob}
 		</if>
+		<if test="name != null and name != ''">
+			and a.name like concat('%', #{name}, '%')
+		</if>
 		<choose>
 			<when test="deptId != null and deptId != ''">and FIND_IN_SET( #{deptId}, CONCAT(d.ancestors,',',d.dept_id) )</when>
 			<otherwise>${params.dataScope}</otherwise>

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolPersonMapper.xml

@@ -219,11 +219,14 @@
     <select id="getResourcesLeader" parameterMap="pm_VisuForestLeader" resultMap="rm_VisuForestLeader">
         SELECT
         a.name as nickName,
-        u.user_id as userId
+        u.user_id as userId,
+        a.firecontrol_job firecontrolJob,
+        b.dict_label firecontrolLabel
         FROM
         ${database_data}.centerdata_t_firecontrol_person a
         LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
         LEFT JOIN ${database_system}.sys_user u ON a.user_id = u.user_id
+        left join ${database_system}.sys_dict_data b on a.firecontrol_job = b.dict_value
         WHERE
         1 = 1
         <if test="linJob != null and linJob != ''">

src/main/resources/mapper/digitalforest/ForestViewMapper.xml

@@ -84,11 +84,14 @@
         u.user_id as userId,
         d.dept_name as deptName,
         u.phonenumber as phonenumber,
-        a.lin_phone as linPhone
+        a.lin_phone as linPhone,
+        a.lin_job linJob,
+        b.dict_label linLabel
         FROM
         centerdata_t_forest_linleader a
         LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
         LEFT JOIN ${database_system}.sys_user u ON a.user_id = u.user_id
+        left join ${database_system}.sys_dict_data b on a.lin_job = b.dict_value
         WHERE
         1 = 1
         <if test="linJob != null and linJob != ''">