凌云集团更改公司

admin-ui/app/whepi/scan/specialPersonnelLYS.js

@@ -279,7 +279,8 @@ define(function (require) {
                                                 maxlength: 50
                                             }
                                         },
-                                        {field: 'staffName', title: '修改人', maxWidth: 200, align: 'left',},
+                                        {field: 'createName', title: '新增人', maxWidth: 200, align: 'left',},
+                                        {field: 'updateName', title: '修改人', maxWidth: 200, align: 'left',},
                                     ]
                                 ]
                         }

admin-ui/app/whepi/scan/specialPersonnelLYS2.js

@@ -238,7 +238,8 @@ define(function (require) {
                                                 maxlength: 50
                                             }
                                         },
-                                        {field: 'staffName', title: '修改人', maxWidth: 200, align: 'left',},
+                                        {field: 'createName', title: '新增人', maxWidth: 200, align: 'left',},
+                                        {field: 'updateName', title: '修改人', maxWidth: 200, align: 'left',},
                                     ]
                                 ]
                         }

admin-ui/app/whepi/scan/specialPersonnelLYSixS.js

@@ -261,7 +261,8 @@ define(function (require) {
                                                 maxlength: 50
                                             }
                                         },
-                                        {field: 'staffName', title: '修改人', maxWidth: 200, align: 'left',},
+                                        {field: 'createName', title: '新增人', maxWidth: 200, align: 'left',},
+                                        {field: 'updateName', title: '修改人', maxWidth: 200, align: 'left',},
                                     ]
                                 ]
                         }

whepi-web/src/main/java/com/bofeng/entity/OutUser.java

@@ -82,5 +82,8 @@ public class OutUser {
     private String doorplate;
 
     @TableField(exist = false)
-    private String staffName;
+    private String createName;
+
+    @TableField(exist = false)
+    private String updateName;
 }

whepi-web/src/main/resources/mapper/OutUserMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="getAllOutUser" resultType="com.bofeng.entity.OutUser">
         select u.tu_id,ur.user_id as userId,su.uptown_name as uptownName,uu.ridgepole,uu.unit,u.name,u.phone,suh.doorplate,
-        DATE_FORMAT(u.start_date,'%Y-%m-%d') as startDateStr,DATE_FORMAT(u.end_date,'%Y-%m-%d') as endDateStr,sur.staff_name as staffName
+        DATE_FORMAT(u.start_date,'%Y-%m-%d') as startDateStr,DATE_FORMAT(u.end_date,'%Y-%m-%d') as endDateStr,sur.staff_name as createName,sur1.staff_name as updateName
         from out_user u
         left join sys_uptown_home uh on uh.phone = u.phone and uh.linkman = u.name
         left join sys_user_role ur on ur.property_id = uh.house_id and ur.role_id = 1
@@ -12,6 +12,7 @@
         left join sys_uptown_unit uu on uu.unit_id = suh.unit_id
         left join sys_uptown su on su.uptown_id = uu.uptown_id
         left join sys_user sur on sur.user_id = u.user_update
+        left join sys_user sur1 on sur1.user_id = u.user_create
         <where>
             <if test="queryProperties != null and queryProperties != ''">
                 (
@@ -34,7 +35,7 @@
 
     <select id="getAllOutUserLY" resultType="com.bofeng.entity.OutUser">
         select u.tu_id,ur.user_id as userId,su.uptown_name as uptownName,CONCAT(uu.ridgepole,uu.unit) as unit,u.name,u.phone,suh.doorplate,
-        DATE_FORMAT(u.start_date,'%Y-%m-%d') as startDateStr,DATE_FORMAT(u.end_date,'%Y-%m-%d') as endDateStr,sur.staff_name as staffName
+        DATE_FORMAT(u.start_date,'%Y-%m-%d') as startDateStr,DATE_FORMAT(u.end_date,'%Y-%m-%d') as endDateStr,sur.staff_name as createName,sur1.staff_name as updateName
         from out_user u
         left join sys_uptown_home uh on uh.phone = u.phone and uh.linkman = u.name
         left join sys_user_role ur on ur.property_id = uh.house_id and ur.role_id = 1
@@ -42,6 +43,7 @@
         left join sys_uptown_unit uu on uu.unit_id = suh.unit_id
         left join sys_uptown su on su.uptown_id = uu.uptown_id
         left join sys_user sur on sur.user_id = u.user_update
+        left join sys_user sur1 on sur1.user_id = u.user_create
         <where>
             <if test="queryProperties != null and queryProperties != ''">
                 (