|
|
73370c8af0
|
ocr和施工日志bug修改
|
2025-07-25 18:20:39 +08:00 |
|
|
|
1b0fb0331b
|
ocr和施工日志
|
2025-07-25 18:07:45 +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 |
|
|
|
3a12d05af0
|
工作票bug修复和批量人员绑定设备
|
2025-07-11 17:28:09 +08:00 |
|
|
|
c05541f1db
|
执法记录仪和工作票
提2
提3
提3
|
2025-07-05 18:08:31 +08:00 |
|
|
|
daa3e585ac
|
增加查询参数
|
2025-07-01 16:01:47 +08:00 |
|
|
|
13cf189faa
|
黑名单退场bug修复
|
2025-06-30 18:00:17 +08:00 |
|
|
|
6113f6279a
|
新增黑名单退场、考勤v2bug修复
|
2025-06-30 17:49:54 +08:00 |
|
|
|
d55d074bfc
|
新金湾，新考勤bug修复
|
2025-06-27 19:43:46 +08:00 |
|
|
|
321bf741f5
|
新金湾，新考勤app
|
2025-06-27 18:44:18 +08:00 |
|
|
|
c70dcc5562
|
新金湾，新考勤bug修复
|
2025-06-25 18:26:09 +08:00 |
|
|
|
10d2b693b2
|
新金湾，新考勤bug修复
|
2025-06-25 16:44:48 +08:00 |
|
|
|
549c6fd610
|
新金湾，新考勤
|
2025-06-25 10:22:40 +08:00 |
|
|
|
e058f1881a
|
Merge branch 'prod' into guoshengxiong
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
|
2025-06-16 16:16:24 +08:00 |
|
|
|
d80d6f209e
|
中水北方功能调整
中水北方功能调整
|
2025-06-16 15:58:51 +08:00 |
|
|
|
82cf215ab3
|
风险点、危险源、月度、隐患排查、排查执行
风险点、危险源、月度、隐患排查、排查执行
|
2025-06-13 18:28:46 +08:00 |
|
|
|
088453c095
|
模拟数据生成
|
2025-05-16 09:49:04 +08:00 |
|
|
|
9f839af8f8
|
模拟数据生成
|
2025-05-15 16:30:39 +08:00 |
|
|
|
0aee8f3e8a
|
模拟数据生成
|
2025-05-14 18:14:04 +08:00 |
|
|
|
cf343c9ab0
|
模拟数据生成
|
2025-05-12 14:45:19 +08:00 |
|
|
|
1058c49316
|
模拟数据生成
|
2025-05-10 11:51:35 +08:00 |
|
|
|
717be14f19
|
优化
|
2025-04-17 18:11:05 +08:00 |
|
|
|
2e49465729
|
人员删除弹弓下发人员状态
|
2025-04-14 18:22:46 +08:00 |
|
|
|
3361a5f28a
|
弹弓超过10分钟没有接收错误的人脸设置成功修改bug
|
2025-04-14 14:54:06 +08:00 |
|
|
|
6e8b06cd93
|
AI功能
|
2025-04-11 17:30:52 +08:00 |
|
|
|
629c93584f
|
人员图片导入bug解决
|
2025-04-07 17:05:49 +08:00 |
|
|
|
a76a022cfd
|
弹弓人脸
|
2025-03-18 09:55:24 +08:00 |
|
|
|
4ff1fcedd4
|
郑州水利项目萤石云更新
|
2025-02-28 16:12:30 +08:00 |
|
|
|
5f551ff14b
|
安徽合武项目BUG修复
|
2025-02-25 18:29:52 +08:00 |
|
|
|
ce613b0b27
|
安徽合武项目BUG修复
|
2025-02-25 15:59:14 +08:00 |
|
|
|
de2916d8be
|
安徽合武项目需求增加
|
2025-02-25 11:01:14 +08:00 |
|
|
|
0af7c9ff21
|
安徽合武项目需求增加
|
2025-02-24 18:24:07 +08:00 |
|
|
|
b7a3cd22af
|
bug修复
|
2025-01-14 17:34:47 +08:00 |
|
|
|
d203bb2a59
|
考勤信息转发去除
|
2024-12-23 10:31:21 +08:00 |
|
|
|
f1f83c7d2e
|
移动考勤
|
2024-12-03 16:18:55 +08:00 |
|
|
|
7dd0c7202d
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
|
2024-12-03 11:29:23 +08:00 |
|
|
|
78924866cb
|
移动考勤
|
2024-12-03 11:18:00 +08:00 |
|
|
|
b9fab2d18f
|
app考勤bug修复
|
2024-11-26 09:48:04 +08:00 |
|
|
|
8ef7d7b80b
|
手机考勤bug修复
|
2024-11-25 19:01:55 +08:00 |
|
|
|
645d4dfdd2
|
中铁十一局调整
|
2024-11-18 18:27:26 +08:00 |
|
|
|
9733e8dd79
|
木垒转发bug修复
|
2024-11-06 17:02:15 +08:00 |
|
|
|
0d4b73c589
|
木垒转发修改
|
2024-10-29 18:55:51 +08:00 |
|
