 wangpeng
|
e354406762
|
修复职务职称显示乱码问题
|
2024-06-17 18:04:54 +08:00 |
 xiepeng
|
87eb2f9857
|
优化BUG
|
2024-06-03 18:01:39 +08:00 |
|
xiepeng
|
ad906e4af8
|
优化BUG
|
2024-05-29 14:05:35 +08:00 |
|
xiepeng
|
60deab8936
|
优化BUG
|
2024-05-16 18:01:52 +08:00 |
|
xiepeng
|
0de1e045c0
|
优化BUG
|
2024-05-15 18:08:03 +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 |
|
wangpeng
|
b1b9f69dd6
|
修复提醒配置bug
|
2024-04-10 19:55:13 +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 |
|
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 |
|
WenShiJun
|
4763b042a0
|
交通一体化bug优化
|
2024-03-28 18:32:18 +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 |
|
WenShiJun
|
2311b8333a
|
生产安全事故档案模块开发
|
2024-03-15 17:52:47 +08:00 |
|
zhangyanli
|
ddb8a559d4
|
共通信息
|
2024-03-12 09:11:09 +08:00 |
|
zhangyanli
|
b4aecc440a
|
教培信息
|
2024-03-08 08:50:53 +08:00 |
|
zhangyanli
|
1ac6f197c0
|
共通信息
|
2024-03-07 09:32:30 +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 |
zhangqihang
|
271431816e
|
修复bug
|
2024-02-27 08:47:05 +08:00 |
 dearlin
|
465e8dc397
|
14291 创建用户时没有输入定位卡，提示定位卡已经存在，无法正常用户
|
2024-02-26 15:38:06 +08:00 |
|
zhangyanli
|
69ba309b4e
|
隐患排查接口
|
2024-02-04 09:09:25 +08:00 |
|
zhangqihang
|
05927c3048
|
重点工程
|
2024-02-03 17:53:40 +08:00 |
 fangjiakai
|
bc49136400
|
八项作业地图统计
|
2024-01-30 10:38:22 +08:00 |
|
dearlin
|
771d0f04e7
|
根据用户卡号查信息
|
2024-01-29 10:18:20 +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
|
8187112f9a
|
绑定人员定位卡号
|
2024-01-25 14:20:05 +08:00 |
|
WenShiJun
|
5c15b857f3
|
新增安全、环保检查管理模块
|
2024-01-22 14:15:49 +08:00 |
|
WenShiJun
|
500456a892
|
PLSUtil工具类新增部分三方接口及封装方法，恢复切换分支后之前优化的bug代码被覆盖的部分代码
|
2024-01-12 16:40:52 +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 |