shiqian пре 4 година
родитељ
комит
c41d585321

+ 3 - 0
boman-api/boman-domain/src/main/java/com.boman.domain/constant/AttendanceConst.java

@@ -16,6 +16,9 @@ public class AttendanceConst {
     /** 当天时间 **/
     public static final String ATTENDANCE_NOW_TIME = "attendance_now_time";
 
+    /** 上班打卡时间 **/
+    public static final String ATTENDANCE_TABLE_WORK = "attendance_table_work";
+
 
 
 }

+ 14 - 0
boman-web-core/src/main/java/com/boman/web/core/controller/AttendanceController.java

@@ -34,6 +34,20 @@ public class AttendanceController {
         return service.attendanceRecord(tableName, userName);
     }
 
+
+    /**
+     * 功能描述: 显示是上班打卡还是下班打卡
+     *
+     * @param tableName tableName
+     * @param userName  userName
+     * @return com.boman.common.core.web.domain.AjaxResult
+     */
+    @GetMapping("/showAttendanceType/{tableName}/{userName}")
+    public AjaxResult showAttendanceType(@PathVariable("tableName") String tableName, @PathVariable("userName") String userName) {
+        return AjaxResult.success(service.showAttendanceType(tableName, userName));
+    }
+
+
     /**
      * 功能描述: 根据tableName和userId查找当月考勤详细记录
      * @return com.boman.common.core.web.domain.AjaxResult

+ 11 - 0
boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceService.java

@@ -30,4 +30,15 @@ public interface AttendanceService {
      */
     AjaxResult detailedRecord(FormDataDto dto);
 
+    /**
+     * 功能描述: 显示是上班打卡还是下班打卡
+     *
+     * @param tableName tableName
+     * @param userName  userName
+     * @return java.lang.String
+     */
+    String showAttendanceType(String tableName, String userName);
+
+
+    List<JSONObject> checkAttendanceType(String tableName, String userName);
 }

+ 31 - 2
boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceServiceImpl.java

@@ -22,8 +22,8 @@ import java.util.Map;
 import java.util.concurrent.locks.Condition;
 
 import static com.boman.common.core.utils.obj.ObjectUtils.requireNonNull;
-import static com.boman.domain.constant.AttendanceConst.ATTENDANCE_NOW_TIME;
-import static com.boman.domain.constant.AttendanceConst.ATTENDANCE_USER_NAME;
+import static com.boman.domain.constant.AttendanceConst.*;
+
 /**
  * @author shiqian
  * @date 2021年06月03日 15:45
@@ -124,4 +124,33 @@ public class AttendanceServiceImpl implements AttendanceService {
         }
         return AjaxResult.success(detailedRecordList);
     }
+
+    /**
+     * 功能描述: 显示是上班打卡还是下班打卡
+     *
+     * @param tableName tableName
+     * @param userName  userName
+     * @return java.lang.String
+     */
+    @Override
+    public String showAttendanceType(String tableName, String userName) {
+        requireNonNull(tableName, "tableName is empty");
+        requireNonNull(userName, "userName is empty");
+
+
+
+        return null;
+    }
+
+    @Override
+    public List<JSONObject> checkAttendanceType(String tableName, String userName) {
+        requireNonNull(tableName, "tableName is empty");
+        requireNonNull(userName, "userName is empty");
+
+        String yyyyMmDd = DateUtils.getYyyyMmDd();
+        JSONObject map = new JSONObject(2);
+        map.put(ATTENDANCE_USER_NAME, userName);
+        map.put(ATTENDANCE_TABLE_WORK, yyyyMmDd);
+        return commonService.getByMap(tableName, map);
+    }
 }