 wangpeng
|
26f80f9a68
|
部门删除，去掉定位功能
|
2024-04-21 23:34:19 +08:00 |
|
wangpeng
|
e7f5125534
|
补充替换CORPINFO_ID通用标识
|
2024-04-11 12:33:52 +08:00 |
|
wangpeng
|
292883e482
|
修复安全体系管理，用户删除
|
2024-04-09 16:09:03 +08:00 |
|
wangpeng
|
b37c6bea6b
|
从业人员用户select下拉选择
|
2024-04-08 20:12:27 +08:00 |
 xiepeng
|
be0fb252b5
|
BUG优化
|
2024-04-08 18:01:44 +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 |
 277151821@qq.com
|
3e79f43c2f
|
年检管理
|
2024-03-15 11:23:46 +08:00 |
|
zhangyanli
|
cf3c099a38
|
教培信息
|
2024-03-12 17:20:55 +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 |
|
xiepeng
|
42b42a208d
|
运营车辆
|
2024-03-06 09:41:06 +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 |
 fangjiakai
|
b5f20683d4
|
修改人员定位接口地址
|
2024-03-01 12:08:00 +08:00 |
|
xiepeng
|
93e9e8a30b
|
运营车辆
|
2024-03-01 10:01:48 +08:00 |
 dearlin
|
ee5192518b
|
八项作业与部分bug
|
2024-03-01 09:05:45 +08:00 |
|
wangpeng
|
fb3f754bcf
|
Merge pull request 'dev' (#4) from integrated_whb/integrated_whb:dev into dev
Reviewed-on: #4
|
2024-02-27 14:19:06 +08:00 |
zhangqihang
|
271431816e
|
修复bug
|
2024-02-27 08:47:05 +08:00 |
|
dearlin
|
72495ef2ca
|
部门 单位对接
|
2024-02-26 17:46:09 +08:00 |
|
dearlin
|
465e8dc397
|
14291 创建用户时没有输入定位卡，提示定位卡已经存在，无法正常用户
|
2024-02-26 15:38:06 +08:00 |
|
dearlin
|
752b0e1300
|
允许进入部门，允许进入人员
|
2024-02-26 11:37:49 +08:00 |
|
WenShiJun
|
ba988ffb42
|
安全通知模块->列表，新增，删除，详情接口开发
|
2024-02-23 19:04:20 +08:00 |
|
zhangqihang
|
acb1c9a5a2
|
修复bug
|
2024-02-23 18:04:02 +08:00 |
|
zhangqihang
|
51d29c72ef
|
修复视频上传
|
2024-02-23 09:52:53 +08:00 |
|
dearlin
|
0fbddd5f62
|
新加外来人员部门，外来人员并且禁止登录到系统提示账号密码不正确
|
2024-02-22 16:33:00 +08:00 |
|
dearlin
|
d911193e36
|
安全例会
|
2024-02-20 08:38:25 +08:00 |
|
wangpeng
|
25a7c7973f
|
隐患排查异常修改
|
2024-02-19 08:58:17 +08:00 |
|
dearlin
|
09a83d789e
|
安全例会
|
2024-02-06 15:40:01 +08:00 |
|
wangpeng
|
ba9618f0a2
|
路由菜单按权限加载
|
2024-02-06 10:54:53 +08:00 |
|
wangpeng
|
27d2f26bfc
|
路由菜单按权限加载
|
2024-02-06 10:50:43 +08:00 |
|
fangjiakai
|
eea6621946
|
地图八项作业
|
2024-02-04 09:14:57 +08:00 |
|
fangjiakai
|
bc49136400
|
八项作业地图统计
|
2024-01-30 10:38:22 +08:00 |
|
dearlin
|
c353987bd2
|
根据卡号查询人员信息
|
2024-01-29 09:08:29 +08:00 |
|
dearlin
|
d6adfe9c42
|
根据卡号查询人员信息
|
2024-01-29 09:07:57 +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
|
5c15b857f3
|
新增安全、环保检查管理模块
|
2024-01-22 14:15:49 +08:00 |
|
WenShiJun
|
152a6da70d
|
PLSUtil工具类优化
|
2024-01-11 18:02:48 +08:00 |
|
WenShiJun
|
26a757a44c
|
UsersController层中逻辑迁移至UsersServiceImpl，并新增调用远程新增接口
|
2024-01-11 15:17:27 +08:00 |
|
fangjiakai
|
60bb52b485
|
修改导入,登录
|
2024-01-10 11:18:33 +08:00 |