|
|
38c35543a0
|
Merge branch 'mod_security' into prod
|
2025-08-26 21:23:12 +08:00 |
|
|
|
c9747cfbef
|
bug修复
|
2025-08-26 19:29:39 +08:00 |
|
|
|
ffe6fe38a9
|
bug修复
|
2025-08-26 09:14:03 +08:00 |
|
|
|
686420e7d2
|
青海中水北方修改
|
2025-08-25 15:32:29 +08:00 |
|
|
|
ee98e443e9
|
Merge remote-tracking branch 'origin/prod' into prod
|
2025-08-25 11:46:53 +08:00 |
|
|
|
6eb8ccdd72
|
青海中水北方修改
|
2025-08-25 11:44:27 +08:00 |
|
|
|
2bdd14aec2
|
bug修复
|
2025-08-22 19:47:15 +08:00 |
|
|
|
ca6f3100e1
|
bug修复
|
2025-08-22 14:39:56 +08:00 |
|
|
|
5b4b8a811c
|
Merge branch 'prod' into mod_security
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
# src/main/java/com/zhgd/xmgl/task/WorkerTask.java
|
2025-08-21 18:56:44 +08:00 |
|
|
|
d015d534f1
|
bug修复
|
2025-08-21 18:53:35 +08:00 |
|
|
|
933f6ebb41
|
bug修复
|
2025-08-21 17:51:23 +08:00 |
|
|
|
e6ae6c94e0
|
人员退场设置和bug修复
|
2025-08-21 09:21:15 +08:00 |
|
|
|
31d2d1bdf2
|
bug修改
|
2025-08-20 15:28:47 +08:00 |
|
|
|
7a4acb5a45
|
智能安全帽人员每日工作统计相关和bug修改
|
2025-08-16 18:21:28 +08:00 |
|
|
|
4ea32fd92d
|
bug修改
|
2025-08-15 18:45:55 +08:00 |
|
|
|
9495b5cb45
|
劳务管理人员审核通过bug修改
|
2025-08-15 16:48:38 +08:00 |
|
|
|
f3320a0587
|
劳务管理人员审核通过bug修改
|
2025-08-15 16:46:25 +08:00 |
|
|
|
933b8012be
|
修改bug
|
2025-08-14 14:45:23 +08:00 |
|
|
|
3663e7d5d2
|
修改bug
|
2025-08-14 09:12:17 +08:00 |
|
|
|
4d1938005f
|
修改bug
|
2025-08-13 11:43:40 +08:00 |
|
|
|
0cf0c64722
|
修改bug
|
2025-08-13 11:43:02 +08:00 |
|
|
|
6ad362778a
|
正赢增加人脸心跳检测
|
2025-08-12 09:41:20 +08:00 |
|
|
|
8ff888f270
|
icc的劳务人员，考勤最后是出场就删除在场记录，考勤最后是入场就更新在场时间
|
2025-08-12 09:25:50 +08:00 |
|
|
|
d87e8aa639
|
安全隐患检查字段设置配置、隐患统计分析接口
|
2025-08-07 11:35:46 +08:00 |
|
|
|
b9582da9d9
|
Merge remote-tracking branch 'origin/mod_security' into mod_security
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
|
2025-08-05 15:31:02 +08:00 |
|
|
|
1fceef032c
|
安全检查绑定多选的责任单位和区域、复查人、核验人，隐患统计分析接口
|
2025-08-05 13:57:09 +08:00 |
|
|
|
b05f69ebca
|
人脸设备对接
|
2025-07-31 11:07:51 +08:00 |
|
|
|
73370c8af0
|
ocr和施工日志bug修改
|
2025-07-25 18:20:39 +08:00 |
|
|
|
1b0fb0331b
|
ocr和施工日志
|
2025-07-25 18:07:45 +08:00 |
|
|
|
abdb7e04c1
|
查询各个区域下在场人数优化
|
2025-07-25 15:08:42 +08:00 |
|
|
|
5641225773
|
Merge branch 'icc' into uat
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
|
2025-07-24 10:35:10 +08:00 |
|
|
|
87f312ee98
|
icc的对接bug修改
|
2025-07-24 09:44:58 +08:00 |
|
|
|
a2e184116d
|
icc的劳务人员，考勤最后是出场就删除在场记录，考勤最后是入场就更新在场时间
|
2025-07-23 18:06:33 +08:00 |
|
|
|
c5b1d70097
|
Merge branch 'xjw_attendance' into uat
# Conflicts:
# pom.xml
# src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
# src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
# src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
# src/main/java/com/zhgd/xmgl/util/Fileutils.java
|
2025-07-23 15:02:15 +08:00 |
|
|
|
f394535531
|
icc的劳务人员对接修改
|
2025-07-19 11:04:52 +08:00 |
|
|
|
19df573b88
|
管控bug修改
|
2025-07-17 16:02:12 +08:00 |
|
|
|
67855c9ce2
|
icc的劳务人员和考勤提交
|
2025-07-16 18:10:59 +08:00 |
|
|
|
a8b76fd788
|
icc的劳务人员同步提交
|
2025-07-16 14:27:44 +08:00 |
|
|
|
896ff7ba47
|
icc提交
|
2025-07-15 11:20:42 +08:00 |
|
|
|
7e71847287
|
弹弓根据勾选设备进行下发
|
2025-07-14 15:08:27 +08:00 |
|
|
|
8d734b46f7
|
Merge branch 'xjw_attendance' into prod
|
2025-07-12 09:56:18 +08:00 |
|
|
|
389ffcd285
|
中水北方修改
|
2025-07-11 18:18:24 +08:00 |
|
|
|
3a12d05af0
|
工作票bug修复和批量人员绑定设备
|
2025-07-11 17:28:09 +08:00 |
|
|
|
cc6ddce242
|
中水北方修改
|
2025-07-10 09:43:51 +08:00 |
|
|
|
c05541f1db
|
执法记录仪和工作票
提2
提3
提3
|
2025-07-05 18:08:31 +08:00 |
|
|
|
355db840c1
|
中水北方修改
|
2025-07-05 13:36:05 +08:00 |
|
|
|
3d34bd6dc1
|
中水北方修改
|
2025-07-05 11:20:58 +08:00 |
|
|
|
ce8752b742
|
中水北方修改
|
2025-07-04 17:46:20 +08:00 |
|
|
|
3cd79fdc81
|
统计考勤列表bug修复
|
2025-07-03 10:50:17 +08:00 |
|
|
|
daa3e585ac
|
增加查询参数
|
2025-07-01 16:01:47 +08:00 |
|
