From f8b114fe75b9b68485e7039f64cd1dae69c77dcc Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 14:58:59 +0800
Subject: [PATCH] Merge branch 'develop' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardWorkInstructionController.java | 56 ++++++++++++++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardWorkInstruction.java | 7 +++
2 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardWorkInstructionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardWorkInstructionController.java
index 0f1e81d..a89bd30 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardWorkInstructionController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardWorkInstructionController.java
@@ -20,8 +20,10 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.StrUtils;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
import org.jeecg.modules.eam.entity.MaintenanceStandardWorkInstruction;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IMaintenanceStandardWorkInstructionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -72,6 +74,9 @@
@Autowired
private ISysBaseAPI sysBaseApi;
+
+ @Autowired
+ private IEamEquipmentService equipmentService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -266,4 +271,55 @@
return Result.ok("涓婁紶鎴愬姛!");
}
+
+ @PostMapping(value = "/addStoveCategoryReport")
+ public Result<?> addStoveCategoryReport(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
+ String str = request.getParameter("data");
+ JSONObject json = JSONObject.parseObject(str);
+ MaintenanceStandardWorkInstruction maintenanceStandardWorkInstruction = json.toJavaObject(MaintenanceStandardWorkInstruction.class);
+
+ boolean isFileChange = true;
+ String uploadId = json.getString("uploadId");
+ String fileType = json.getString("fileType");
+ String description = json.getString("description");
+ String type = json.getString("type");
+ // 鏂囦欢鍙樻洿
+ if (isFileChange) {
+
+ String workInstructionId = "";
+ if (StrUtils.isNotBlankOrNull(uploadId)) {
+ // 鎯呭舰涓�銆佷粠鏂囦欢绠＄悊涓�夋嫨
+// uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId);
+ } else {
+ // 鎯呭舰浜屻�侀噸鏂颁笂浼�
+ // 1銆佹寔涔卽pload
+ MultipartFile multipartFile = request.getFile("file");
+ List<MultipartFile> multipartFileList = new ArrayList<>();
+ multipartFileList.add(multipartFile);
+// List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description);
+ List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description);
+
+ //鎸佷箙浣滀笟鎸囧涔�
+ workInstructionId = sysUploads.get(0).getId();
+ maintenanceStandardWorkInstruction.setWorkInstructionId(workInstructionId);
+ maintenanceStandardWorkInstructionService.save(maintenanceStandardWorkInstruction);
+
+ String equipmentId = maintenanceStandardWorkInstruction.getEquipmentId();
+ String technologyStatus = maintenanceStandardWorkInstruction.getTechnologyStatus();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ equipment.setTechnologyStatus(technologyStatus);
+ equipmentService.updateById(equipment);
+
+
+ // 2銆佸垱寤�/淇敼 uploadRela
+ // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲�
+// uploadRelaService.saveOrUpdateUploadRale(maintenanceStandardWorkInstruction.getId(), type, sysUploads.get(0).getId());
+ sysBaseApi.saveOrUpdateUploadRale(maintenanceStandardWorkInstruction.getId(), type, sysUploads.get(0).getId());
+ }
+ }
+
+ return Result.ok("涓婁紶鎴愬姛!");
+ }
+
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardWorkInstruction.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardWorkInstruction.java
index 945b7d6..5fb630c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardWorkInstruction.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardWorkInstruction.java
@@ -5,6 +5,7 @@
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -58,4 +59,10 @@
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
private Integer delFlag = CommonConstant.DEL_FLAG_0;
+
+ @TableField(exist = false)
+ private String equipmentId;
+
+ @TableField(exist = false)
+ private String technologyStatus;
}
--
Gitblit v1.9.3