|
|
fb78cde154
|
记录人改成劳务名称
|
2024-07-05 18:34:30 +08:00 |
|
|
|
b144036dda
|
危险特殊作业统计危大工程数量+特殊作业数量
安全教育统计入场安全教育+培训计划数量
|
2024-07-05 16:17:25 +08:00 |
|
|
|
f69d4a8a53
|
统计危大类别情况
|
2024-07-05 15:35:48 +08:00 |
|
|
|
93162da5b0
|
删除危大和特种作业，把关联的四个东西也删除
|
2024-07-05 14:40:49 +08:00 |
|
|
|
388665b8ee
|
质量和安全增加已撤回的筛选
|
2024-07-05 14:27:29 +08:00 |
|
|
|
711cebe20d
|
代码添加注释
|
2024-07-05 12:00:55 +08:00 |
|
|
|
f761561ec6
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-07-05 09:13:46 +08:00 |
|
|
|
4d2954f3a1
|
大屏质量的数量统计
|
2024-07-05 09:11:51 +08:00 |
|
|
|
d8cf513d66
|
BUG修复
|
2024-07-05 00:47:16 +08:00 |
|
|
|
de15f8aaef
|
BUG修复
|
2024-07-05 00:33:50 +08:00 |
|
|
|
9b289bc7dd
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-07-04 18:59:56 +08:00 |
|
|
|
eb7e05c5e9
|
BUG修复
|
2024-07-04 18:57:23 +08:00 |
|
|
|
95fdd8b9ff
|
设备表修改合作单位字段名
|
2024-07-04 17:37:39 +08:00 |
|
|
|
0e97dbc626
|
bug修改
|
2024-07-04 17:36:40 +08:00 |
|
|
|
5d46436ae7
|
设备表修改合作单位字段名
|
2024-07-04 17:36:23 +08:00 |
|
|
|
7552196ae4
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-07-04 16:20:06 +08:00 |
|
|
|
78786d99b2
|
设备表增加合作单位字段
|
2024-07-04 16:19:59 +08:00 |
|
|
|
783f5019e8
|
BUG修复
|
2024-07-04 16:14:23 +08:00 |
|
|
|
c8dafceaff
|
bug修改
|
2024-07-04 15:06:49 +08:00 |
|
|
|
3d95bb3c91
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-07-04 14:29:56 +08:00 |
|
|
|
74d330af5b
|
大屏特种作业的4个接口和bug修改
|
2024-07-04 14:29:25 +08:00 |
|
|
|
9026eecb1a
|
BUG修复
|
2024-07-04 13:58:05 +08:00 |
|
|
|
4b3694d149
|
BUG修复
|
2024-07-04 10:15:44 +08:00 |
|
|
|
2bb87b2aa7
|
BUG修复
|
2024-07-04 10:14:32 +08:00 |
|
|
|
f9a37ced5e
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-07-03 18:19:03 +08:00 |
|
|
|
980f56d7e6
|
代码规范和bug修复
|
2024-07-03 18:16:59 +08:00 |
|
|
|
1b4f5ab9e0
|
进度修改
|
2024-07-03 16:54:37 +08:00 |
|
|
|
3313af7390
|
BUG修复
|
2024-07-03 16:34:20 +08:00 |
|
|
|
8c4e820c73
|
代码规范
|
2024-07-03 16:11:21 +08:00 |
|
|
|
5dc18dd22a
|
功能-质量-按周统计
|
2024-07-03 11:58:27 +08:00 |
|
|
|
9c31326994
|
雨量bug修改
|
2024-07-03 10:59:26 +08:00 |
|
|
|
b5f945faa5
|
Merge branch 'guoshengxiong' into guoshengxiongtemp
|
2024-07-03 10:11:14 +08:00 |
|
|
|
77f915e849
|
雨量bug修改
|
2024-07-03 10:10:52 +08:00 |
|
|
|
020206a10f
|
bug修改
|
2024-07-02 18:59:47 +08:00 |
|
|
|
f49f586297
|
Merge branch 'guoshengxiong' into guoshengxiongtemp
|
2024-07-02 17:08:09 +08:00 |
|
|
|
d929e896c4
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-07-02 17:04:08 +08:00 |
|
|
|
d09fb2ff7d
|
bug修改
|
2024-07-02 17:03:28 +08:00 |
|
|
|
5d80626d9b
|
工作流日志
|
2024-07-02 16:20:29 +08:00 |
|
|
|
7102984088
|
正式环境bug修改
|
2024-07-02 14:33:02 +08:00 |
|
|
|
16c9a9e4c7
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-07-02 14:19:52 +08:00 |
|
|
|
a83c2103b3
|
正式环境bug修改
|
2024-07-02 14:19:35 +08:00 |
|
|
|
8536616ae0
|
工作流日志
|
2024-07-02 11:32:53 +08:00 |
|
|
|
83353faa56
|
进度bug修改
|
2024-07-02 11:26:14 +08:00 |
|
|
|
ef02864567
|
进度审批修改监理
|
2024-07-02 11:18:28 +08:00 |
|
|
|
ab2b00e645
|
大屏算总分
|
2024-07-01 20:14:23 +08:00 |
|
|
|
6440b9d422
|
bug修复和代码规范
|
2024-07-01 17:38:31 +08:00 |
|
|
|
9764cb50e7
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteService.java
# src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java
# src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteToPointService.java
# src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java
# src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDevService.java
# src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationMaterialDataService.java
# src/main/java/com/zhgd/xmgl/modules/environment/service/IRainAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/environment/service/IRainDevService.java
# src/main/java/com/zhgd/xmgl/modules/environment/service/IRainRecordService.java
# src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java
# src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDevService.java
# src/main/java/com/zhgd/xmgl/modules/goulipkpm/service/IGouliPkpmConfigService.java
# src/main/java/com/zhgd/xmgl/modules/goulipkpm/service/IGouliPkpmModelService.java
# src/main/java/com/zhgd/xmgl/modules/goulipkpm/service/ITaskProgressRtService.java
# src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketAlarmDataService.java
# src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectDataService.java
# src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectKdeDataService.java
# src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDevService.java
# src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDisplacementDataService.java
# src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionDayRecordService.java
# src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionDevService.java
# src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionFenceService.java
# src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionDevService.java
# src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordService.java
# src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveDevService.java
# src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveRecordService.java
# src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDataService.java
# src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDevService.java
# src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationExceedDataService.java
# src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationMaterialDataService.java
# src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationProdDataService.java
# src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineDevService.java
# src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageBlockDataService.java
# src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageBlockNumberService.java
# src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtConstructionDrawService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtDesignChangeContactSheetService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtMaterialOrderService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtNewTechnologiesAndNewProcessService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtRiskInventoryTypeService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolHistoryService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtWorkTicketService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtWorkTicketToRiskSecurityLibraryTypeService.java
# src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java
# src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDevService.java
# src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatFenceService.java
# src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java
# src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDevService.java
# src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageWarnThresholdService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBeamService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBeamToProcessService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBridgeSectionService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldMaintainDataService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldMakeBeamPedestalService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldProcessService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldProductionLineService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldSaveBeamDistrictService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldSaveBeamPedestalService.java
# src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutDataService.java
# src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutDevService.java
# src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutSteelBeamDataService.java
# src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionDataService.java
# src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionDevService.java
# src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionSteelBeamDataService.java
# src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java
# src/main/java/com/zhgd/xmgl/modules/sprayrt/service/ISprayRtDataService.java
# src/main/java/com/zhgd/xmgl/modules/sprayrt/service/ISprayRtDevService.java
# src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDataService.java
# src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDevService.java
# src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationRawMaterialDataService.java
# src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationSetDataService.java
# src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressContentService.java
# src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialTypeService.java
# src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java
# src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageBlockDataService.java
# src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageBlockNumberService.java
# src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageService.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDataService.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDayRecordService.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionFenceService.java
# src/main/java/com/zhgd/xmgl/modules/video/service/IProjectVideoHkVqdService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/ISecurityWorkerCourseInfoService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevGroupService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevToGroupService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IVrSecurityWorkerLoginInfoService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoDeleteService.java
# src/main/java/com/zhgd/xmgl/modules/xz.security/service/IWorkerAccessRecordService.java
# src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzMilestoneService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IEducationConfigWeekVideoService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzAiDeductRuleService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzCertificateExpireAlarmRecordService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionVideoFullService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionVideoOnlineService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzNoticeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzProjectOrgService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzRegistryService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationApplyService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationRecordService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierRecordService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzGasAnalyzeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzGroundSafetService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzHighJobSafeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzHoistSafetyWorkService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzLimitSpaceSafeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzOpenCircuitSafeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzSpecialOperationFireSafetyService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzTemporaryElectricitySafeService.java
|
2024-07-01 16:16:30 +08:00 |
|
|
|
d814d56a00
|
代码规范
|
2024-07-01 14:18:33 +08:00 |
|
|
|
968ab5da60
|
代码规范
|
2024-07-01 14:17:43 +08:00 |
|
|
|
62e3e5b5e1
|
代码规范
|
2024-07-01 14:15:37 +08:00 |
|
