 lishiwei
|
4a7f1229d9
|
feat(): 重点作业相关方端申请和企业端核查核实角标与列表数量统一
|
2026-07-24 11:09:48 +08:00 |
 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
|
44ab59f375
|
Merge branch 'dev_visual_page' into dev
|
2026-07-22 11:38:16 +08:00 |
|
zhaokai
|
dc89f788c1
|
fix(mapper): 修复关键项目查询参数传递问题
|
2026-07-22 11:37:58 +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 |
|
lishiwei
|
5f3d891cef
|
feat(): 补充分支合并遗漏代码
|
2026-07-20 09:10:30 +08:00 |
|
zhaokai
|
f7b904591e
|
feat(project): 合并异常
|
2026-07-17 17:40:42 +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
|
f8342fca39
|
fix(): 重点作业统计隐患数量加入视频识别报警来源
|
2026-07-14 14:04:11 +08:00 |
|
lishiwei
|
e607c022ba
|
feat(): 添加处罚反馈中的被处罚人信息字段
|
2026-07-10 11:15:04 +08:00 |
|
lishiwei
|
fbe0d77f45
|
feat(): 添加安全环保检查和隐患模块申辩功能
|
2026-07-09 09:04:07 +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
|
6e0c639f60
|
fix(): 重点作业作业算法配置 摄像头在线状态空值问题
|
2026-07-02 19:40:22 +08:00 |
|
lishiwei
|
3be9130520
|
fix(): 重点作业数据查询、处罚列表和检查任务处理
|
2026-07-02 19:15:12 +08:00 |
|
lishiwei
|
73da9e4153
|
fix(): 修复隐患查询和关键项目统计相关问题
|
2026-07-02 09:06:35 +08:00 |
|
lishiwei
|
b64c1048a0
|
fix(): 修复关键项目摄像头计数逻辑并添加在线状态字段
|
2026-07-02 08:59:31 +08:00 |
|
lishiwei
|
cb2e24c02d
|
feat(): 处罚分页列表数据权限修改
|
2026-06-29 18:04:11 +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
|
ff4870153b
|
feat(): 添加处罚管理、处罚反馈待办数量统计
|
2026-06-23 13:39:38 +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
|
f85d98241d
|
feat(): 添加项目创建来源字段（手动创建/自动创建）
|
2026-06-12 10:30:56 +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 |
 tianxinlei
|
553dcbe226
|
5-26 - fix
|
2026-05-26 11:24:13 +08:00 |
|
tianxinlei
|
2d6f8b0c63
|
5-26 - fix
|
2026-05-26 11:11:53 +08:00 |
|
tianxinlei
|
94d8a48912
|
5-26 - fix
|
2026-05-26 10:21:47 +08:00 |
|
tianxinlei
|
9ee10340af
|
5-26 - KeyProjectCameraAiCO 增加 String algorithmId字段
|
2026-05-26 09:47:14 +08:00 |
|
tianxinlei
|
b2d48e94a0
|
5-25 - 作业算法配置列表增加处置人
|
2026-05-25 18:01:14 +08:00 |
|
tianxinlei
|
ca96074256
|
5-23 - 隐患验收接口 增加对视频识别类型隐患的消息推送和待办
|
2026-05-23 10:46:48 +08:00 |
|
tianxinlei
|
d8a6ae547d
|
5-22 - 修改bug
|
2026-05-22 09:50:32 +08:00 |
|
tianxinlei
|
1e6116b197
|
5-21 - 修改bug
|
2026-05-21 17:09:25 +08:00 |
|
tianxinlei
|
c739e3980e
|
5-21 - 修改bug
|
2026-05-21 17:06:49 +08:00 |
zhangyue
|
77073d5bbe
|
关键项目启动状态统计逻辑
|
2026-05-21 17:00:08 +08:00 |
|
zhangyue
|
394e415a31
|
修正关键项目查询中的分组字段
|
2026-05-21 16:38:04 +08:00 |
|
zhangyue
|
1284a61eaa
|
添加消息通知和统计功能
|
2026-05-21 14:27:45 +08:00 |