From d2cd1865e77dd873166543df2f2f27f183e66860 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 20 十月 2023 13:56:50 +0800
Subject: [PATCH] 小修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
index 7ec9cca..6e29d15 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -17,10 +17,6 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
-//import org.jeecg.modules.system.entity.SysUpload;
-//import org.jeecg.modules.system.entity.SysUploadRela;
-//import org.jeecg.modules.system.service.IUploadRelaService;
-//import org.jeecg.modules.system.service.IUploadService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +27,7 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -107,27 +104,8 @@
List<Map<String, Object>> records = maintenanceStandardList.getRecords();
for (Map<String, Object> record : records) {
String maintenanceStandardId = (String) record.get("id");
- List<Map<String, Object>> maintenanceStandardDetaillist = maintenanceStandardDetailService.getMaintenanceStandardDetailList(maintenanceStandardId);
-// for (Map<String, Object> detail : maintenanceStandardDetaillist) {
-// //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁
-//// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String)detail.get("id")).eq(SysUploadRela::getDelFlag, 0).list();
-// List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), null);
-// if (sysUploadRelas.size() > 0) {
-// detail.put("isNoPhotoFlag", true);
-//// List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)detail.get("id"), "daily_maintenance_standard_photo");
-// List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), "daily_maintenance_standard_photo");
-// SysUpload upload = new SysUpload();
-// if (CollectionUtils.isNotEmpty(uploadRelas)) {
-//// upload = uploadService.getById(uploadRelas.get(0).getUploadId());
-// upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
-// }
-// detail.put("upload", upload);
-// } else {
-// detail.put("isNoPhotoFlag", false);
-// SysUpload upload = new SysUpload();
-// detail.put("upload", upload);
-// }
-// }
+ String equipmentId = (String) record.get("equipmentId");
+ List<Map<String, Object>> maintenanceStandardDetaillist = maintenanceStandardDetailService.getMaintenanceStandardDetailList(maintenanceStandardId,equipmentId);
record.put("maintenanceStandardDetaillist", maintenanceStandardDetaillist);
}
return Result.ok(maintenanceStandardList);
@@ -289,6 +267,7 @@
List<MaintenanceStandardWorkInstruction> maintenanceStandardWorkInstructionList = maintenanceStandardWorkInstructionService.lambdaQuery().eq(MaintenanceStandardWorkInstruction::getMaintenanceStandardId,maintenanceStandard.getId())
.eq(MaintenanceStandardWorkInstruction::getDelFlag, CommonConstant.DEL_FLAG_0).list();
maintenanceStandard.setId("");
+ maintenanceStandard.setCreateTime(new Date());
maintenanceStandardService.save(maintenanceStandard);
//鏄庣粏淇℃伅
List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist();
@@ -365,8 +344,10 @@
.eq(MaintenanceStandard::getVersionStatus, "2").list();
for (MaintenanceStandard standard : maintenanceStandardList) {
standard.setVersionStatus("3");
+ standard.setLoseEfficacyTime(new Date());
maintenanceStandardService.updateById(standard);
}
+ maintenanceStandard.setTakeEffectTime(new Date());
boolean b = maintenanceStandardService.updateById(maintenanceStandard);
if (b){
return Result.OK("鐢熸晥鎴愬姛!");
--
Gitblit v1.9.3