diff --git a/ruoyi-ui/src/api/project/attendanceWorker.js b/ruoyi-ui/src/api/project/attendanceWorker.js
index ba8ba6ac..5a3ac477 100644
--- a/ruoyi-ui/src/api/project/attendanceWorker.js
+++ b/ruoyi-ui/src/api/project/attendanceWorker.js
@@ -1,5 +1,6 @@
import request from '@/utils/request'
-
+import { deepClone } from '@/utils/index'
+import dayjs from 'dayjs'
// 查询考勤人员基本属性列表
export function listAttendanceWorker(query) {
return request({
@@ -44,6 +45,10 @@ export function delAttendanceWorker(id) {
}
export function queryAttendanceData(data){
+ data=deepClone(data);
+ if(data.createBy){
+ data.createBy=dayjs(data.createBy).format("YYYY-MM-DD");
+ }
return request({
url: `/project/attendanceWorker/queryAttendanceData?pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
method: 'post',
diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue
index 57e93828..7ed80096 100644
--- a/ruoyi-ui/src/views/project/attendance/index.vue
+++ b/ruoyi-ui/src/views/project/attendance/index.vue
@@ -61,10 +61,10 @@
{{ row.gender==1?'女':'男' }}
- {{ row.inTime|formatDateTime }}
+ {{ row.inTime|formatTime }}
- {{ row.outTime|formatDateTime }}
+ {{ row.outTime|formatTime }}
{{ row.status==1?'退场':'进场' }}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java
index c83cbd8b..87703dae 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java
@@ -214,16 +214,17 @@ public class AttendanceTask {
System.out.println("-------1--------->AttendanceUserTask.syncWorker");
Map params = new HashMap<>();
params.put("projectId", "719148569880576");
- //params.put("start", "2000-01-01 00:00:00");
- //params.put("end", "2099-01-01 00:00:00");
+ //params.put("start", "2023-10-06 00:00:00");
+ //params.put("end", "2023-10-07 00:00:00");
//params.put("pageNo", "1");
- //params.put("pageSize", "1000");
+ params.put("startId", "6755780004");
+ params.put("pageSize", "1000");
params.put("appid","8fba899a21c64be4aa25bf0f3314ad5c");
String sign = getSign(params,"426b3d8280620176d80a826eebef3579");
System.out.println("--->"+sign);
params.put("sign",sign);
String host="https://glm.glodon.com/api/open";
- String path="/worker/allGroup";
+ String path="/attendance/card";
HttpUrl.Builder urlBuilder = Objects.requireNonNull(HttpUrl.parse(host + path)).newBuilder();
params.forEach((s, o) -> {
urlBuilder.addQueryParameter(s, (String) o);
@@ -232,9 +233,15 @@ public class AttendanceTask {
.url(urlBuilder.build())
.build();
String data=getResult(request);
- System.out.println("data:"+data);
+ //System.out.println("data:"+data);
JSONObject jo= JSON.parseObject(data);
-
+ JSONArray jsonArray=jo.getJSONArray("data");
+ for(int i=0;i