 yang_shj
|
fb24ce9497
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
yang_shj
|
d37680eb04
|
#代码合并
|
8 months ago |
 liwen
|
fc36c5eb79
|
fix: 特种设备管理逻辑修改
|
8 months ago |
|
yang_shj
|
7e29255efa
|
Merge remote-tracking branch 'origin/prod'
# Conflicts:
# hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/emParam/entity/ParamBackupsDetailEntity.java
# hzims-service/equipment/src/main/resources/db/1.0.1.sql
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/WindMapper.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/WindService.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/WindServiceImpl.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/DataService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/controller/HzimsDataController.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/service/HzimsDataService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/service/impl/HzimsDataServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskSchedule.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
# pom.xml
|
8 months ago |
|
yang_shj
|
81c2c110bb
|
#离线巡检&检修列表查询
|
8 months ago |
 ty
|
5980f7a1b1
|
修正：人员分组
|
8 months ago |
|
ty
|
ab4e220d2f
|
修正：人员分组
|
8 months ago |
|
ty
|
b0b79143ec
|
Revert "修正：人员分组"
This reverts commit 7ee6670802.
|
8 months ago |
|
ty
|
7ee6670802
|
修正：人员分组
|
8 months ago |
|
liwen
|
c33aca39ae
|
fix: 检修记录添加设备名称、计划工期字段
|
8 months ago |
 haungxing
|
8ec36032a3
|
fix:巡检任务统计点击总数弹出列表数量不对bug
|
8 months ago |
|
haungxing
|
e75d9f050f
|
fix:危险源列表所属机构修改为非必填项
|
8 months ago |
|
haungxing
|
a70edce72f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hzims-service/operational/src/main/resources/template/word/constructio_template.docx
|
8 months ago |
|
haungxing
|
c544c68d7f
|
fix:施工日志模板调整
|
8 months ago |
|
yang_shj
|
b9f9223bbf
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
yang_shj
|
ca9892af12
|
#检修日志导出
|
8 months ago |
|
ty
|
bcc09f319b
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
ty
|
5614c8ada8
|
修正：缺陷月报统计
|
8 months ago |
|
liwen
|
b1765edef3
|
fix: 我的检修任务页面添加is_deleted字段过滤
|
8 months ago |
|
ty
|
f537f66cb2
|
增加非空处理
|
8 months ago |
|
liwen
|
98580a5427
|
fix: 检修计划导出添加空值判断
|
8 months ago |
|
liwen
|
fa60c3cc6c
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
liwen
|
7deba94a15
|
update: sql脚本更新
|
8 months ago |
|
haungxing
|
84ca68f3b5
|
fix:middle、equipment初始化脚本优化
|
8 months ago |
|
haungxing
|
3bfc4a0d8b
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
haungxing
|
57784d9eb7
|
fix:日常维护逾期判定定时任务bug解决
|
8 months ago |
|
liwen
|
99f732d6be
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
8 months ago |
|
liwen
|
69600ccce6
|
update: 演练计划导出数据补充
|
8 months ago |
|
liwen
|
d2a6a4d9f2
|
update: 特种设备模块逻辑修改
|
8 months ago |
|
ty
|
23d67ebd12
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
ty
|
793cf72f28
|
operation脚本更新
middle字典更换大小写
|
8 months ago |
|
haungxing
|
fc7b889aef
|
fix:日常维护逾期判定定时任务bug解决
|
8 months ago |
|
haungxing
|
c9d220275e
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
haungxing
|
0853aeba71
|
fix:ticket脚本更新
|
8 months ago |
|
yang_shj
|
da5f54459b
|
#初始sql
|
8 months ago |
|
yang_shj
|
b6bfa2f699
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hzims-service/inspect/src/main/resources/db/1.0.0.sql
|
8 months ago |
|
yang_shj
|
507a5444c4
|
#初始sql
|
8 months ago |
|
liwen
|
29066696e0
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
liwen
|
e17d0856b0
|
update: 巡检/安全服务sql脚本文件更新
|
8 months ago |
|
ty
|
ff5bcdc2e4
|
operation脚本提交
|
8 months ago |
|
ty
|
f355496b3b
|
operation脚本提交
|
8 months ago |
|
ty
|
b5428e12f2
|
operation脚本提交
|
8 months ago |
|
ty
|
714fbfe35c
|
operation脚本提交
|
8 months ago |
|
haungxing
|
cc11ae863c
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
haungxing
|
32ca04112b
|
fix:ticket-3.0.0.sql脚本删除
|
8 months ago |
|
ty
|
6e5364b0dd
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
haungxing
|
1e7d82f0e6
|
fix:operational脚本整理
|
8 months ago |
|
yang_shj
|
52f28478f1
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hzims-service/hzims-middle/src/main/resources/db/2.0.0.sql
|
8 months ago |
|
yang_shj
|
da7920e48f
|
#初始sql
|
8 months ago |
|
ty
|
e2e7d42a06
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
