guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
609 Commits
29 Branches
4 Tags
151 MiB
Commit Graph

281 Commits (877b518e5d7690acb16819bbfb1d0cf41962b148)

Author SHA1 Message Date
shanao 877b518e5d Merge remote-tracking branch 'origin/dev-shanao' into pet 
# Conflicts:
#	src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java
#	src/main/java/com/zcloud/controller/messages/MessagesController.java
#	src/main/java/com/zcloud/entity/messages/PushRecords.java
#	src/main/java/com/zcloud/mapper/datasource/messages/MessagesMapper.java
#	src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java
#	src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml
#	src/main/resources/mybatis/datasource/messages/MessagesMapper.xml
 2024-10-23 14:21:23 +08:00
shanao 38986c3364 1111111 2024-10-23 14:18:28 +08:00
shanao 9e089fcb62 1111111 2024-10-23 14:18:27 +08:00
shanao 183eef7073 将事故事件分离开 2024-10-23 14:18:18 +08:00
shanao c2c3897979 封装数据发送（九公司消息发送） 2024-10-23 14:16:31 +08:00
shanao 1a26abd93a 封装数据发送（九公司消息发送） 2024-10-21 18:26:02 +08:00
shanao 3711239f55 1111111 2024-10-19 17:34:40 +08:00
shanao 6111c30c7a 1111111 2024-10-15 18:13:26 +08:00
shanao 0ec51c4702 Merge remote-tracking branch 'origin/dev' into dev-shanao 
# Conflicts:
#	src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java
#	src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java
 2024-10-08 16:27:56 +08:00
shanao 8a1947dbd3 Merge remote-tracking branch 'refs/remotes/origin/pet' into dev-shanao 2024-09-30 14:14:20 +08:00
shanao b5f7a5fede 将事故事件分离开 2024-09-27 18:07:34 +08:00
huangyuxuan 6050e94b49 datalistPageV3回退 2024-09-24 18:30:22 +08:00
huangyuxuan f7cc015363 Merge branch 'pet' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
 2024-09-24 18:20:18 +08:00
huangyuxuan 13448e2af1 菜单回退 2024-09-24 18:19:25 +08:00
huangyuxuan 432d02c430 删除多次提交的代码 2024-09-24 17:37:09 +08:00
huangyuxuan f3b7639fcf Merge branch 'hyx_changeFileUpload_2024-9-10' into pet 
# Conflicts:
#	src/main/java/com/zcloud/controller/filemanager/MfolderController.java
#	src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
#	src/main/java/com/zcloud/util/Const.java
 2024-09-20 16:48:04 +08:00
huangyuxuan 5d728f4d16 Merge remote-tracking branch 'origin/pet' into pet 2024-09-19 14:37:03 +08:00
huangyuxuan 785cb0b4e9 [新增功能](hyx_changeFileUpload_2024-9-10) 
- AppSystemController.java
   - 延时监火任务转发下拉选择部门时不选择主企业
 - CheckRecordMapper.xml
 - ListManagerMapper.xml
   - 查询 USER_NAME 时 调用  getUnameByUid函数
 - StatisticsDataController.java
   - 数据大屏，首页接口不登陆访问
 2024-09-19 10:02:54 +08:00
guoyuepeng bd4185fcb7 1.消防检查二维码 2024-09-19 08:46:49 +08:00
water_xu e932aacc86 菜单恢复 2024-09-14 17:05:11 +08:00
WenShiJun 32899c9531 菜单表恢复 2024-09-14 16:59:52 +08:00
WenShiJun c2068c6ebd 消防安全管理添加扫码查看检查记录更新 2024-09-14 16:50:01 +08:00
shanao b8dec5280c Merge remote-tracking branch 'origin/dev-shanao' into dev 2024-09-14 10:48:53 +08:00
WenShiJun bc8002876b 消防安全管理添加扫码查看检查记录 2024-09-14 09:50:07 +08:00
shanao a455293431 Merge remote-tracking branch 'origin/dev-shanao' into pet 2024-09-13 17:47:35 +08:00
shanao eb37f788a7 测试完成 2024-09-13 17:19:33 +08:00
guoyuepeng b7b228f4b6 1.企业端移植门口门禁和人员定位系统 2024-09-11 17:33:07 +08:00
water_xu 7925ea2a61 回滚中台相关代码 2024-09-10 19:54:59 +08:00
water_xu 2e517e44a3 暂时回滚人员中台相关代码 2024-09-10 16:51:54 +08:00
water_xu 1cb6ce1c95 Revert "人员中台 - 人员初始化相关接口" 
This reverts commit b3ec041f58.
 2024-09-10 15:38:03 +08:00
shanao dceba5c4b2 修复导出相关问题 2024-09-10 14:10:42 +08:00
huangyuxuan 683a6be69e 显示监管端上传的体系文件 2024-09-10 11:47:12 +08:00
shanao c6ea9844ca 修改图片上传方式为Sftp 导出没有调通 2024-09-09 18:05:42 +08:00
shanao 5197b10d4e 调试 2024-09-08 22:06:08 +08:00
shanao a5b76b25df 优化批量提交 2024-09-06 19:38:32 +08:00
water_xu 6e9a25d7f4 Merge branch 'refs/heads/pet' into dev 2024-09-05 18:27:16 +08:00
WenShiJun f629b35351 消防点位管理模块检查记录二维码功能修改 2024-09-05 09:25:02 +08:00
water_xu 439eb4fdb0 恢复菜单 2024-09-04 20:42:01 +08:00
water_xu b3ec041f58 人员中台 - 人员初始化相关接口 2024-09-04 16:20:02 +08:00
guoyuepeng db8a7b76be 1.八项作业强制回档 2024-09-04 11:24:37 +08:00
WenShiJun 83487f4028 消防安全管理添加扫码查看检查记录 2024-09-03 18:08:40 +08:00
shanao 7f1a65f3f7 添加注释 2024-09-03 17:08:02 +08:00
wangpeng c15fdba0a7 上传 excel 导入 导出 相关代码 2024-09-02 16:11:56 +08:00
wangpeng 73f05b7638 上传事故调查管理代码 2024-08-30 18:04:21 +08:00
water_xu 94ff24d671 人员中台 - 对接企业、组相关代码以及接口变动 2024-08-22 18:51:58 +08:00
water_xu eb19ec1372 Merge branch 'refs/heads/xuyifeng-0724-人员中台对接-dev' into pet 2024-08-15 15:53:11 +08:00
water_xu e6b781fa95 相关方人员管理 - 相关方人员审批搜索功能不能使用,搜索信息添加姓名 2024-08-14 17:09:27 +08:00
water_xu 021b19d85e 人员中台 - 人员中台管理列表查询逻辑修改 2024-08-14 17:03:52 +08:00
water_xu 2b3510591b 人员中台 - MQ日志补全&相关方用户更新逻辑 2024-08-12 10:15:37 +08:00
water_xu f579b75a92 相关方 - 相关方统计报表相关接口 2024-07-30 16:11:51 +08:00