From f2e8dc200f4ec9c1021e908f65e6e1e458c2ef70 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期三, 25 十月 2023 13:19:39 +0800
Subject: [PATCH] 鉴定工单调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 94 +++++++++++++++++++++++++----------------------
1 files changed, 50 insertions(+), 44 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 5b9e3e7..adc8d65 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
@@ -452,44 +452,44 @@
QueryWrapper<CalibrationOrder> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrder, req.getParameterMap());
Page<CalibrationOrder> page = new Page<CalibrationOrder>(pageNo, pageSize);
IPage<CalibrationOrder> pageList = calibrationOrderService.page(page, queryWrapper);
- for (CalibrationOrder record : pageList.getRecords()) {
- String id = record.getId();
- String status = record.getStatus();
- String managementMode = record.getManagementMode();
- String equipmentId = record.getEquipmentId();
- Equipment equipment = equipmentService.getById(equipmentId);
- if(equipment != null){
- record.setEquipmentNum(equipment.getNum());
- record.setEquipmentName(equipment.getName());
- 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("姝ｅ父");
- }
- }
- }
- }
+// for (CalibrationOrder record : pageList.getRecords()) {
+// String id = record.getId();
+// String status = record.getStatus();
+// String managementMode = record.getManagementMode();
+// String equipmentId = record.getEquipmentId();
+// Equipment equipment = equipmentService.getById(equipmentId);
+// if(equipment != null){
+// record.setEquipmentNum(equipment.getNum());
+// record.setEquipmentName(equipment.getName());
+// 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("姝ｅ父");
+// }
+// }
+// }
+// }
return Result.OK(pageList);
}
/**
@@ -612,19 +612,25 @@
@RequestMapping(value = "/saveFinal", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> saveFinal(@RequestBody CalibrationOrder calibrationOrder) {
calibrationOrder.setCalibrationTime(new Date());
+ calibrationOrder.setStatus("5");
if(StringUtils.isNotBlank(calibrationOrder.getEquipmentId())){
String equipmentId = calibrationOrder.getEquipmentId();
Equipment equipment = equipmentService.getById(equipmentId);
if(ObjectUtils.isNotNull(equipment)){
LocalDate currentDate = LocalDate.now();
+ // 娣诲姞缁存姢鍛ㄦ湡鐨勬棩鏈�
+ String checkPeriod = equipment.getCheckPeriod();
+ if(StringUtils.isNotBlank(checkPeriod)){
+ LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(checkPeriod));
+ Date result = Date.from(dateAfter30Days.atStartOfDay(ZoneId.systemDefault()).toInstant());
+ equipment.setTechnologyStatus(calibrationOrder.getCalibrationOrderUda6());
+ equipment.setTechnologyStatusQualificationTime(new Date());
+ equipment.setNextTechnologyStatusQualificationTime(result);
+ }else {
+ return Result.error("璇ヨ澶囧皻鏈淮鎶ゆ瀹氬懆鏈燂紝璇峰厛缁存姢妫�瀹氬懆鏈�");
+ }
- // 娣诲姞30澶�
- LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(equipment.getCheckPeriod()));
// 杞崲涓簀ava.util.Date
- Date result = Date.from(dateAfter30Days.atStartOfDay(ZoneId.systemDefault()).toInstant());
- equipment.setTechnologyStatus(calibrationOrder.getCalibrationOrderUda6());
- equipment.setTechnologyStatusQualificationTime(new Date());
- equipment.setNextTechnologyStatusQualificationTime(result);
equipmentService.updateById(equipment);
}
--
Gitblit v1.9.3