Commit Graph

29 Commits (77e65e3af66521bc300745ff4940bef8920ad7ae)

Author SHA1 Message Date
zhaokai 77e65e3af6 Merge branch 'dev_visual_page' into dev 2026-07-22 17:06:41 +08:00
zhaokai 3a8096859e feat(web): 添加可视化大屏项目进行情况功能 2026-07-22 17:00:24 +08:00
zhaokai ebfcec4419 Merge branch 'dev_visual_page' into dev 2026-07-22 11:26:03 +08:00
zhaokai 083f580bfd feat(project): 添加可视化大屏部门统计功能并完善项目统计字段 2026-07-22 09:35:15 +08:00
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
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 d452d31d8d fix(): 补充项目创建来源默认值 2026-07-02 09:07:08 +08:00
lishiwei cb2e24c02d feat(): 处罚分页列表数据权限修改 2026-06-29 18:04:11 +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 fd2c464a42 feat(): 添加隐患处罚功能和重点作业处罚人员配置 2026-06-22 17:49:18 +08:00
tianxinlei 6f808fa9b2 5-15 - fix 2026-05-15 16:47:04 +08:00
tianxinlei 4d65da95d2 5-15 - fix 2026-05-15 16:16:07 +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 125c3a626c 添加安全环保检查导出功能 2026-04-13 11:33:33 +08:00
zhangyue ab7b7e0aad 添加AI告警批量处理功能并优化分页查询 2026-04-10 11:03:17 +08:00
zhangyue b9f20a92a4 添加AI相关功能控制器和命令执行器 2026-04-10 08:48:25 +08:00
zhangyue f62296ef2a 添加安全环保检查申辩详情查询和流程图功能 2026-04-02 16:33:24 +08:00
zhangyue ad8633449a 添加隐患验收和整改功能 2026-04-01 11:49:37 +08:00
zhaokai 765fd6b108 重点作业重点工程相关 2026-03-30 15:11:55 +08:00
zhaokai 051ed17221 重点作业重点工程相关 2026-03-30 09:09:58 +08:00
zhangyue d56aae21bb 安全环保检查增加核实、确认、申辩等功能 2026-03-27 09:57:31 +08:00
zhangyue c5a655e5f7 安全环保检查 2026-03-23 08:59:37 +08:00
zhaokai 8c82151134 项目调整 2026-03-20 15:48:46 +08:00
zhaokai e5173a33f0 init 2026-03-19 15:32:45 +08:00
zhaokai 1df0fbdfb0 init 2026-03-16 10:13:33 +08:00