|
|
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 |
|
|
|
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 |
|
|
|
a8b76fd788
|
icc的劳务人员同步提交
|
2025-07-16 14:27:44 +08:00 |
|
|
|
896ff7ba47
|
icc提交
|
2025-07-15 11:20:42 +08:00 |
|
|
|
c05541f1db
|
执法记录仪和工作票
提2
提3
提3
|
2025-07-05 18:08:31 +08:00 |
|
|
|
549c6fd610
|
新金湾，新考勤
|
2025-06-25 10:22:40 +08:00 |
|
|
|
82cf215ab3
|
风险点、危险源、月度、隐患排查、排查执行
风险点、危险源、月度、隐患排查、排查执行
|
2025-06-13 18:28:46 +08:00 |
|
|
|
f46d9368f1
|
模拟数据生成
|
2025-06-09 14:15:02 +08:00 |
|
|
|
ee4af0566b
|
风险清单库
|
2025-06-06 14:19:44 +08:00 |
|
|
|
50532d993b
|
模拟数据生成
|
2025-05-29 09:13:04 +08:00 |
|
|
|
735d67c44e
|
模拟数据生成
|
2025-05-27 16:34:26 +08:00 |
|
|
|
d0bc30157d
|
模拟数据生成
|
2025-05-27 09:14:43 +08:00 |
|
|
|
aae75e0900
|
模拟数据生成
|
2025-05-23 10:06:09 +08:00 |
|
|
|
684891d637
|
模拟数据生成
|
2025-05-22 10:16:52 +08:00 |
|
|
|
e50a944ea4
|
模拟数据生成
|
2025-05-20 13:55:50 +08:00 |
|
|
|
9f839af8f8
|
模拟数据生成
|
2025-05-15 16:30:39 +08:00 |
|
|
|
0aee8f3e8a
|
模拟数据生成
|
2025-05-14 18:14:04 +08:00 |
|
|
|
1058c49316
|
模拟数据生成
|
2025-05-10 11:51:35 +08:00 |
|
|
|
de2916d8be
|
安徽合武项目需求增加
|
2025-02-25 11:01:14 +08:00 |
|
|
|
79a7af577b
|
安全帽调整(中北水利)
|
2024-12-13 17:43:19 +08:00 |
|
|
|
4e808120c1
|
汽车吊、履带吊
|
2024-11-15 14:41:11 +08:00 |
|
|
|
9b636860fb
|
海康人员授权参数调整
|
2024-11-15 10:54:08 +08:00 |
|
|
|
1760c801e4
|
注释监控截图功能
|
2024-11-06 16:51:15 +08:00 |
|
|
|
82797de267
|
配置优化
|
2024-10-29 20:28:39 +08:00 |
|
|
|
9203de6402
|
木垒修改
|
2024-10-29 18:51:03 +08:00 |
|
|
|
8515a15ab1
|
定时rtsp流截图
|
2024-10-29 09:41:50 +08:00 |
|
|
|
0046bb66f7
|
质量文件调整
|
2024-10-18 18:02:48 +08:00 |
|
|
|
5b8d1d0091
|
增加区域管理
|
2024-10-11 18:33:38 +08:00 |
|
|
|
c2c38627d7
|
isc推数据到环境模块，污水取数据，车辆超速
|
2024-09-26 18:31:31 +08:00 |
|
|
|
6e2efc5a73
|
人员定位修改
|
2024-09-19 16:45:37 +08:00 |
|
|
|
995bd33dab
|
木垒添加吊装作业
|
2024-09-14 14:30:15 +08:00 |
|
|
|
75bdfdf411
|
调用海康查询监控点列表v2
|
2024-09-06 10:38:16 +08:00 |
|
|
|
bff0d84786
|
bug修复
|
2024-09-05 17:44:32 +08:00 |
|
|
|
956b934144
|
Revert "angang修改 合并"
This reverts commit ff2f335a
|
2024-09-05 17:40:44 +08:00 |
|
|
|
91e3b13e7f
|
人员定位统计
|
2024-09-05 17:02:08 +08:00 |
|
|
|
ff2f335ae5
|
angang修改 合并
|
2024-08-24 14:18:57 +08:00 |
|
|
|
291f55c14b
|
记录工作流异常日志
|
2024-07-27 18:33:39 +08:00 |
|
|
|
0476848dfb
|
发邮箱
|
2024-07-27 16:08:35 +08:00 |
|
|
|
b2513eb68e
|
删除长时间（超过30分钟）的卡主的任务
|
2024-07-25 16:07:48 +08:00 |
|
|
|
c749c65561
|
车辆预约判断状态
|
2024-07-23 22:18:30 +08:00 |
|
|
|
4ceede281c
|
审批流异常通过和发邮件
|
2024-07-23 22:18:03 +08:00 |
|
|
|
021a87fabf
|
代码加注释
|
2024-07-10 09:41:45 +08:00 |
|
|
|
9bc1a5870a
|
车辆bug修改
|
2024-07-05 19:31:06 +08:00 |
|
|
|
c8dafceaff
|
bug修改
|
2024-07-04 15:06:49 +08:00 |
|
|
|
74d330af5b
|
大屏特种作业的4个接口和bug修改
|
2024-07-04 14:29:25 +08:00 |
|
|
|
8c4e820c73
|
代码规范
|
2024-07-03 16:11:21 +08:00 |
|
|
|
2f855d3d1e
|
代码规范
|
2024-07-01 09:51:07 +08:00 |
|
|
|
2a34ba4ebe
|
bug优化
|
2024-06-29 16:49:17 +08:00 |
|
|
|
abcd3f871e
|
bug修改
|
2024-06-28 16:21:44 +08:00 |
|
