Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue

@@ -201,10 +201,15 @@ export default {
           },
         ],
         columns: [
-          { type: "selection", width: 50 },
-          { type: "index", label: "序号", width: 50 },
+          { type: "selection", width: 50, fixed: "left" },
+          { type: "index", label: "序号", width: 50, fixed: "left" },
 
-          { label: "姓名", prop: "staffName", formatter: this.formatter },
+          {
+            label: "姓名",
+            prop: "staffName",
+            formatter: this.formatter,
+            fixed: "left",
+          },
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
@@ -221,20 +226,20 @@ export default {
           {
             label: "异常时间",
             prop: "errorTime",
-            width: 240,
+            width: 100,
             formatter: this.formatterDate,
           },
 
           {
             label: "上下班时间",
-            width: 100,
+            width: 110,
             prop: "goOffTimeStr",
           },
 
           {
             label: "实际打卡时间",
             prop: "actualAttendTime",
-            width: 240,
+            width: 100,
             formatter: this.formatterDate,
           },
 
@@ -274,7 +279,7 @@ export default {
           {
             label: "加分/扣分时间",
             prop: "deductTime",
-            width: 150,
+            width: 100,
             formatter: this.formatterDate,
           },
 
@@ -313,6 +318,7 @@ export default {
 
           {
             label: "操作",
+            width: 110,
             fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/AbstractDingTalkService.java

@@ -100,7 +100,7 @@ public abstract class AbstractDingTalkService implements IDingPersonService {
                     throw new AppException(String.format("code:{},errorMsg:{}", rsp.getErrcode(), rsp.getErrmsg()));
                 }
             } else {
-                log.info("redis dingding token:{}",dingToken);
+               // log.info("redis dingding token:{}",dingToken);
                 return dingToken;
             }
         } catch (Exception e) {

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -38,8 +38,8 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "attendanceDateStart":"2024-02-01",
-  "attendanceDateEnd":"2024-03-01"
+  "attendanceDateStart":"2024-03-01",
+  "attendanceDateEnd":"2024-03-13"
 }
 
 ###海康考勤打卡记录计算1
@@ -71,8 +71,8 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceHikRecordCustom
 Content-Type: application/json
 
 {
-  "attendanceDateStart":"2024-03-11",
-  "attendanceDateEnd":"2024-03-11"
+  "attendanceDateStart":"2024-03-01",
+  "attendanceDateEnd":"2024-03-13"
 }
 
 
@@ -80,7 +80,7 @@ Content-Type: application/json
 POST {{baseUrl}}//attendance/stat/summary
 Content-Type: application/json
 
-{"summaryTimeStart":"2024-02-01","summaryTimeEnd":"2024-02-29"}
+{"summaryTimeStart":"2024-03-01","summaryTimeEnd":"2024-03-13"}
 
 
 ###短信设置编辑
@@ -107,8 +107,8 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "startTimeStart":"2024-03-12",
-  "endTimeEnd":"2024-03-12"
+  "startTimeStart":"2024-03-04",
+  "endTimeEnd":"2024-03-05"
 }