Bladeren bron

勤务模块

chenshudong 1 maand geleden
bovenliggende
commit
9f8e4db89b

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

@@ -1,5 +1,6 @@
1 1
 package com.sundot.airport.web.controller.attendance;
2 2
 
3
+import cn.hutool.core.bean.BeanUtil;
3 4
 import cn.hutool.core.collection.CollUtil;
4 5
 import cn.hutool.core.collection.CollectionUtil;
5 6
 import cn.hutool.core.date.DateUtil;
@@ -288,8 +289,6 @@ public class AttendancePostRecordController extends BaseController {
288 289
     public AjaxResult add(@RequestBody AttendancePostRecord attendancePostRecord) {
289 290
         // 处理部门信息
290 291
         extracted(attendancePostRecord);
291
-        UserInfo userInfo = userCache.getUserInfo(attendancePostRecord.getUserId());
292
-        attendancePostRecord.setUserName(userInfo.getNickName());
293 292
         attendancePostRecord.setRevision(1L);
294 293
         attendancePostRecord.setWorkDuration((attendancePostRecord.getCheckOutTime().getTime() - attendancePostRecord.getCheckInTime().getTime()) / 1000 / 60);
295 294
         attendancePostRecord.setAttendanceDate(DateUtil.date(attendancePostRecord.getCheckInTime()));
@@ -301,8 +300,16 @@ public class AttendancePostRecordController extends BaseController {
301 300
         BasePosition positionParam = new BasePosition();
302 301
         List<BasePosition> basePositions = basePositionService.selectBasePositionList(positionParam);
303 302
         setChannel(attendancePostRecord, basePositions);
304
-
305
-        return toAjax(attendancePostRecordService.insertAttendancePostRecord(attendancePostRecord));
303
+        attendancePostRecord.setLocked(false);
304
+        attendancePostRecord.getUserIdList().forEach(userId -> {
305
+            AttendancePostRecord item = new AttendancePostRecord();
306
+            BeanUtil.copyProperties(attendancePostRecord, item);
307
+            UserInfo userInfo = userCache.getUserInfo(userId);
308
+            item.setUserId(userId);
309
+            item.setUserName(userInfo.getNickName());
310
+            attendancePostRecordService.insertAttendancePostRecord(item);
311
+        });
312
+        return success("操作成功");
306 313
     }
307 314
 
308 315
     private void extracted(AttendancePostRecord attendancePostRecord) {

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

@@ -1,6 +1,7 @@
1 1
 package com.sundot.airport.attendance.domain;
2 2
 
3 3
 import java.util.Date;
4
+import java.util.List;
4 5
 
5 6
 import com.fasterxml.jackson.annotation.JsonFormat;
6 7
 import lombok.Data;
@@ -257,5 +258,8 @@ public class AttendancePostRecord extends BaseEntity {
257 258
     @JsonFormat(pattern = "yyyy-MM-dd")
258 259
     private Date endTime;
259 260
 
260
-
261
+    /**
262
+     * 用户ID列表
263
+     */
264
+    private List<Long> userIdList;
261 265
 }

+ 2 - 0
airport-attendance/src/main/resources/mapper/attendance/AttendancePostRecordMapper.xml

@@ -191,6 +191,7 @@
191 191
             <if test="statusDesc != null and statusDesc != ''">status_desc,</if>
192 192
             <if test="positionCode != null">position_code,</if>
193 193
             <if test="positionName != null">position_name,</if>
194
+            <if test="locked != null">locked,</if>
194 195
         </trim>
195 196
         <trim prefix="values (" suffix=")" suffixOverrides=",">
196 197
             <if test="tenantId != null">#{tenantId},</if>
@@ -229,6 +230,7 @@
229 230
             <if test="statusDesc != null and statusDesc != ''">#{statusDesc},</if>
230 231
             <if test="positionCode != null">#{positionCode},</if>
231 232
             <if test="positionName != null">#{positionName},</if>
233
+            <if test="locked != null">#{locked},</if>
232 234
         </trim>
233 235
     </insert>
234 236