zhaoyu
|
13b2e45888
|
处理承诺书bug
|
2024-03-18 18:28:52 +08:00 |
zhaoyu
|
72ae8adfbf
|
优化
|
2024-03-18 16:43:15 +08:00 |
zhaoyu
|
42f7226356
|
曹煤炭地图展示重点工程问题
|
2024-03-18 16:28:01 +08:00 |
zhaoyu
|
795a50361c
|
新的责任状模板
|
2024-03-18 16:18:15 +08:00 |
zhaoyu
|
e2d229241d
|
对接文件删除
|
2024-03-14 14:47:58 +08:00 |
zhaoyu
|
c0245bdf3c
|
Merge branch '0206czks' into 0205cmt
# Conflicts:
# src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java
# src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java
# src/main/resources/mybatis/datasource/firemanager/FireCheckStandardMapper.xml
|
2024-03-08 15:08:55 +08:00 |
zhaoyu
|
53530e0513
|
沧州矿石初始化
|
2024-03-08 15:07:11 +08:00 |
zhaoyu
|
37474aa188
|
曹煤炭车辆闸机对接
|
2024-03-07 17:07:42 +08:00 |
songwenxuan
|
a25574ef1f
|
闸机代码
|
2024-03-04 17:03:59 +08:00 |
songwenxuan
|
4919a6f1bb
|
修改线上文件上传地址
|
2024-03-01 15:55:32 +08:00 |
songwenxuan
|
6139cd5bff
|
删除权限对接代码
|
2024-02-28 15:12:58 +08:00 |
songwenxuan
|
bb5b367886
|
修复App安全环保检查申辩流程通过后的编辑操作中检查人确认图片丢失问题
|
2024-02-27 11:58:45 +08:00 |
songwenxuan
|
54ffb49e8b
|
修复安全环保检查申辩流程通过后的编辑操作中检查人确认图片丢失问题
|
2024-02-27 10:46:22 +08:00 |
songwenxuan
|
58123cad6c
|
Merge remote-tracking branch 'origin/0205cmt' into 0205cmt
|
2024-02-26 17:43:43 +08:00 |
songwenxuan
|
b01b9ae03c
|
修复用户信息查询时查出已删除用户的bug。修复消防安全管理-消防器材检查标准批量删除无效。
|
2024-02-26 17:43:34 +08:00 |
zhaoyu
|
b725352296
|
Merge branch '0206czks' into 0205cmt
|
2024-02-26 14:43:59 +08:00 |
zhaoyu
|
b456b33bc9
|
Changes
|
2024-02-26 14:42:44 +08:00 |
liulixin
|
4f86924b15
|
请求入参bug
|
2024-02-20 09:47:17 +08:00 |
zhaoyu
|
838b847571
|
提交
|
2024-02-06 14:46:35 +08:00 |
zhaoyu
|
3cfd300df0
|
删除沧州矿石地图信息
|
2024-02-06 14:32:47 +08:00 |
zhaoyu
|
c107ac92bb
|
处理余下冲突
|
2024-02-06 14:06:32 +08:00 |
zhaoyu
|
5deb7d2b03
|
Merge branch '0206czks' into 0205cmt
# Conflicts:
# pom.xml
# src/main/java/com/zcloud/aspect/DockingAspect.java
# src/main/java/com/zcloud/config/ShiroConfiguration.java
# src/main/java/com/zcloud/config/StartWebsocketServer.java
# src/main/java/com/zcloud/controller/app/AppPromiseController.java
# src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java
# src/main/java/com/zcloud/controller/bus/CorpPromiseController.java
# src/main/java/com/zcloud/controller/bus/HiddenExamineController.java
# src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java
# src/main/java/com/zcloud/controller/bus/RiskPointController.java
# src/main/java/com/zcloud/controller/bus/RiskUnitController.java
# src/main/java/com/zcloud/controller/filemanager/MfolderController.java
# src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java
# src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java
# src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java
# src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java
# src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java
# src/main/java/com/zcloud/controller/map/MapController.java
# src/main/java/com/zcloud/controller/map/MapEightController.java
# src/main/java/com/zcloud/controller/map/MapKeyProjectController.java
# src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
# src/main/java/com/zcloud/controller/system/HeadController.java
# src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java
# src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java
# src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
# src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java
# src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java
# src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java
# src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java
# src/main/java/com/zcloud/service/gatemachine/impl/GateAreaServiceImpl.java
# src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java
# src/main/java/com/zcloud/service/gatemachine/impl/GateVideoServiceImpl.java
# src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalInspectorServiceImpl.java
# src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java
# src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java
# src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java
# src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java
# src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java
# src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java
# src/main/java/com/zcloud/service/system/UsersService.java
# src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
# src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
# src/main/java/com/zcloud/util/Const.java
# src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java
# src/main/java/com/zcloud/util/HiddenExcelImgView.java
# src/main/java/com/zcloud/util/HttpClientService.java
# src/main/java/com/zcloud/util/HttpRequestUtil.java
# src/main/java/com/zcloud/util/MD5.java
# src/main/java/com/zcloud/util/ReturnMap.java
# src/main/java/com/zcloud/util/Smb.java
# src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java
# src/main/java/com/zcloud/util/hk/HKUtil.java
# src/main/resources/application-dev.properties
# src/main/resources/application.properties
# src/main/resources/config/sysSet.ini
# src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml
# src/main/resources/mybatis/datasource/bus/CorpPromiseDetailsMapper.xml
# src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml
# src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml
# src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
# src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml
# src/main/resources/mybatis/datasource/bus/PromiseDetailsMapper.xml
# src/main/resources/mybatis/datasource/bus/PromiseMapper.xml
# src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml
# src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml
# src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml
# src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml
# src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml
# src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
# src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
# src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
# src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml
# src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml
# src/main/resources/mybatis/datasource/mq/MqProductionErrorLogMapper.xml
# src/main/resources/mybatis/datasource/mq/MqProductionLogMapper.xml
# src/main/resources/mybatis/datasource/mysql1.sql
# src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
# src/main/resources/mybatis/datasource/system/CorpPathMapper.xml
# src/main/resources/mybatis/datasource/system/DepartmentMapper.xml
# src/main/resources/mybatis/datasource/system/PoliceMapper.xml
# src/main/resources/mybatis/datasource/system/UsersMapper.xml
# src/main/resources/mybatis/datasource/xgf/TrainUsersMapper.xml
# src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
# src/main/resources/mybatis/dsno2/bus/NoticeRegulatoryMapper.xml
# src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/AIWarningMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/DeviceMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/PersonnelManagementMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/UnitsMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml
# src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml
# src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml
# src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml
# src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml
|
2024-02-06 13:55:09 +08:00 |
zhaoyu
|
e6889bacd9
|
初始化沧州矿石
|
2024-02-06 11:05:20 +08:00 |
zhaoyu
|
f21c91c821
|
初始化曹煤炭
|
2024-02-06 11:02:25 +08:00 |
zhaoyu
|
4f468e21b2
|
测试
|
2024-02-06 10:03:02 +08:00 |
1261008090@qq.com
|
de46319c17
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2024-01-21 18:25:12 +08:00 |
1261008090@qq.com
|
7c33337f5f
|
港务局企业端检查
|
2024-01-21 18:24:52 +08:00 |
zhaoyu
|
a83b5b3fde
|
补充对接提交
|
2024-01-21 18:24:28 +08:00 |
dearlin
|
dd2f6b3f1e
|
线上代码合并到czks1.0
|
2023-12-28 13:40:16 +08:00 |
dearlin
|
9912c725af
|
Merge remote-tracking branch 'origin/2023年12月27日V01.00.50' into czks1.0
# 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/application-local.properties
# src/main/resources/application-master.properties
# src/main/resources/mybatis/datasource/system/UsersMapper.xml
|
2023-12-28 12:00:38 +08:00 |
dearlin
|
bc05a89ae6
|
合并线上代码
|
2023-12-28 11:58:54 +08:00 |
zhaoyu
|
7b9d086d55
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-27 11:12:59 +08:00 |
zhaoyu
|
4574316eee
|
处理海康空指针问题
|
2023-12-27 11:12:51 +08:00 |
dearlin
|
6a7ec92c75
|
fix: app用户登录时候后台地址问题
|
2023-12-27 10:21:55 +08:00 |
limingyu
|
5bf53a82a6
|
修改pc端动火作业动火区域管辖单位显示bug
|
2023-12-26 16:42:56 +08:00 |
zhaoyu
|
d05156eee2
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 16:11:36 +08:00 |
zhaoyu
|
42ea8d5208
|
高处作业迁移补充
|
2023-12-26 16:11:26 +08:00 |
liujun
|
a8378f01f0
|
Merge remote-tracking branch 'origin/liujun-2023-12-18-相关方需求更新' into 1212-八项作业迁移
|
2023-12-26 13:45:38 +08:00 |
liujun
|
e1cd46b493
|
bug修复
|
2023-12-26 12:35:28 +08:00 |
guoyuepeng
|
7a85418098
|
Merge pull request '分公司可以创建角色等信息' (#7) from corpSystem into 1212-八项作业迁移
Reviewed-on: #7
|
2023-12-26 09:54:14 +08:00 |
liujun
|
797a8c0586
|
bug修复
|
2023-12-25 18:17:09 +08:00 |
liujun
|
4f60d4f571
|
解决无法多选bug
|
2023-12-25 14:45:17 +08:00 |
dearlin
|
f18132db06
|
Merge branch '1212-八项作业迁移' into czks1.0
# Conflicts:
# src/main/java/com/zcloud/controller/system/LoginController.java
|
2023-12-25 14:37:27 +08:00 |
limingyu
|
c8e4eb4972
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-25 14:13:48 +08:00 |
limingyu
|
72793b2a76
|
Merge branch 'lmy20231215-动火bug修改' into 1212-八项作业迁移
# Conflicts:
# src/main/java/com/zcloud/controller/system/LoginController.java
|
2023-12-25 13:58:14 +08:00 |
zhaoyu
|
c82b1a7a01
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-25 13:55:33 +08:00 |
zhaoyu
|
ce4aafb5af
|
Merge branch 'zy-1218-重点工程播放视频' into 1212-八项作业迁移
|
2023-12-25 13:55:16 +08:00 |
dearlin
|
46b4239571
|
add: app用户登录时候后台地址问题
|
2023-12-23 11:36:32 +08:00 |
liujun
|
8be39e14d3
|
查看bug修复
|
2023-12-22 17:41:36 +08:00 |
liujun
|
5d46fa3c4d
|
查看bug修复
|
2023-12-22 15:49:12 +08:00 |
liujun
|
cd048126c0
|
查看bug修复
|
2023-12-22 13:39:11 +08:00 |
zhaoyu
|
195b9d4de0
|
处理数据丢失问题
|
2023-12-22 09:22:58 +08:00 |
liujun
|
644ee59398
|
查看bug修复
|
2023-12-21 19:55:08 +08:00 |
zhaoyu
|
519c0be3e7
|
注释代码
|
2023-12-21 17:46:03 +08:00 |
liujun
|
f59d2b0500
|
查看bug修复
|
2023-12-21 16:59:50 +08:00 |
liujun
|
a28d97cea7
|
相关方查看详情统一格式
|
2023-12-21 13:58:57 +08:00 |
liujun
|
9e7a5334bd
|
bug修复
|
2023-12-20 19:51:15 +08:00 |
liujun
|
add025a274
|
bug修复
|
2023-12-20 15:01:47 +08:00 |
liujun
|
d8f38ffdcd
|
bug修复
|
2023-12-20 14:49:01 +08:00 |
liujun
|
7360ba8cca
|
bug修复
|
2023-12-19 20:03:25 +08:00 |
limingyu
|
990ea8814d
|
修改动火作业数据延时监火审核人显示
|
2023-12-19 18:00:49 +08:00 |
dearlin
|
7ca4ab9570
|
Merge branch '1212-八项作业迁移' into czks1.0
# Conflicts:
# pom.xml
# src/main/resources/application-dev.properties
# src/main/resources/application-master.properties
|
2023-12-19 17:18:35 +08:00 |
liujun
|
d50f6f2d28
|
八项作业前端更新
|
2023-12-19 17:12:17 +08:00 |
liujun
|
a87827104e
|
Merge branch 'dev' into 1212-八项作业迁移
# Conflicts:
# pom.xml
# src/main/resources/application-dev.properties
|
2023-12-19 16:45:15 +08:00 |
dearlin
|
54dffe99ab
|
合并重点工程
|
2023-12-19 15:46:18 +08:00 |
liujun
|
d5f729cdbe
|
bug修复
|
2023-12-19 15:01:44 +08:00 |
limingyu
|
e29300756e
|
Merge branch 'dev' into lmy20231215-动火bug修改
|
2023-12-19 14:15:35 +08:00 |
zhaoyu
|
07b7e772aa
|
列表拆分 并且app播放视频
|
2023-12-19 11:33:21 +08:00 |
liujun
|
6d49773242
|
相关方需求变革
|
2023-12-18 20:24:02 +08:00 |
liujun
|
cfb4c2dd8e
|
相关方需求变革
|
2023-12-18 19:58:52 +08:00 |
liujun
|
a0dcdb61d3
|
相关方需求变革
|
2023-12-18 18:54:50 +08:00 |
zhaoyu
|
d59a9f1dfe
|
重点工程列表排序
|
2023-12-18 10:25:17 +08:00 |
zhaoyu
|
0d9228dda4
|
八项作业优化 正向流程bug修复
|
2023-12-17 15:53:55 +08:00 |
dearlin
|
9757d08f69
|
数据同步相关代码
|
2023-12-17 15:44:38 +08:00 |
dearlin
|
7073565e0b
|
add: 沧州矿石代码同步加地图版本
|
2023-12-17 15:29:45 +08:00 |
zhaoyu
|
343b66b914
|
正向逻辑走通
|
2023-12-17 14:18:12 +08:00 |
zhaoyu
|
fcd6a6860f
|
高处作业迁移补充
|
2023-12-17 09:31:34 +08:00 |
limingyu
|
6997c26a5f
|
一公司企业端驾驶舱危险作业统计显示2
|
2023-12-15 15:09:16 +08:00 |
limingyu
|
83c43d21f2
|
Merge branch 'lmy20231207-登录返回图片和后端地址' into lmy20231215-动火bug修改
|
2023-12-15 14:11:14 +08:00 |
limingyu
|
4a347f328a
|
Merge branch 'lmy20231211' into lmy20231215-动火bug修改
|
2023-12-15 14:05:10 +08:00 |
limingyu
|
6937054d44
|
一公司企业端驾驶舱危险作业统计显示
|
2023-12-15 13:59:11 +08:00 |
zhaoyu
|
c972e6c9c7
|
Merge remote-tracking branch 'origin/lmy20231211' into 相关方关联分公司功能
|
2023-12-14 18:48:24 +08:00 |
limingyu
|
f53539025c
|
延时监火改为多人同时监火,在同一个部门中都可以查看和发布监火信息2
|
2023-12-14 18:40:07 +08:00 |
liujun
|
71e3449f48
|
12618 编辑页面 判空提示语不正确
|
2023-12-14 16:50:11 +08:00 |
liujun
|
09b8516881
|
八项作业前端更新
|
2023-12-14 14:47:02 +08:00 |
zhaoyu
|
9469e9c1db
|
Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能
|
2023-12-13 14:45:23 +08:00 |
zhaoyu
|
cfc13f4ae0
|
企业端缺失功能补全
|
2023-12-13 14:45:11 +08:00 |
liujun
|
d55fd86916
|
八项作业前端更新
|
2023-12-13 14:35:16 +08:00 |
liujun
|
e3b7a14601
|
吊装作业
|
2023-12-13 13:49:37 +08:00 |
liujun
|
e21a116d8d
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-13 13:02:45 +08:00 |
liujun
|
8e983a58a8
|
短路功能迁移
|
2023-12-13 13:02:20 +08:00 |
zhaoyu
|
dfa04334c3
|
临时用电迁移
|
2023-12-13 10:58:39 +08:00 |
liujun
|
515476f56a
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-13 10:14:20 +08:00 |
liujun
|
520d5a03c6
|
短路功能迁移
|
2023-12-13 10:14:00 +08:00 |
zhaoyu
|
7f3883c401
|
临时用电 暂时提交 报错未解决
|
2023-12-13 09:18:54 +08:00 |
liujun
|
c998e2ebb0
|
bug修复
|
2023-12-12 19:16:04 +08:00 |
liujun
|
cce02a4d42
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-12 18:02:47 +08:00 |
liujun
|
1daf485e92
|
八项作业mq功能
|
2023-12-12 18:02:22 +08:00 |
zhaoyu
|
e9fccd58fc
|
有限空间迁移 还缺少mq 等内容
|
2023-12-12 17:47:59 +08:00 |
zhaoyu
|
f338b750da
|
动土作业迁移
|
2023-12-12 15:25:59 +08:00 |