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

46 Commits (ad2a450c9b5b24ee0de471f8ad7e245452641af6)

Author SHA1 Message Date
xiepeng ad2a450c9b 优化BUG 从业人员新增 选择人员功能 2024-06-20 17:18:23 +08:00
wangpeng e354406762 修复职务职称显示乱码问题 2024-06-17 18:04:54 +08:00
xiepeng 87eb2f9857 优化BUG 2024-06-03 18:01:39 +08:00
xiepeng f50c2d35df 优化BUG 2024-05-24 16:29:06 +08:00
xiepeng eae9b520d2 优化BUG 人员类型不显示 2024-05-23 10:32:45 +08:00
xiepeng 17370942ee 优化BUG 2024-05-21 17:56:31 +08:00
xiepeng 8b613dda3a 优化BUG 2024-05-17 17:57:02 +08:00
277151821@qq.com 58fc5c5043 用户管理导入修改、从业人员 人员类型支持多选 2024-04-29 08:35:26 +08:00
wangpeng e7f5125534 补充替换CORPINFO_ID通用标识 2024-04-11 12:33:52 +08:00
xiepeng 9a53d54817 BUG优化 2024-04-09 19:08:24 +08:00
wangpeng b37c6bea6b 从业人员用户select下拉选择 2024-04-08 20:12:27 +08:00
xiepeng be0fb252b5 BUG优化 2024-04-08 18:01:44 +08:00
wangpeng 3bc08cd718 修复用户审核确认过程选择拒绝时的后续操作异常问题 2024-03-29 13:51:29 +08:00
xiepeng 56e76848cc Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
#	src/main/java/com/zcloud/service/system/UsersService.java
#	src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
#	src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
 2024-03-29 13:36:34 +08:00
xiepeng 61a5aa1b86 BUG优化 2024-03-29 13:30:29 +08:00
WenShiJun 0751df5651 生成安全事故档案bug优化 2024-03-29 10:47:48 +08:00
zhangyanli ba5c9534ad 教培功能bug修复 2024-03-27 15:52:48 +08:00
wangpeng 16c7d7aa24 从业人员管理 2024-03-22 14:53:46 +08:00
zhangyanli 7f8b9402ce 教培功能 2024-03-22 09:37:32 +08:00
WenShiJun 7558066cb4 安全生产月活动，安全知识手册模块开发 
运单登记，地点管理模块优化
 2024-03-21 08:42:15 +08:00
zhangyanli cf3c099a38 教培信息 2024-03-12 17:20:55 +08:00
zhangyanli b4aecc440a 教培信息 2024-03-08 08:50:53 +08:00
zhangyanli 0b7b42197b 共通信息 2024-03-06 17:56:01 +08:00
xiepeng 42b42a208d 运营车辆 2024-03-06 09:41:06 +08:00
xiepeng 93e9e8a30b 运营车辆 2024-03-01 10:01:48 +08:00
dearlin 465e8dc397 14291 创建用户时没有输入定位卡，提示定位卡已经存在，无法正常用户 2024-02-26 15:38:06 +08:00
dearlin 19021b8999 安全例会 2024-02-20 16:10:49 +08:00
dearlin 09a83d789e 安全例会 2024-02-06 15:40:01 +08:00
fangjiakai 2d1952b93f Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 09:15:09 +08:00
fangjiakai eea6621946 地图八项作业 2024-02-04 09:14:57 +08:00
zhangqihang 05927c3048 重点工程 2024-02-03 17:53:40 +08:00
dearlin 7d60a3c2cd 根据卡号查询人员信息 2024-01-29 09:07:29 +08:00
dearlin 5032c3e5c1 ai报警，人员信息导入的时候卡号变成5位 2024-01-26 15:54:26 +08:00
dearlin cf1573cbaa 手机端排查未在电子围栏禁止排查 2024-01-25 17:24:05 +08:00
dearlin 648d5df8e7 根据定位卡号获取人是否再电子围栏里，shiro权限注释 2024-01-25 16:37:20 +08:00
dearlin 84b0151796 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 14:20:40 +08:00
dearlin 8187112f9a 绑定人员定位卡号 2024-01-25 14:20:05 +08:00
wangpeng 9d93529c50 权限路由 2024-01-24 11:39:18 +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
xiepeng 5d35ba69d8 动火作业 根据Id查询 
八项作业保存删除图片
 2024-01-19 09:23:41 +08:00
WenShiJun 26a757a44c UsersController层中逻辑迁移至UsersServiceImpl，并新增调用远程新增接口 2024-01-11 15:17:27 +08:00
fangjiakai da7145a1a1 整合other mq 2024-01-05 10:06:26 +08:00
fangjiakai 0afe99435e 整合other mq 2024-01-05 08:51:44 +08:00
fangjiakai 3486386421 整合prevention 2024-01-04 09:07:20 +08:00
fangjiakai ae68bbf464 整合system 2024-01-03 11:04:18 +08:00