From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 b6375ac..538437a 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
@@ -50,6 +50,9 @@
@Autowired
private IEamEquipmentService equipmentService;
+
+ @Autowired
+ private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -188,6 +191,14 @@
String precisionParametersId = precisionInspectionDetail.getPrecisionParametersId();
PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
precisionInspectionDetail.setPrecisionParametersName(precisionParameters.getName());
+
+ List<PrecisionParametersTemplateDetail> list = precisionParametersTemplateDetailService.lambdaQuery()
+ .eq(PrecisionParametersTemplateDetail::getPrecisionParametersId, precisionParametersId)
+ .eq(PrecisionParametersTemplateDetail::getDelFlag, "0").list();
+ if(list.size()>0){
+ precisionInspectionDetail.setTolerance(list.get(0).getTolerance());
+ }
+
}
map.put("precisionInspectionDetails",precisionInspectionDetails);
@@ -223,7 +234,9 @@
preInspection.setRepairDirectorUser(userId);
maintenanceOrder.setPrecisionInspectionStatus("2");
- }else if("2".equals(precisionInspectionStatus)){
+ }
+
+ if("2".equals(precisionInspectionStatus)){
preInspection.setEachTolerance(precisionInspection.getEachTolerance());
preInspection.setPartTolerance(precisionInspection.getPartTolerance());
preInspection.setEquipmentInspectorUser(userId);
@@ -233,7 +246,9 @@
preInspection.setSparePart(precisionInspection.getSparePart());
preInspection.setProcessPass(precisionInspection.getProcessPass());
preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
+ preInspection.setSparePart(precisionInspection.getSparePart());
preInspection.setUseUnitDirectorUser(userId);
+ preInspection.setMeetProcessRequireRemark(precisionInspection.getMeetProcessRequireRemark());
maintenanceOrder.setPrecisionInspectionStatus("4");
}else if("4".equals(precisionInspectionStatus)){
--
Gitblit v1.9.3