430/mdc_430_new.git

			@@ -129,23 +129,6 @@
			}
			}
			record.put("workingHourQuota",workingHourQuota);
			// for (Map<String, Object> dailyMaintenanceDetail : dailyMaintenanceDetails) {
			//获取订单明细示意图
			// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) dailyMaintenanceDetail.get("maintenanceStandardDetailId")).eq(SysUploadRela::getDelFlag, 0).list();
			// List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) dailyMaintenanceDetail.get("maintenanceStandardDetailId"),null);
			// if (sysUploadRelas.size() > 0) {
			//// List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String) dailyMaintenanceDetail.get("maintenanceStandardDetailId"), "daily_maintenance_standard_photo");
			// List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) dailyMaintenanceDetail.get("maintenanceStandardDetailId"), "daily_maintenance_standard_photo");
			// SysUpload upload = new SysUpload();
			// if (CollectionUtils.isNotEmpty(uploadRelas)) {
			// upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
			// }
			// dailyMaintenanceDetail.put("upload", upload);
			// } else {
			// SysUpload upload = new SysUpload();
			// dailyMaintenanceDetail.put("upload", upload);
			// }
			// }
			record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
			/**
			* 复选框不可编辑

			@@ -58,6 +58,9 @@
			t3.use_id as useId,
			t6.depart_name as departName,
			t7.name as teamName,
			DATEADD(DAY,-30,t1.plan_start_time) as yellowWarningTime,
			DATEADD(DAY,-7,t1.plan_start_time) as redWarningTime,
			CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
			t1.plan_start_time as planStartTime,
			t1.plan_end_time as planEndTime,
			t1.actual_start_time as actualStartTime,

			@@ -20,6 +20,9 @@
			t6.name AS teamName,
			concat(t8.code, '/', t8.name) AS maintenanceCycleName,
			t9.NAME AS maintenanceTypeName,
			DATEADD(DAY,-60,t1.plan_start_time) as yellowWarningTime,
			DATEADD(DAY,-14,t1.plan_start_time) as redWarningTime,
			CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
			t1.plan_start_time as planStartTime,
			t1.plan_end_time as planEndTime,
			t1.actual_start_time as actualStartTime,

	lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史