|
|
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 |
|
|
|
41d32bbda2
|
管控bug修改
|
2025-07-22 18:08:32 +08:00 |
|
|
|
c04d785c5f
|
管控bug修改
|
2025-07-21 10:42:03 +08:00 |
|
|
|
3a12d05af0
|
工作票bug修复和批量人员绑定设备
|
2025-07-11 17:28:09 +08:00 |
|
|
|
c05541f1db
|
执法记录仪和工作票
提2
提3
提3
|
2025-07-05 18:08:31 +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 |
|
|
|
4a1f52465c
|
模拟数据生成
|
2025-05-28 09:57:12 +08:00 |
|
|
|
46aa8d10f8
|
质量文件调整
|
2024-10-24 16:11:00 +08:00 |
|
|
|
0046bb66f7
|
质量文件调整
|
2024-10-18 18:02:48 +08:00 |
|
|
|
115cdd4fe7
|
质量文件
|
2024-10-17 17:26:16 +08:00 |
|
|
|
0fadfeeecd
|
根据区域查询人员
|
2024-10-14 15:08:29 +08:00 |
|
|
|
e4c5f753db
|
增加区域管理
|
2024-10-11 19:03:06 +08:00 |
|
|
|
5b8d1d0091
|
增加区域管理
|
2024-10-11 18:33:38 +08:00 |
|
|
|
956b934144
|
Revert "angang修改 合并"
This reverts commit ff2f335a
|
2024-09-05 17:40:44 +08:00 |
|
|
|
0f05f8e7b0
|
调整
|
2024-09-04 21:02:11 +08:00 |
|
|
|
ff2f335ae5
|
angang修改 合并
|
2024-08-24 14:18:57 +08:00 |
|
|
|
65aaaee65d
|
安全隐患扣分改成选择一个违章人员扣分
|
2024-08-08 17:24:58 +08:00 |
|
|
|
3a5d30950c
|
bug修复
|
2024-08-05 10:08:07 +08:00 |
|
|
|
5549fe4386
|
全部整改记录中通过安全问题库进行筛选隐患
|
2024-08-02 21:20:15 +08:00 |
|
|
|
410e2be414
|
保存日志加上前后变化的数据
|
2024-08-01 17:32:05 +08:00 |
|
|
|
caecafc350
|
通知也给项目级别账号来一份
|
2024-07-29 19:32:03 +08:00 |
|
|
|
b7d455ebae
|
bug修复
|
2024-07-16 15:32:05 +08:00 |
|
|
|
a3bc633163
|
通知也给项目级别账号来一份
|
2024-07-15 18:48:31 +08:00 |
|
|
|
5f10511b14
|
增加质量和安全的用时和是否超期
|
2024-07-12 17:10:53 +08:00 |
|
|
|
6f1b7030c8
|
代码规范
|
2024-07-11 16:18:15 +08:00 |
|
|
|
86e8761cf5
|
bug修改和代码规范
|
2024-07-09 11:07:16 +08:00 |
|
|
|
a02b582806
|
日志bug修改和代码规范
|
2024-07-08 14:27:32 +08:00 |
|
|
|
388665b8ee
|
质量和安全增加已撤回的筛选
|
2024-07-05 14:27:29 +08:00 |
|
|
|
8c4e820c73
|
代码规范
|
2024-07-03 16:11:21 +08:00 |
|
|
|
5dc18dd22a
|
功能-质量-按周统计
|
2024-07-03 11:58:27 +08:00 |
|
|
|
f49f586297
|
Merge branch 'guoshengxiong' into guoshengxiongtemp
|
2024-07-02 17:08:09 +08:00 |
|
|
|
d09fb2ff7d
|
bug修改
|
2024-07-02 17:03:28 +08:00 |
|
|
|
ef02864567
|
进度审批修改监理
|
2024-07-02 11:18:28 +08:00 |
|
|
|
d814d56a00
|
代码规范
|
2024-07-01 14:18:33 +08:00 |
|
|
|
968ab5da60
|
代码规范
|
2024-07-01 14:17:43 +08:00 |
|
|
|
2a34ba4ebe
|
bug优化
|
2024-06-29 16:49:17 +08:00 |
|
|
|
4aad451bed
|
bug修改
|
2024-06-29 11:53:14 +08:00 |
|
|
|
6a166cce8f
|
bug修复
|
2024-06-28 21:43:25 +08:00 |
|
|
|
af7fb6c80a
|
bug修复
|
2024-06-28 20:51:36 +08:00 |
|
|
|
dd8e5c424f
|
bug修改和加操作注解
|
2024-06-28 14:31:33 +08:00 |
|
|
|
af18c1ce8b
|
大屏和其他bug修复
|
2024-06-21 17:01:15 +08:00 |
|
|
|
188380e645
|
大屏接口
|
2024-06-17 19:13:42 +08:00 |
|
|
|
738ce5867c
|
bug修改
|
2024-06-07 11:35:27 +08:00 |
|
|
|
275f043866
|
大屏接口
|
2024-06-03 10:12:18 +08:00 |
|
|
|
fc06d493b5
|
安全和质量记录的导出
|
2024-05-25 17:43:28 +08:00 |
|
|
|
07e1da5ea2
|
安全和质量导出bug修改
|
2024-05-25 10:18:41 +08:00 |
|
|
|
a0acb5fcab
|
安全评分改动
|
2024-05-23 17:55:42 +08:00 |
|
|
|
e7b1634cab
|
红码不能通行
|
2024-05-21 11:36:49 +08:00 |
|
