勤务模块

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendancePostRecordController.java

@@ -95,6 +95,9 @@ public class AttendancePostRecordController extends BaseController {
             case STATION:
                 attendancePostRecord.setAttendanceStationId(dataPermission.getValue());
                 break;
+            case BRIGADE:
+                attendancePostRecord.setAttendanceBrigadeId(dataPermission.getValue());
+                break;
             case DEPARTMENT:
                 attendancePostRecord.setAttendanceDepartmentId(dataPermission.getValue());
                 break;
@@ -234,6 +237,9 @@ public class AttendancePostRecordController extends BaseController {
             case STATION:
                 attendancePostRecord.setAttendanceStationId(dataPermission.getValue());
                 break;
+            case BRIGADE:
+                attendancePostRecord.setAttendanceBrigadeId(dataPermission.getValue());
+                break;
             case DEPARTMENT:
                 attendancePostRecord.setAttendanceDepartmentId(dataPermission.getValue());
                 break;
@@ -293,10 +299,15 @@ public class AttendancePostRecordController extends BaseController {
             if (ObjUtil.isNotNull(department)) {
                 attendancePostRecord.setAttendanceDepartmentId(department.getDeptId());
                 attendancePostRecord.setAttendanceDepartmentName(department.getDeptName());
-                SysDept station = sysDeptService.selectDeptById(department.getParentId());
-                if (ObjUtil.isNotNull(station)) {
-                    attendancePostRecord.setAttendanceStationId(station.getDeptId());
-                    attendancePostRecord.setAttendanceStationName(station.getDeptName());
+                SysDept brigade = sysDeptService.selectDeptById(department.getParentId());
+                if (ObjUtil.isNotNull(brigade)) {
+                    attendancePostRecord.setAttendanceBrigadeId(brigade.getDeptId());
+                    attendancePostRecord.setAttendanceBrigadeName(brigade.getDeptName());
+                    SysDept station = sysDeptService.selectDeptById(brigade.getParentId());
+                    if (ObjUtil.isNotNull(station)) {
+                        attendancePostRecord.setAttendanceStationId(station.getDeptId());
+                        attendancePostRecord.setAttendanceStationName(station.getDeptName());
+                    }
                 }
             }
         }
@@ -596,12 +607,15 @@ public class AttendancePostRecordController extends BaseController {
 
                 String[] teamStr = vo.getAttendanceTeamName().split("/");
                 SysDept station = deptList.stream().filter(x -> StrUtil.equals(teamStr[0], x.getDeptName())).findFirst().orElse(new SysDept());
-                SysDept department = deptList.stream().filter(x -> StrUtil.equals(teamStr[1], x.getDeptName()) && ObjUtil.equals(station.getDeptId(), x.getParentId())).findFirst().orElse(new SysDept());
-                SysDept teams = deptList.stream().filter(x -> StrUtil.equals(teamStr[2], x.getDeptName()) && ObjUtil.equals(department.getDeptId(), x.getParentId())).findFirst().orElse(new SysDept());
+                SysDept brigade = deptList.stream().filter(x -> StrUtil.equals(teamStr[1], x.getDeptName()) && ObjUtil.equals(station.getDeptId(), x.getParentId())).findFirst().orElse(new SysDept());
+                SysDept department = deptList.stream().filter(x -> StrUtil.equals(teamStr[2], x.getDeptName()) && ObjUtil.equals(brigade.getDeptId(), x.getParentId())).findFirst().orElse(new SysDept());
+                SysDept teams = deptList.stream().filter(x -> StrUtil.equals(teamStr[3], x.getDeptName()) && ObjUtil.equals(department.getDeptId(), x.getParentId())).findFirst().orElse(new SysDept());
                 attendancePostRecord.setAttendanceTeamId(teams.getDeptId());
                 attendancePostRecord.setAttendanceTeamName(teams.getDeptName());
                 attendancePostRecord.setAttendanceDepartmentId(department.getDeptId());
                 attendancePostRecord.setAttendanceDepartmentName(department.getDeptName());
+                attendancePostRecord.setAttendanceBrigadeId(brigade.getDeptId());
+                attendancePostRecord.setAttendanceBrigadeName(brigade.getDeptName());
                 attendancePostRecord.setAttendanceStationId(station.getDeptId());
                 attendancePostRecord.setAttendanceStationName(station.getDeptName());
 

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendanceRecordController.java

@@ -64,6 +64,9 @@ public class AttendanceRecordController extends BaseController {
             case STATION:
                 attendanceRecord.setStationCode(dataPermission.getValue().toString());
                 break;
+            case BRIGADE:
+                attendanceRecord.setBrigadeCode(dataPermission.getValue().toString());
+                break;
             case DEPARTMENT:
                 attendanceRecord.setDepartmentCode(dataPermission.getValue().toString());
                 break;
@@ -97,6 +100,9 @@ public class AttendanceRecordController extends BaseController {
             case STATION:
                 attendanceRecord.setStationCode(dataPermission.getValue().toString());
                 break;
+            case BRIGADE:
+                attendanceRecord.setBrigadeCode(dataPermission.getValue().toString());
+                break;
             case DEPARTMENT:
                 attendanceRecord.setDepartmentCode(dataPermission.getValue().toString());
                 break;
@@ -139,6 +145,10 @@ public class AttendanceRecordController extends BaseController {
             attendanceRecord.setDepartmentCode(userInfo.getDepartmentId().toString());
         }
         attendanceRecord.setDepartmentName(userInfo.getDepartmentName());
+        if (Objects.nonNull(userInfo.getBrigadeId())) {
+            attendanceRecord.setBrigadeCode(userInfo.getBrigadeId().toString());
+        }
+        attendanceRecord.setBrigadeName(userInfo.getBrigadeName());
         if (Objects.nonNull(userInfo.getStationId())) {
             attendanceRecord.setStationCode(userInfo.getStationId().toString());
         }
@@ -245,6 +255,10 @@ public class AttendanceRecordController extends BaseController {
                     attendanceRecord.setDepartmentCode(userInfo.getDepartmentId().toString());
                 }
                 attendanceRecord.setDepartmentName(userInfo.getDepartmentName());
+                if (Objects.nonNull(userInfo.getBrigadeId())) {
+                    attendanceRecord.setBrigadeCode(userInfo.getBrigadeId().toString());
+                }
+                attendanceRecord.setBrigadeName(userInfo.getBrigadeName());
                 if (Objects.nonNull(userInfo.getStationId())) {
                     attendanceRecord.setStationCode(userInfo.getStationId().toString());
                 }

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/AttendancePostRecord.java

@@ -110,6 +110,17 @@ public class AttendancePostRecord extends BaseEntity {
     private String attendanceDepartmentName;
 
     /**
+     * 考勤大队ID
+     */
+    private Long attendanceBrigadeId;
+
+    /**
+     * 考勤大队名称
+     */
+    @Excel(name = "大队名称", sort = 13)
+    private String attendanceBrigadeName;
+
+    /**
      * 考勤机构站ID
      */
     private Long attendanceStationId;
@@ -193,6 +204,8 @@ public class AttendancePostRecord extends BaseEntity {
                 ", attendanceTeamName='" + attendanceTeamName + '\'' +
                 ", attendanceDepartmentId=" + attendanceDepartmentId +
                 ", attendanceDepartmentName='" + attendanceDepartmentName + '\'' +
+                ", attendanceBrigadeId=" + attendanceBrigadeId +
+                ", attendanceBrigadeName='" + attendanceBrigadeName + '\'' +
                 ", attendanceStationId=" + attendanceStationId +
                 ", attendanceStationName='" + attendanceStationName + '\'' +
                 ", channelName='" + channelName + '\'' +

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/AttendanceRecord.java

@@ -87,6 +87,17 @@ public class AttendanceRecord extends BaseEntity {
     private String departmentName;
 
     /**
+     * 大队编码
+     */
+    private String brigadeCode;
+
+    /**
+     * 大队名称
+     */
+    @Excel(name = "大队名称", sort = 9)
+    private String brigadeName;
+
+    /**
      * 机构站编码
      */
     private String stationCode;
@@ -144,6 +155,8 @@ public class AttendanceRecord extends BaseEntity {
                 .append("teamName", getTeamName())
                 .append("departmentCode", getDepartmentCode())
                 .append("departmentName", getDepartmentName())
+                .append("brigadeCode", getBrigadeCode())
+                .append("brigadeName", getBrigadeName())
                 .append("stationCode", getStationCode())
                 .append("stationName", getStationName())
                 .append("userName", getUserName())

airport-attendance/src/main/java/com/sundot/airport/attendance/dto/AttendancePostRecordImportVO.java

@@ -47,7 +47,7 @@ public class AttendancePostRecordImportVO implements Serializable {
     /**
      * 考勤班组名称
      */
-    @Excel(name = "班组（机构站/科室/班组）", width = 30, sort = 5)
+    @Excel(name = "班组（机构站/大队/科室/班组）", width = 30, sort = 5)
     private String attendanceTeamName;
 
     /**

airport-attendance/src/main/resources/mapper/attendance/AttendancePostRecordMapper.xml

@@ -25,6 +25,8 @@
         <result property="attendanceTeamName" column="attendance_team_name"/>
         <result property="attendanceDepartmentId" column="attendance_department_id"/>
         <result property="attendanceDepartmentName" column="attendance_department_name"/>
+        <result property="attendanceBrigadeId" column="attendance_brigade_id"/>
+        <result property="attendanceBrigadeName" column="attendance_brigade_name"/>
         <result property="attendanceStationId" column="attendance_station_id"/>
         <result property="attendanceStationName" column="attendance_station_name"/>
         <result property="channelName" column="channel_name"/>
@@ -61,6 +63,8 @@
                attendance_team_name,
                attendance_department_id,
                attendance_department_name,
+               attendance_brigade_id,
+               attendance_brigade_name,
                attendance_station_id,
                attendance_station_name,
                channel_name,
@@ -108,6 +112,10 @@
             <if test="attendanceDepartmentName != null  and attendanceDepartmentName != ''">and
                 attendance_department_name like concat('%', #{attendanceDepartmentName}, '%')
             </if>
+            <if test="attendanceBrigadeId != null ">and attendance_brigade_id = #{attendanceBrigadeId}</if>
+            <if test="attendanceBrigadeName != null  and attendanceBrigadeName != ''">and
+                attendance_brigade_name like concat('%', #{attendanceBrigadeName}, '%')
+            </if>
             <if test="attendanceStationId != null ">and attendance_station_id = #{attendanceStationId}</if>
             <if test="attendanceStationName != null  and attendanceStationName != ''">and attendance_station_name like
                 concat('%', #{attendanceStationName}, '%')
@@ -165,6 +173,8 @@
             <if test="attendanceDepartmentId != null">attendance_department_id,</if>
             <if test="attendanceDepartmentName != null and attendanceDepartmentName != ''">attendance_department_name,
             </if>
+            <if test="attendanceBrigadeId != null">attendance_brigade_id,</if>
+            <if test="attendanceBrigadeName != null and attendanceBrigadeName != ''">attendance_brigade_name,</if>
             <if test="attendanceStationId != null">attendance_station_id,</if>
             <if test="attendanceStationName != null and attendanceStationName != ''">attendance_station_name,</if>
             <if test="channelName != null and channelName != ''">channel_name,</if>
@@ -201,6 +211,8 @@
             <if test="attendanceDepartmentName != null and attendanceDepartmentName != ''">
                 #{attendanceDepartmentName},
             </if>
+            <if test="attendanceBrigadeId != null">#{attendanceBrigadeId},</if>
+            <if test="attendanceBrigadeName != null and attendanceBrigadeName != ''">#{attendanceBrigadeName},</if>
             <if test="attendanceStationId != null">#{attendanceStationId},</if>
             <if test="attendanceStationName != null and attendanceStationName != ''">#{attendanceStationName},</if>
             <if test="channelName != null and channelName != ''">#{channelName},</if>
@@ -243,6 +255,10 @@
             <if test="attendanceDepartmentName != null and attendanceDepartmentName != ''">attendance_department_name =
                 #{attendanceDepartmentName},
             </if>
+            <if test="attendanceBrigadeId != null">attendance_brigade_id = #{attendanceBrigadeId},</if>
+            <if test="attendanceBrigadeName != null and attendanceBrigadeName != ''">attendance_brigade_name =
+                #{attendanceBrigadeName},
+            </if>
             <if test="attendanceStationId != null">attendance_station_id = #{attendanceStationId},</if>
             <if test="attendanceStationName != null and attendanceStationName != ''">attendance_station_name =
                 #{attendanceStationName},

airport-attendance/src/main/resources/mapper/attendance/AttendanceRecordMapper.xml

@@ -21,6 +21,8 @@
         <result property="teamName" column="team_name"/>
         <result property="departmentCode" column="department_code"/>
         <result property="departmentName" column="department_name"/>
+        <result property="brigadeCode" column="brigade_code"/>
+        <result property="brigadeName" column="brigade_name"/>
         <result property="stationCode" column="station_code"/>
         <result property="stationName" column="station_name"/>
         <result property="userName" column="user_name"/>
@@ -47,6 +49,8 @@
                team_name,
                department_code,
                department_name,
+               brigade_code,
+               brigade_name,
                station_code,
                station_name,
                user_name,
@@ -73,6 +77,10 @@
             <if test="departmentName != null  and departmentName != ''">and department_name like concat('%',
                 #{departmentName}, '%')
             </if>
+            <if test="brigadeCode != null  and brigadeCode != ''">and brigade_code = #{brigadeCode}</if>
+            <if test="brigadeName != null  and brigadeName != ''">and brigade_name like concat('%',
+                #{brigadeName}, '%')
+            </if>
             <if test="stationCode != null  and stationCode != ''">and station_code = #{stationCode}</if>
             <if test="stationName != null  and stationName != ''">and station_name like concat('%', #{stationName},
                 '%')
@@ -115,6 +123,8 @@
             <if test="teamName != null and teamName != ''">team_name,</if>
             <if test="departmentCode != null and departmentCode != ''">department_code,</if>
             <if test="departmentName != null and departmentName != ''">department_name,</if>
+            <if test="brigadeCode != null and brigadeCode != ''">brigade_code,</if>
+            <if test="brigadeName != null and brigadeName != ''">brigade_name,</if>
             <if test="stationCode != null and stationCode != ''">station_code,</if>
             <if test="stationName != null and stationName != ''">station_name,</if>
             <if test="userName != null and userName != ''">user_name,</if>
@@ -139,6 +149,8 @@
             <if test="teamName != null and teamName != ''">#{teamName},</if>
             <if test="departmentCode != null and departmentCode != ''">#{departmentCode},</if>
             <if test="departmentName != null and departmentName != ''">#{departmentName},</if>
+            <if test="brigadeCode != null and brigadeCode != ''">#{brigadeCode},</if>
+            <if test="brigadeName != null and brigadeName != ''">#{brigadeName},</if>
             <if test="stationCode != null and stationCode != ''">#{stationCode},</if>
             <if test="stationName != null and stationName != ''">#{stationName},</if>
             <if test="userName != null and userName != ''">#{userName},</if>
@@ -167,6 +179,8 @@
             <if test="teamName != null and teamName != ''">team_name = #{teamName},</if>
             <if test="departmentCode != null and departmentCode != ''">department_code = #{departmentCode},</if>
             <if test="departmentName != null and departmentName != ''">department_name = #{departmentName},</if>
+            <if test="brigadeCode != null and brigadeCode != ''">brigade_code = #{brigadeCode},</if>
+            <if test="brigadeName != null and brigadeName != ''">brigade_name = #{brigadeName},</if>
             <if test="stationCode != null and stationCode != ''">station_code = #{stationCode},</if>
             <if test="stationName != null and stationName != ''">station_name = #{stationName},</if>
             <if test="userName != null and userName != ''">user_name = #{userName},</if>