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

426 Commits (8a5e062d2cfed5aedb07a542139cde62fab2a5ba)

Author SHA1 Message Date
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
277151821@qq.com e32470182b 维保管理 2024-03-15 11:25:36 +08:00
277151821@qq.com e3b792417a 保险管理 2024-03-15 11:24:29 +08:00
277151821@qq.com 3e79f43c2f 年检管理 2024-03-15 11:23:46 +08:00
277151821@qq.com 7476fb62b3 北斗管理 2024-03-15 11:21:18 +08:00
xiepeng 51f5ad594b Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 09:05:03 +08:00
xiepeng d21ddeeb85 过户管理 报废管理 2024-03-14 09:04:40 +08:00
WenShiJun 5b3891263a Merge remote-tracking branch 'origin/dev' into dev 2024-03-13 18:03:48 +08:00
WenShiJun 88dc82a3bd 岗位安全承诺书、责任书，职业危害告知书，管理人员配备，安全生产目标，安全责任制考核模块开发，优化 2024-03-13 18:03:41 +08:00
zhangyanli c7cfb27443 共通信息 2024-03-13 08:41:46 +08:00
zhangyanli cf3c099a38 教培信息 2024-03-12 17:20:55 +08:00
zhangyanli ddb8a559d4 共通信息 2024-03-12 09:11:09 +08:00
WenShiJun a5d9ae30fc Merge remote-tracking branch 'origin/dev' into dev 2024-03-11 18:10:30 +08:00
WenShiJun ae5bcebb97 安全例会优化 
岗位安全责任书开发
岗位安全承诺书开发
 2024-03-11 18:10:24 +08:00
zhangyanli 91146e106c Merge branch 'dev-new' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev 2024-03-11 09:03:29 +08:00
zhangyanli 55617c2e0f Merge branch 'dev-new' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev 2024-03-11 08:46:31 +08:00
zhangyanli 9d056791a7 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/application.properties
 2024-03-11 08:42:54 +08:00
WenShiJun 9fc2b68dc2 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 18:05:34 +08:00
WenShiJun c114942d3a 新增劳务聘用合同，岗位安全责任书，职业危害告知书 
安全例会优化
 2024-03-08 18:05:27 +08:00
zhangqihang 9af841b8c9 教培去除部分企业 2024-03-08 18:01:32 +08:00
xiepeng 5ef28f2aa2 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 17:44:00 +08:00
xiepeng 5bd22ec032 过户管理 2024-03-08 17:43:31 +08:00
zhangyanli b4aecc440a 教培信息 2024-03-08 08:50:53 +08:00
277151821@qq.com 4daa25f275 年检管理列表增加倒叙排序 2024-03-07 11:37:58 +08:00
277151821@qq.com c83fc2a5b4 年检管理修改 2024-03-07 11:25:28 +08:00
277151821@qq.com cb0952eae5 后端修改 2024-03-07 11:06:17 +08:00
xiepeng 14674ea26c Merge remote-tracking branch 'origin/dev' into dev 2024-03-07 10:24:08 +08:00
xiepeng a2576d4258 运营车辆 修改 车船税 2024-03-07 10:23:53 +08:00
zhangyanli 1ac6f197c0 共通信息 2024-03-07 09:32:30 +08:00
zhangyanli 0b7b42197b 共通信息 2024-03-06 17:56:01 +08:00
zhangyanli ab39dd7e0b 共通信息 2024-03-06 17:38:52 +08:00
zhangyanli a2b506427e Merge branch 'dev' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev-new 
# Conflicts:
#	src/main/java/com/zcloud/controller/archives/ArchivesCapitalController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesEduManagerController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesEduPlanController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesFilesController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesPostManController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesTeacherController.java
#	src/main/java/com/zcloud/controller/courseware/AppCoursewareController.java
#	src/main/java/com/zcloud/controller/courseware/DataCoursewareController.java
#	src/main/java/com/zcloud/controller/courseware/QuestionController.java
#	src/main/java/com/zcloud/controller/courseware/VideoCoursewareController.java
#	src/main/java/com/zcloud/controller/curriculum/AppMyCurriculumController.java
#	src/main/java/com/zcloud/controller/curriculum/CurriculumController.java
#	src/main/java/com/zcloud/controller/curriculum/KcmiddlekjController.java
#	src/main/java/com/zcloud/controller/eduArchives/ArchivesPdfFileController.java
#	src/main/java/com/zcloud/controller/education/PersonObtainEvidenceController.java
#	src/main/java/com/zcloud/controller/education/TrainingInfoController.java
#	src/main/java/com/zcloud/controller/education/TrainingPlanController.java
#	src/main/java/com/zcloud/controller/paper/StageexampaperInputController.java
#	src/main/java/com/zcloud/controller/platformCourseware/PlatformDataCoursewareController.java
#	src/main/java/com/zcloud/controller/platformCourseware/PlatformQuestionController.java
#	src/main/java/com/zcloud/controller/platformCourseware/PlatformVideoCoursewareController.java
#	src/main/java/com/zcloud/controller/platformCurriculum/PlatformCurriculumController.java
#	src/main/java/com/zcloud/controller/platformPaper/PlatformStageexampaperInputController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveyController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveyanswerController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveycorpinfoController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveyquestionController.java
#	src/main/java/com/zcloud/controller/study/AppMfolderStipulateController.java
#	src/main/java/com/zcloud/controller/study/MfolderStipulateController.java
#	src/main/java/com/zcloud/controller/study/StudySectionController.java
#	src/main/java/com/zcloud/controller/study/TempStudyController.java
#	src/main/java/com/zcloud/controller/study/VideoController.java
#	src/main/java/com/zcloud/controller/system/AppFeedbackController.java
#	src/main/java/com/zcloud/controller/task/AppCourseExamController.java
#	src/main/java/com/zcloud/controller/task/AppCourseStudentRelationController.java
#	src/main/java/com/zcloud/controller/task/AppCourseStudyController.java
#	src/main/java/com/zcloud/controller/task/AppCourseStudyVideoRecordController.java
#	src/main/java/com/zcloud/controller/task/AppCoursepapersController.java
#	src/main/java/com/zcloud/controller/task/AppStageExamController.java
#	src/main/java/com/zcloud/controller/task/AppStageStudentRelationController.java
#	src/main/java/com/zcloud/controller/task/AppStageexampaperController.java
#	src/main/java/com/zcloud/controller/task/AppStudyTaskController.java
#	src/main/java/com/zcloud/controller/task/CourseStudyVideoRecordController.java
#	src/main/java/com/zcloud/controller/task/StageExamController.java
#	src/main/java/com/zcloud/controller/task/StageStudentRelationController.java
#	src/main/java/com/zcloud/controller/task/StageexampaperController.java
#	src/main/java/com/zcloud/controller/task/StudyTaskController.java
#	src/main/java/com/zcloud/controller/video/AIWarningController.java
#	src/main/java/com/zcloud/controller/video/AppAudioOrVideoController.java
#	src/main/java/com/zcloud/controller/video/AppVideoManagerController.java
#	src/main/java/com/zcloud/controller/video/VideoManagerController.java
#	src/main/java/com/zcloud/mapper/datasource/corp/CorpInfoMapper.java
#	src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
#	src/main/java/com/zcloud/mapper/datasource/video/AIWarningMapper.java
#	src/main/java/com/zcloud/mapper/datasource/video/VideoManagerMapper.java
#	src/main/java/com/zcloud/service/corp/CorpInfoService.java
#	src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java
#	src/main/java/com/zcloud/service/system/DepartmentService.java
#	src/main/java/com/zcloud/service/system/UsersService.java
#	src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
#	src/main/java/com/zcloud/service/video/AIWarningService.java
#	src/main/java/com/zcloud/service/video/VideoManagerService.java
#	src/main/java/com/zcloud/service/video/impl/AIWarningServiceImpl.java
#	src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java
#	src/main/java/com/zcloud/util/Const.java
#	src/main/java/com/zcloud/util/DateUtil.java
#	src/main/java/com/zcloud/util/InitPageDataUtil.java
#	src/main/resources/application.properties
#	src/main/resources/mybatis/datasource/system/UsersMapper.xml
 2024-03-06 16:33:30 +08:00
zhangyanli 6b2a1c9479 提交信息 2024-03-06 16:25:53 +08:00
WenShiJun 6298ab6596 安全例会模块优化->查看人员列表页，详情页 2024-03-06 16:10:05 +08:00
277151821@qq.com 63ab771a02 后端修改 2024-03-06 12:25:55 +08:00
xiepeng ece25c0daf 运营车辆 2024-03-06 10:28:52 +08:00
xiepeng a893aa83b2 Merge remote-tracking branch 'origin/dev' into dev 2024-03-06 09:41:34 +08:00
xiepeng 42b42a208d 运营车辆 2024-03-06 09:41:06 +08:00
WenShiJun 8316b09a48 安全例会模块优化 2024-03-05 18:14:36 +08:00
wangpeng 04b40acb8d 变更附件主目录 2024-03-05 16:49:04 +08:00
wangpeng 1bc503f3cb 变更附件主目录 2024-03-05 16:47:52 +08:00
277151821@qq.com 654802b461 后端修改 2024-03-05 12:00:06 +08:00
277151821@qq.com 3d1a78869c 后端修改 2024-03-05 11:36:33 +08:00
277151821@qq.com d96a569e66 撤销修改 2024-03-05 11:12:37 +08:00
277151821@qq.com b244cb0985 货运挂车后端 2024-03-05 11:08:48 +08:00
wangpeng 437c8ccc89 Merge pull request 'dev' (#5) from integrated_whb/integrated_whb:dev into dev 
Reviewed-on: #5
 2024-03-04 11:07:07 +08:00
WenShiJun 14e7e11f2a 新增从业人员管理相关接口 2024-03-01 18:04:06 +08:00
chenxinying 8482fa7e79 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 16:56:10 +08:00
chenxinying c7e8305bb2 八项作业中作业人显示，吊装作业安全措施添加吨数 2024-03-01 16:55:50 +08:00
WenShiJun eddae30465 安全通知，客户管理，运单登记，地点管理功能优化 2024-03-01 13:52:43 +08:00
fangjiakai b5f20683d4 修改人员定位接口地址 2024-03-01 12:08:00 +08:00
dearlin f7ebc6a958 八项作业与优化三方定位系统后台地址的查询 2024-03-01 11:41:16 +08:00
xiepeng 983e857ba9 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 10:18:37 +08:00
xiepeng 93e9e8a30b 运营车辆 2024-03-01 10:01:48 +08:00
dearlin ee5192518b 八项作业与部分bug 2024-03-01 09:05:45 +08:00
WenShiJun 48a21ed00d 客户管理后端功能优化 
新增地点管理后端功能
 2024-02-29 18:30:26 +08:00
zhangqihang 8dd9ff3390 修复bug 2024-02-29 15:43:39 +08:00