From 4337640b7ab86136baed2fd6aa959e4828a75cea Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 十二月 2023 17:33:51 +0800
Subject: [PATCH] 计算加工工件个数算法和密码安全策略
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 8fa42c6..67eaa4a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -464,31 +464,31 @@
record.setEquipmentModel(equipment.getModel());
record.setEquipmentSpecification(equipment.getSpecification());
}
- List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
- record.setPrecisionParameterList(precisionParameterList);
- if("4".equals(status)){
- if("data".equals(managementMode)){
- List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
- .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
- .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
- .eq(CalibrationOrderDetail::getDelFlag,"0").list();
- if(calibrationOrderDetails.size()>0){
- record.setCalibrationResult("寮傚父");
- }else{
- record.setCalibrationResult("姝ｅ父");
- }
- }else{
- List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
- .eq(CalibrationOrderReport::getCalibrationOrderId, id)
- .eq(CalibrationOrderReport::getJudgmentResult, "fail")
- .eq(CalibrationOrderReport::getDelFlag, "0").list();
- if(calibrationOrderReports.size()>0){
- record.setCalibrationResult("寮傚父");
- }else{
- record.setCalibrationResult("姝ｅ父");
- }
- }
- }
+// List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
+// record.setPrecisionParameterList(precisionParameterList);
+// if("4".equals(status)){
+// if("data".equals(managementMode)){
+// List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
+// .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
+// .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
+// .eq(CalibrationOrderDetail::getDelFlag,"0").list();
+// if(calibrationOrderDetails.size()>0){
+// record.setCalibrationResult("寮傚父");
+// }else{
+// record.setCalibrationResult("姝ｅ父");
+// }
+// }else{
+// List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
+// .eq(CalibrationOrderReport::getCalibrationOrderId, id)
+// .eq(CalibrationOrderReport::getJudgmentResult, "fail")
+// .eq(CalibrationOrderReport::getDelFlag, "0").list();
+// if(calibrationOrderReports.size()>0){
+// record.setCalibrationResult("寮傚父");
+// }else{
+// record.setCalibrationResult("姝ｅ父");
+// }
+// }
+// }
}
return Result.OK(pageList);
}
@@ -618,8 +618,7 @@
Equipment equipment = equipmentService.getById(equipmentId);
if(ObjectUtils.isNotNull(equipment)){
LocalDate currentDate = LocalDate.now();
-
- // 娣诲姞30澶�
+ // 娣诲姞缁存姢鍛ㄦ湡鐨勬棩鏈�
String checkPeriod = equipment.getCheckPeriod();
if(StringUtils.isNotBlank(checkPeriod)){
LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(checkPeriod));
--
Gitblit v1.9.3