 zhaokai
|
36ff847364
|
Merge branch 'dev_visual_page' into dev
# Conflicts:
# web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java
# web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java
# web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java
# web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java
# web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java
# web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml
# web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
|
2026-07-21 14:00:05 +08:00 |
|
zhaokai
|
65385ecf18
|
feat(project): 添加可视化大屏重点作业功能
|
2026-07-21 13:54:44 +08:00 |
 lishiwei
|
ae65b5c41e
|
feat(): 修改核实状态赋值逻辑，更换导出时间字段
|
2026-07-20 09:11:37 +08:00 |
|
lishiwei
|
5f3d891cef
|
feat(): 补充分支合并遗漏代码
|
2026-07-20 09:10:30 +08:00 |
|
zhaokai
|
650c67e97b
|
feat(project): 添加可视化大屏重点作业统计功能
|
2026-07-17 17:31:12 +08:00 |
|
zhaokai
|
8a4f371cf6
|
feat(project): 添加可视化大屏重点作业统计功能
|
2026-07-16 17:31:43 +08:00 |
|
lishiwei
|
d1945601d7
|
feat(): 重点作业处罚相关方名称关联查询,修改隐患待验收计数逻辑,补充验收发起人与登录人匹配逻辑
|
2026-07-16 10:18:58 +08:00 |
|
lishiwei
|
2219cf9523
|
refactor(): 重构项目关键摄像头保存逻辑并优化检查流程
|
2026-07-10 18:09:03 +08:00 |
|
lishiwei
|
fbe0d77f45
|
feat(): 添加安全环保检查和隐患模块申辩功能
|
2026-07-09 09:04:07 +08:00 |
|
lishiwei
|
fc0dcb5856
|
refactor(): 优化安全环保检查隐患验收的检查人赋值
|
2026-07-08 14:21:46 +08:00 |
|
lishiwei
|
8bef81e4e6
|
feat(): 优化重点作业统计与列表数据对应和处罚消息通知
|
2026-07-08 11:28:42 +08:00 |
|
lishiwei
|
60d99fc026
|
feat(): 隐患列表查询条件维护、暂存不做校验
|
2026-07-07 17:01:05 +08:00 |
|
lishiwei
|
6b4ab1e961
|
fix(): 修复隐患处罚权限控制和查询逻辑
|
2026-07-03 11:45:42 +08:00 |
|
lishiwei
|
3be9130520
|
fix(): 重点作业数据查询、处罚列表和检查任务处理
|
2026-07-02 19:15:12 +08:00 |
|
lishiwei
|
d452d31d8d
|
fix(): 补充项目创建来源默认值
|
2026-07-02 09:07:08 +08:00 |
|
lishiwei
|
a5620c3a27
|
perf(): 优化安全环境检查getOne查询
|
2026-07-02 09:05:41 +08:00 |
|
lishiwei
|
0ab2942367
|
feat(): 完善检查发起隐患处罚数据存储、优化处罚查询逻辑
|
2026-06-29 17:28:39 +08:00 |
|
lishiwei
|
879ac8e8a5
|
fix(): 修复隐患处罚功能的属性复制和详情的数据返回
|
2026-06-29 11:45:35 +08:00 |
|
lishiwei
|
5ad384e5b1
|
fix(): 修复隐患处罚功能中的重复处罚和数据查询问题
|
2026-06-26 10:10:58 +08:00 |
|
lishiwei
|
5f6f6ed9dc
|
feat(): 隐患处罚消息通知流程
|
2026-06-24 16:42:02 +08:00 |
|
lishiwei
|
38268261b4
|
refactor(): 增加重点作业处罚人员数据判空逻辑
|
2026-06-23 17:02:27 +08:00 |
|
lishiwei
|
f6b3ed5102
|
chore(0623): 移除重点作业ID与名称重复校验逻辑-需求说可以重复添加
|
2026-06-23 14:53:16 +08:00 |
|
lishiwei
|
8b4024c323
|
feat(): 添加处罚管理、处罚反馈待办数量统计
|
2026-06-23 13:37:15 +08:00 |
|
lishiwei
|
fd2c464a42
|
feat(): 添加隐患处罚功能和重点作业处罚人员配置
|
2026-06-22 17:49:18 +08:00 |
|
lishiwei
|
91b0f36ffb
|
feat(): 支持重点作业属性类型多选和开工申请驳回功能
|
2026-06-11 17:46:21 +08:00 |
|
lishiwei
|
3179f7f644
|
Revert "feat(): 添加摄像头类型查询全部功能"
This reverts commit b60b1ef91a.
|
2026-06-11 10:49:22 +08:00 |
|
lishiwei
|
864d139081
|
Reapply "feat(): 添加摄像头类型查询全部功能"
This reverts commit 7c503bd0de.
|
2026-06-11 10:48:05 +08:00 |
|
lishiwei
|
7c503bd0de
|
Revert "feat(): 添加摄像头类型查询全部功能"
This reverts commit b60b1ef91a.
|
2026-06-11 10:45:11 +08:00 |
|
lishiwei
|
b60b1ef91a
|
feat(): 添加摄像头类型查询全部功能
|
2026-06-11 10:35:59 +08:00 |
zhangyue
|
c7c81b28a4
|
消息提醒
|
2026-06-01 09:33:31 +08:00 |
 tianxinlei
|
d695148d49
|
5-26 - fix
|
2026-05-26 13:34:16 +08:00 |
|
tianxinlei
|
9255701f66
|
5-25 - 修改时间格式
|
2026-05-25 09:39:59 +08:00 |
|
tianxinlei
|
94dbdb5151
|
5-23 - 重点作业的新增：增加了对重点作业ID和重点作业名称重复的校验，保证重点作业ID与重点作业名称唯一
|
2026-05-23 11:34:52 +08:00 |
|
tianxinlei
|
ca96074256
|
5-23 - 隐患验收接口 增加对视频识别类型隐患的消息推送和待办
|
2026-05-23 10:46:48 +08:00 |
|
tianxinlei
|
a375b1e58d
|
5-22 - fix
|
2026-05-23 09:59:20 +08:00 |
|
zhaokai
|
20f13517ca
|
去掉无效bug引用
|
2026-05-22 15:24:51 +08:00 |
|
tianxinlei
|
4eccf92d11
|
5-22 - 检查清单删除 增加主账号删除权限
|
2026-05-22 10:20:06 +08:00 |
|
zhangyue
|
1284a61eaa
|
添加消息通知和统计功能
|
2026-05-21 14:27:45 +08:00 |
|
tianxinlei
|
7e461ec55f
|
5-16 - fix
|
2026-05-16 17:22:41 +08:00 |
|
tianxinlei
|
098abc1a1c
|
5-16 - fix
|
2026-05-16 15:02:53 +08:00 |
|
zhangyue
|
4fcc6c6caf
|
添加安全环保检查核实完成事件发送功能
|
2026-05-16 11:10:00 +08:00 |
|
tianxinlei
|
35c4fab6ac
|
5-15 - SafetyEnvironmentalInspectionAddExe文件暂时去掉推送待办
|
2026-05-15 15:43:00 +08:00 |
|
zhangyue
|
7070c2d1ff
|
消息提醒
|
2026-05-15 11:03:41 +08:00 |
|
zhangyue
|
b5165f77a3
|
修复隐患验收驳回时的参数传递错误
|
2026-05-15 10:35:21 +08:00 |
|
zhangyue
|
290a606961
|
消息提醒
|
2026-05-14 19:02:09 +08:00 |
|
tianxinlei
|
cd65c72f42
|
5-14 - fix
|
2026-05-14 15:27:08 +08:00 |
|
zhangyue
|
c96bc1dc0e
|
添加用户待办事项统计功能
|
2026-05-12 10:33:36 +08:00 |
|
zhangyue
|
e8d2721188
|
完善隐患管理功能并新增菜单权限控制
|
2026-04-27 15:26:31 +08:00 |
|
zhangyue
|
3e0614157e
|
添加项目统计功能支持检查次数和隐患数
|
2026-04-21 08:36:13 +08:00 |
|
zhangyue
|
320d648274
|
完善隐患管理功能并优化检查导出功能
|
2026-04-15 15:57:57 +08:00 |