From 04ef88cee361ec8730c400d96250a6c1cd9f9d80 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 08 九月 2023 16:23:47 +0800
Subject: [PATCH] 设备台账 1.ABC标识变更记录功能 2.质保日期变更记录功能 3.质保到期提醒 4.ABC标识与关键设备标识联动 5.设备质保期字段添加

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java |   49 +++++++++++++++++++++++++++++++------------------
 1 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
index e5e5261..e51a1fb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
@@ -12,11 +12,11 @@
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
-import org.jeecg.modules.eam.entity.FinishTransferOrder;
-import org.jeecg.modules.eam.entity.PrecisionInspection;
+import org.jeecg.modules.eam.entity.*;
 import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
+import org.jeecg.modules.eam.service.IPrecisionInspectionDetailService;
 import org.jeecg.modules.eam.service.IPrecisionInspectionService;
+import org.jeecg.modules.eam.service.IPrecisionParametersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -43,6 +43,12 @@
 
 	@Autowired
 	private IDailyMaintenanceOrderService dailyMaintenanceOrderService;
+
+	@Autowired
+	private IPrecisionInspectionDetailService precisionInspectionDetailService;
+
+	@Autowired
+	private IPrecisionParametersService precisionParametersService;
 	
 	/**
 	 * 鍒嗛〉鍒楄〃鏌ヨ
@@ -168,13 +174,23 @@
         return super.importExcel(request, response, PrecisionInspection.class);
     }
 
-	/**
-	 * 鏃ュ父鐐规
-	 * qsw 2023-4-26
-	 */
+
 	@GetMapping("getPrecisionInspectionList")
 	public Result<?> getPrecisionInspectionList(@RequestParam(name = "maintenanceOrderId", required = true) String maintenanceOrderId) {
 		List<Map<String, Object>> precisionInspectionList = precisionInspectionService.getPrecisionInspectionList(maintenanceOrderId);
+		for (Map<String, Object> map : precisionInspectionList) {
+			String id = (String) map.get("id");
+			List<PrecisionInspectionDetail> precisionInspectionDetails = precisionInspectionDetailService.lambdaQuery()
+					.eq(PrecisionInspectionDetail::getPrecisionInspectionId, id)
+					.eq(PrecisionInspectionDetail::getDelFlag, "0").list();
+			for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetails) {
+				String precisionParametersId = precisionInspectionDetail.getPrecisionParametersId();
+				PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
+				precisionInspectionDetail.setPrecisionParametersName(precisionParameters.getName());
+			}
+
+			map.put("precisionInspectionDetails",precisionInspectionDetails);
+		}
 		return Result.ok(precisionInspectionList);
 	}
 
@@ -191,45 +207,42 @@
 		DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
 		String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();
 
-			if ("0".equals(precisionInspectionStatus)){
+		if ("0".equals(precisionInspectionStatus)){
+			List<PrecisionInspectionDetail> precisionInspectionDetailList = precisionInspection.getPrecisionInspectionDetailList();
+			for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetailList) {
+				precisionInspectionDetailService.updateById(precisionInspectionDetail);
+			}
 			preInspection.setPrecisionInspectionUser(userId);
-			precisionInspectionService.updateById(preInspection);
 
 			maintenanceOrder.setPrecisionInspectionStatus("1");
-			dailyMaintenanceOrderService.updateById(maintenanceOrder);
 		}else if("1".equals(precisionInspectionStatus)){
 			preInspection.setRepairDirectorUser(userId);
-			precisionInspectionService.updateById(preInspection);
 
 			maintenanceOrder.setPrecisionInspectionStatus("2");
-			dailyMaintenanceOrderService.updateById(maintenanceOrder);
 		}else if("2".equals(precisionInspectionStatus)){
 			preInspection.setEachTolerance(precisionInspection.getEachTolerance());
 			preInspection.setPartTolerance(precisionInspection.getPartTolerance());
 			preInspection.setEquipmentInspectorUser(userId);
-			precisionInspectionService.updateById(preInspection);
 
 			maintenanceOrder.setPrecisionInspectionStatus("3");
-			dailyMaintenanceOrderService.updateById(maintenanceOrder);
 		} else if("3".equals(precisionInspectionStatus)){
 			preInspection.setSparePart(precisionInspection.getSparePart());
 			preInspection.setProcessPass(precisionInspection.getProcessPass());
 			preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
 			preInspection.setUseUnitDirectorUser(userId);
-			precisionInspectionService.updateById(preInspection);
 
 			maintenanceOrder.setPrecisionInspectionStatus("4");
-			dailyMaintenanceOrderService.updateById(maintenanceOrder);
 		}else if("4".equals(precisionInspectionStatus)){
 			preInspection.setEquipmentInspectorSignUser(userId);
 			preInspection.setJudgmentResult(precisionInspection.getJudgmentResult());
-			precisionInspectionService.updateById(preInspection);
 
 			maintenanceOrder.setPrecisionInspectionStatus("5");
 			maintenanceOrder.setStatus("8");
-			dailyMaintenanceOrderService.updateById(maintenanceOrder);
 		}
 
+		preInspection.setRemark(precisionInspection.getRemark());
+		dailyMaintenanceOrderService.updateById(maintenanceOrder);
+		precisionInspectionService.updateById(preInspection);
 
 		return Result.OK("瀹℃壒鎴愬姛!");
 	}

--
Gitblit v1.9.3