wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity
176 Commits
3 Branches
0 Tags
51 MiB
Commit Graph

176 Commits (e0530e207cf4953d2381fc8ef78b00f3ab783b57)

Author SHA1 Message Date
chenxinying fc1f682428 Merge remote-tracking branch 'origin/dev' into dev 2024-01-24 14:00:52 +08:00
chenxinying 44d1708a79 动火验收，查询时，显示签字信息 2024-01-24 14:00:24 +08:00
wangpeng 9d93529c50 权限路由 2024-01-24 11:39:18 +08:00
fangjiakai 25d0947d7f 动火作业 service层方法 2024-01-24 09:59:54 +08:00
chenxinying abeb80f88d 动火更新作业开始时间，结束时间和验收时间 2024-01-24 09:34:59 +08:00
chenxinying 22dd31c65a 动火添加验收时间字段，更新作业开始时间，结束时间和验收时间 2024-01-24 09:25:29 +08:00
chenxinying 0650dffac0 动火下一步状态变更 2024-01-23 11:27:24 +08:00
fangjiakai c120c0b55b Merge remote-tracking branch 'origin/dev' into dev 2024-01-23 08:30:03 +08:00
fangjiakai 13e1b7442e 动火作业 2024-01-23 08:29:43 +08:00
chenxinying 4a2d44a6c9 Merge remote-tracking branch 'origin/dev' into dev 2024-01-22 15:20:38 +08:00
chenxinying 7c4371d328 动火签字图片 2024-01-22 15:20:32 +08:00
WenShiJun f628f098b3 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev 
# Conflicts:
#	src/main/java/com/zcloud/service/system/DepartmentService.java
 2024-01-22 14:17:42 +08:00
WenShiJun 5c15b857f3 新增安全、环保检查管理模块 2024-01-22 14:15:49 +08:00
chenxinying 3507bf61a9 动火添加作业开始和作业结束 2024-01-22 14:05:11 +08:00
fangjiakai 298b10c1de 动火作业 service层新增措施相关接口 2024-01-22 08:48:40 +08:00
fangjiakai 1df78fdd26 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java
#	src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java
#	src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
#	src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
 2024-01-22 08:47:56 +08:00
fangjiakai d578f2d083 动火作业 2024-01-22 08:45:31 +08:00
xiepeng e892e0c892 动火作业 获取所有措施 获取需要签字的措施 获取所有签字完成的措施 2024-01-19 14:36:54 +08:00
fangjiakai 79a69dd4ef 动火作业 service层新增措施相关接口 2024-01-19 11:35:32 +08:00
fangjiakai 18505d248c 动火作业 2024-01-19 11:34:11 +08:00
fangjiakai 17f8e83c3d Merge remote-tracking branch 'origin/dev' into dev 2024-01-19 11:32:43 +08:00
fangjiakai 498e9adb9c 动火作业 service层新增措施相关接口 2024-01-19 11:32:31 +08:00
xiepeng 238023b118 动火作业 补充 取消，下一步，验收归档 2024-01-19 11:30:03 +08:00
fangjiakai 8c5051aaaf Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java
#	src/main/java/com/zcloud/service/eightwork/HotworkService.java
#	src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
#	src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml
 2024-01-19 10:26:55 +08:00
fangjiakai d4e586d700 动火作业 service层方法 2024-01-19 10:23:06 +08:00
xiepeng 5d35ba69d8 动火作业 根据Id查询 
八项作业保存删除图片
 2024-01-19 09:23:41 +08:00
chenxinying 2f1ef51627 动火气体检测分析的创建 2024-01-18 16:43:05 +08:00
fangjiakai fb0f7cf1fe 动火作业 2024-01-18 08:55:39 +08:00
chenxinying dd05b7d11d bus_hotwork_sign的mapper创建 2024-01-17 15:06:25 +08:00
chenxinying ebf1d6d6a0 BUS_EIGHTWORK_TASK的mapper创建 2024-01-17 14:19:50 +08:00
chenxinying da1dfc7f22 BUS_EIGHTWORK_TASK_FLOW的mapper创建 2024-01-17 14:16:56 +08:00
chenxinying 2d56101774 BUS_EIGHTWORK_FLOW_LOG的mapper创建 2024-01-17 14:08:59 +08:00
chenxinying a3c18c875e BUS_EIGHTWORK_FLOW_LOG的mapper创建 2024-01-17 14:05:18 +08:00
fangjiakai c3a95c61c0 动火作业 2024-01-17 13:41:44 +08:00
chenxinying 20fdf49bbc 八项作业删除 2024-01-17 10:43:13 +08:00
chenxinying eda0a53e19 八项作业作废时，监控删除，视频监控列表 2024-01-16 15:14:42 +08:00
chenxinying 0fce9d9f9a Merge remote-tracking branch 'origin/dev' into dev 2024-01-15 17:19:50 +08:00
WenShiJun ee029166e8 PLSUtil工具类新增告警统计方法 2024-01-15 15:27:55 +08:00
WenShiJun 5e8bbd1f12 Clear Git cache and re-add all files 2024-01-15 15:26:59 +08:00
WenShiJun ec2a863351 Stop tracking log files 2024-01-15 15:18:54 +08:00
WenShiJun c0c2abb24c Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev 2024-01-15 15:14:47 +08:00
WenShiJun 3d8221128d PLSUtil工具类新增告警统计方法 2024-01-15 15:14:16 +08:00
fangjiakai ad9dcf5e3c 添加忽略文件夹 2024-01-15 09:19:08 +08:00
WenShiJun 500456a892 PLSUtil工具类新增部分三方接口及封装方法，恢复切换分支后之前优化的bug代码被覆盖的部分代码 2024-01-12 16:40:52 +08:00
chenxinying d28d40bf53 Merge remote-tracking branch 'origin/dev' into dev 2024-01-12 08:42:36 +08:00
fangjiakai fce0c60fa5 Merge remote-tracking branch 'origin/dev' into dev 2024-01-12 08:36:43 +08:00
fangjiakai f78ca2a7cd 删除 catalina.base_IS_UNDEFINED/logs/fhserver.2024-01-11.log 2024-01-12 08:34:22 +08:00
fangjiakai c5b14134c9 修改MQ消息发送 2024-01-12 08:31:05 +08:00
WenShiJun 0473aab406 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev 2024-01-11 18:04:11 +08:00
WenShiJun 152a6da70d PLSUtil工具类优化 2024-01-11 18:02:48 +08:00