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

482 Commits (d175fbe30af4c61f3f1e76757e94b0a981d33c9e)

Author SHA1 Message Date
xiepeng eca9838520 BUG优化 营运车辆和货运挂车的部门显示ID 
事故的人员显示ID
 2024-05-06 17:43:45 +08:00
xiepeng b4f2f2645c BUG优化 2024-04-30 17:54:21 +08:00
xiepeng aaceba5f07 BUG优化 2024-04-30 17:54:04 +08:00
xiepeng 7d88371eb2 BUG优化 2024-04-29 17:54:21 +08:00
277151821@qq.com 58fc5c5043 用户管理导入修改、从业人员 人员类型支持多选 2024-04-29 08:35:26 +08:00
xiepeng 8a5e062d2c BUG优化 2024-04-28 17:57:47 +08:00
xiepeng 17e9aa562d BUG优化 2024-04-26 18:02:57 +08:00
xiepeng 462de67f21 BUG优化 2024-04-25 18:02:41 +08:00
xiepeng d27456c596 BUG优化 2024-04-25 09:52:09 +08:00
xiepeng aab7cc1666 BUG优化 2024-04-23 18:03:50 +08:00
xiepeng 4f772602b8 BUG优化 2024-04-22 17:56:11 +08:00
wangpeng 26f80f9a68 部门删除，去掉定位功能 2024-04-21 23:34:19 +08:00
xiepeng 43abb7c7e0 BUG优化 2024-04-19 12:08:05 +08:00
xiepeng faabbc8b54 BUG优化 2024-04-18 17:49:00 +08:00
xiepeng 06395c0c05 BUG优化 2024-04-17 13:01:53 +08:00
xiepeng be7db01faa BUG优化 2024-04-16 17:30:29 +08:00
xiepeng f922966913 BUG优化 2024-04-16 16:20:16 +08:00
xiepeng 6544fe9706 BUG优化 2024-04-16 11:22:38 +08:00
xiepeng c3b5ed3417 BUG优化 2024-04-16 09:46:52 +08:00
xiepeng 9105864b91 BUG优化 2024-04-15 18:00:41 +08:00
xiepeng a675bb1bfc BUG优化 2024-04-12 18:03:57 +08:00
xiepeng da3bde1492 BUG优化 2024-04-11 18:57:14 +08:00
xiepeng bce5400d80 BUG优化 2024-04-11 18:27:57 +08:00
wangpeng e7f5125534 补充替换CORPINFO_ID通用标识 2024-04-11 12:33:52 +08:00
wangpeng b1b9f69dd6 修复提醒配置bug 2024-04-10 19:55:13 +08:00
xiepeng 4daee83b45 BUG优化 2024-04-10 16:53:54 +08:00
wangpeng 78e0bccac5 补充替换CORPINFO_ID通用标识 2024-04-09 21:51:06 +08:00
xiepeng 9a53d54817 BUG优化 2024-04-09 19:08:24 +08:00
wangpeng 292883e482 修复安全体系管理，用户删除 2024-04-09 16:09:03 +08:00
wangpeng b37c6bea6b 从业人员用户select下拉选择 2024-04-08 20:12:27 +08:00
xiepeng 02c5294ae1 Merge remote-tracking branch 'origin/dev' into dev 2024-04-08 18:02:11 +08:00
xiepeng be0fb252b5 BUG优化 2024-04-08 18:01:44 +08:00
wangpeng 7b0f5dfc60 优化检查事项列表 2024-04-08 17:30:18 +08:00
wangpeng 91cef5e03e 替换数据库 
修复例会搜索条件bug
 2024-04-08 17:10:10 +08:00
xiepeng 02de9b04db BUG优化 2024-04-07 18:50:21 +08:00
xiepeng 1d133a37c9 BUG优化 2024-04-03 17:56:58 +08:00
xiepeng bd7f1054fb BUG优化 2024-04-02 18:51:36 +08:00
xiepeng 94709d2b14 BUG优化 2024-04-01 18:54:54 +08:00
xiepeng d6a122c369 Merge remote-tracking branch 'origin/dev' into dev 2024-04-01 10:46:13 +08:00
xiepeng c9e097caaa BUG优化 2024-04-01 10:46:03 +08:00
zhangyanli 1879d56889 教培bug修复 2024-04-01 08:34:02 +08:00
WenShiJun d671401c31 Merge remote-tracking branch 'origin/dev' into dev 2024-03-30 16:00:56 +08:00
WenShiJun 55a224fefa 点击编辑没有回显附件名称bug优化 2024-03-30 16:00:49 +08:00
zhangyanli c957d50f8f 教培功能bug 2024-03-30 14:58:23 +08:00
xiepeng b5f800bf86 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 18:06:40 +08:00
xiepeng 41336d567c BUG优化 2024-03-29 18:06:18 +08:00
WenShiJun c89d0c08f9 安全例会未开始会议状态不可进入优化 2024-03-29 18:05:45 +08:00
wangpeng 4ea47ce16a Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 16:30:23 +08:00
wangpeng ec9383f80f 补充法规库功能后台 2024-03-29 16:30:07 +08:00
WenShiJun 6ff71d1f1f 安全例会当前登录用户只能查看自己可参与的会议优化v2.0 2024-03-29 14:34:35 +08:00
WenShiJun adce4bdfc1 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 14:16:24 +08:00
WenShiJun ac04cc695c 安全例会当前登录用户只能查看自己可参与的会议优化 2024-03-29 14:16:14 +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 4f973b0e4b 年检管理列表页查询慢bug优化 2024-03-29 12:42:42 +08:00
WenShiJun 0751df5651 生成安全事故档案bug优化 2024-03-29 10:47:48 +08:00
WenShiJun 78e3a7aa32 交通一体化bug优化 2024-03-29 08:38:22 +08:00
WenShiJun 8f80812d53 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/mybatis/datasource/firefightingEquipmentFacility/FirefightingEquipmentFacilityMapper.xml
#	src/main/resources/mybatis/datasource/reportedIncident/ReportedIncidentMapper.xml
#	src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml
 2024-03-28 18:35:14 +08:00
WenShiJun b47e7d647b Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java
 2024-03-28 18:33:55 +08:00
xiepeng 86d82ec17e BUG优化 2024-03-28 18:32:23 +08:00
WenShiJun 4763b042a0 交通一体化bug优化 2024-03-28 18:32:18 +08:00
xiepeng 7fd34a34bb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
 2024-03-27 18:13:10 +08:00
xiepeng db4cba9b2b BUG优化 2024-03-27 18:10:54 +08:00
WenShiJun b5fa3fae2e Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml
 2024-03-27 18:06:28 +08:00
WenShiJun afdce2f5f2 bug优化 2024-03-27 18:05:14 +08:00
zhangyanli ba5c9534ad 教培功能bug修复 2024-03-27 15:52:48 +08:00
xiepeng c1acfc513f 提醒天数 下拉 2024-03-27 10:04:49 +08:00
xiepeng 5e14be67ed Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/beidou/BeidouController.java
 2024-03-26 18:11:05 +08:00
xiepeng 2fdcc017fe 修改车牌号、车架号、发动机号校验 
图片显示
 2024-03-26 18:06:10 +08:00
WenShiJun 2e121cfabc bug优化 2024-03-26 18:01:53 +08:00
WenShiJun d2555a192a Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 11:46:37 +08:00
WenShiJun bf84574073 保险管理，运营管理，维保管理，北斗管理优化 2024-03-25 11:46:07 +08:00
xiepeng 3d1f7acc6d Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 10:20:29 +08:00
zhangyanli 8f9a4b3da8 教培建班 2024-03-25 09:36:21 +08:00
wangpeng c24741bbfb 八项作业代码异常修复 2024-03-25 09:23:17 +08:00
xiepeng 1a61b3f9ab Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java
 2024-03-25 09:06:59 +08:00
xiepeng 85f4d83469 修改车船税过户显示 营运车辆车牌号唯一 2024-03-25 08:55:44 +08:00
WenShiJun 04dcec4ec5 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:17:26 +08:00
WenShiJun 0e9eeee54d 年检管理，保险管理新增优化 2024-03-22 17:17:17 +08:00
chenxinying 3146682bbc Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 15:07:34 +08:00
chenxinying 7a077fae5d 行车三检承运地显示 2024-03-22 15:07:30 +08:00
wangpeng aa8e404b5d Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 14:54:02 +08:00
wangpeng 16c7d7aa24 从业人员管理 2024-03-22 14:53:46 +08:00
chenxinying b43cb8ecc1 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
 2024-03-22 14:53:19 +08:00
WenShiJun eb8c8d0129 运单登记新增优化 
地点管理优化
客户管理优化
 2024-03-22 14:34:59 +08:00
chenxinying fb0e2acefb 行车三检 2024-03-22 14:11:24 +08:00
zhangyanli 58494b827d 教培功能 2024-03-22 09:44:33 +08:00
zhangyanli e1718a3f6a 教培功能 2024-03-22 09:43:26 +08:00
zhangyanli 70002e33a7 教培功能 2024-03-22 09:38:57 +08:00
zhangyanli 7f8b9402ce 教培功能 2024-03-22 09:37:32 +08:00
WenShiJun 29dee5bfd2 运单登记列表sql优化 2024-03-21 08:54:55 +08:00
WenShiJun c93b8b8801 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java
#	src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java
#	src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java
#	src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
 2024-03-21 08:43:37 +08:00
WenShiJun 7558066cb4 安全生产月活动，安全知识手册模块开发 
运单登记，地点管理模块优化
 2024-03-21 08:42:15 +08:00
chenxinying d282d1a2a7 行车三检 2024-03-20 17:02:31 +08:00
xiepeng 8feddb6b97 Merge remote-tracking branch 'origin/dev' into dev 2024-03-19 14:03:05 +08:00
xiepeng 05ff67e6fd 过户管理 
报废管理
企业安全生产值班记录
生产设备设施台账
劳动防护用品发放记录
消防设备设施台账
上报事件处理台账
 2024-03-19 14:02:24 +08:00
WenShiJun c40c8fe706 Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 17:52:54 +08:00
WenShiJun 2311b8333a 生产安全事故档案模块开发 2024-03-15 17:52:47 +08:00
277151821@qq.com 326a5024ef 营运管理 2024-03-15 11:26:18 +08:00