 zhaokai
|
b3ece9c085
|
Merge branch 'dev_change0814_page' into dev
|
2026-08-19 17:58:17 +08:00 |
|
zhaokai
|
7bee091880
|
feat(project): 添加企业类型字段支持筛选功能
|
2026-08-19 17:57:58 +08:00 |
 lishiwei
|
431b05bf94
|
feat(): 添加editFlag查询条件，移除固定摄像头corpinfoId过滤
|
2026-08-08 09:05:36 +08:00 |
|
zhaokai
|
b6f6cc31c2
|
feat(project): 添加可视化大屏视频查询的企业和港区筛选功能
|
2026-08-07 20:46:10 +08:00 |
|
zhaokai
|
37098afd5c
|
Merge branch 'dev_visual_page'
|
2026-08-07 19:59:46 +08:00 |
|
zhaokai
|
831e1c3925
|
Merge branch 'dev_visual_page' into dev
|
2026-08-07 18:34:15 +08:00 |
|
zhaokai
|
a2f2a595bb
|
feat(project): 添加可视化大屏固定摄像头视频功能
|
2026-08-07 18:33:58 +08:00 |
|
zhaokai
|
a78067edaf
|
Merge branch 'dev_visual_page' into dev
# Conflicts:
# web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
|
2026-08-07 18:22:58 +08:00 |
|
zhaokai
|
24389693c8
|
feat(project): 添加可视化大屏固定摄像头视频功能
|
2026-08-07 18:20:31 +08:00 |
|
zhaokai
|
53af6abd32
|
fix(project): 优化大屏项目统计数据查询逻辑
|
2026-08-07 17:10:58 +08:00 |
|
zhaokai
|
314959c535
|
fix(project): 优化大屏项目统计数据查询逻辑
|
2026-08-07 17:08:15 +08:00 |
|
zhaokai
|
5563d57194
|
Merge branch 'dev_visual_page' into dev
# Conflicts:
# web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenMobileMonitoringQry.java
# web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
|
2026-08-06 13:43:29 +08:00 |
|
zhaokai
|
15b3337d9d
|
feat(project): 添加摄像头类型筛选功能
|
2026-08-06 13:41:52 +08:00 |
|
zhaokai
|
786969f2ee
|
feat(project): 添加可视化大屏承包项目和移动监控功能
|
2026-08-06 10:42:27 +08:00 |
|
zhaokai
|
c25b00b360
|
feat(project): 添加可视化大屏承包项目和移动监控功能
|
2026-08-06 10:41:55 +08:00 |
|
zhaokai
|
3e315152c4
|
Merge branch 'dev_visual_page' into dev
|
2026-08-05 10:32:11 +08:00 |
|
zhaokai
|
0be73298d2
|
fix(project): 修正关键项目查询中的公司信息关联错误
|
2026-08-05 10:31:54 +08:00 |
|
zhaokai
|
750fd97762
|
Merge branch 'dev_visual_page' into dev
|
2026-08-05 10:12:04 +08:00 |
|
zhaokai
|
5a928cf467
|
fix(project): 修正关键项目查询中的公司信息关联错误
|
2026-08-05 10:11:46 +08:00 |
|
zhaokai
|
915669d0d2
|
Merge branch 'dev_visual_page' into dev
|
2026-08-05 09:53:26 +08:00 |
|
zhaokai
|
57e1f5fd2e
|
Merge branch 'dev_visual_page'
|
2026-08-03 10:28:24 +08:00 |
|
zhaokai
|
5e65188e4e
|
feat(project): 添加可视化大屏重点作业信息列表功能
|
2026-07-29 09:47:44 +08:00 |
|
zhaokai
|
e44a28ad5c
|
feat(project): 添加可视化大屏相关方作业情况统计功能
|
2026-07-28 15:38:33 +08:00 |
|
zhaokai
|
f5586a966f
|
fix(project): 修正大屏项目统计数据查询逻辑
|
2026-07-28 13:44:51 +08:00 |
|
lishiwei
|
4a7f1229d9
|
feat(): 重点作业相关方端申请和企业端核查核实角标与列表数量统一
|
2026-07-24 11:09:48 +08:00 |
|
lishiwei
|
7e1693414b
|
feat(): 补充分支合并遗漏代码-2
|
2026-07-23 11:25:10 +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
|
780dce2294
|
refactor(project): 移除大屏查询方法中的参数校验逻辑
|
2026-07-22 11:25:47 +08:00 |
|
zhaokai
|
083f580bfd
|
feat(project): 添加可视化大屏部门统计功能并完善项目统计字段
|
2026-07-22 09:35:15 +08:00 |
|
zhaokai
|
c9e2a6667a
|
Merge branch 'dev_visual_page' into dev
|
2026-07-21 14:04:57 +08:00 |
|
zhaokai
|
375997f1df
|
feat(project): 添加可视化大屏重点作业功能
|
2026-07-21 14:04:36 +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
|
ae65b5c41e
|
feat(): 修改核实状态赋值逻辑，更换导出时间字段
|
2026-07-20 09:11:37 +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
|
2219cf9523
|
refactor(): 重构项目关键摄像头保存逻辑并优化检查流程
|
2026-07-10 18:09:03 +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
|
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 |