From c478333af1883ebb7ba359dc0a1756c2ed2b0927 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 七月 2025 17:23:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 122 ++++++++++++++++++++++++++++++----------
1 files changed, 91 insertions(+), 31 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index e90a510..bd393ff 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -19,6 +19,7 @@
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.StrUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
@@ -47,6 +48,7 @@
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -172,6 +174,14 @@
*/
@Override
public JSONObject exportInspectionOrderBaseInfo(String equipmentCode, String inspectionDate) {
+ if (StrUtils.isEmpty(inspectionDate)) {
+ // 鑾峰彇褰撳墠鏃ユ湡
+ LocalDate currentDate = LocalDate.now();
+ // 瀹氫箟鏃ユ湡鏍煎紡
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+ // 鏍煎紡鍖栧綋鍓嶆湀浠�
+ inspectionDate = currentDate.format(formatter);
+ }
// 鍒涘缓缁撴灉瀵硅薄
JSONObject result = new JSONObject();
EamInspectionOrderBaseResponse eamInspectionOrderBaseResponse = eamInspectionOrderMapper.findInsOrderBaseInfo(equipmentCode, inspectionDate);
@@ -191,6 +201,14 @@
*/
@Override
public JSONObject exportInspectionOrderDetailList(String equipmentCode, String inspectionDate) {
+ if (StrUtils.isEmpty(inspectionDate)) {
+ // 鑾峰彇褰撳墠鏃ユ湡
+ LocalDate currentDate = LocalDate.now();
+ // 瀹氫箟鏃ユ湡鏍煎紡
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+ // 鏍煎紡鍖栧綋鍓嶆湀浠�
+ inspectionDate = currentDate.format(formatter);
+ }
// 鍒涘缓缁撴灉瀵硅薄
JSONObject result = new JSONObject();
List<EamInsOrderDetailResultResponse> eamInsOrderDetailResultResponseList = eamInspectionOrderMapper.findInsOrderDetailList(equipmentCode, inspectionDate);
@@ -234,19 +252,21 @@
for (int i = 1; i <= 31; i++) {
if (collect.containsKey(i)) {
String inspectionResult = "";
- switch (collect.get(i).getInspectionResult()) {
- case "NORMAL":
- inspectionResult = "鈭�";
- break;
- case "ANOMALY":
- inspectionResult = "脳";
- break;
- case "FAULT":
- inspectionResult = "鈻�";
- break;
- case "CLOSE":
- inspectionResult = "T";
- break;
+ if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) {
+ switch (collect.get(i).getInspectionResult()) {
+ case "NORMAL":
+ inspectionResult = "鈭�";
+ break;
+ case "ANOMALY":
+ inspectionResult = "脳";
+ break;
+ case "FAULT":
+ inspectionResult = "鈻�";
+ break;
+ case "CLOSE":
+ inspectionResult = "T";
+ break;
+ }
}
resultMap.put("inspectionResult" + i, inspectionResult);
} else {
@@ -267,6 +287,14 @@
*/
@Override
public JSONObject exportInspectionOrderDetailUserList(String equipmentCode, String inspectionDate) {
+ if (StrUtils.isEmpty(inspectionDate)) {
+ // 鑾峰彇褰撳墠鏃ユ湡
+ LocalDate currentDate = LocalDate.now();
+ // 瀹氫箟鏃ユ湡鏍煎紡
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+ // 鏍煎紡鍖栧綋鍓嶆湀浠�
+ inspectionDate = currentDate.format(formatter);
+ }
// 鍒涘缓缁撴灉瀵硅薄
JSONObject result = new JSONObject();
List<EamInsOrderDetailUserResponse> eamInsOrderDetailUserResponseList = eamInspectionOrderMapper.findInspectionOrderDetailUserList(equipmentCode, inspectionDate);
@@ -310,6 +338,14 @@
*/
@Override
public JSONObject exportWeekInsDetailList(String equipmentCode, String inspectionDate) {
+ if (StrUtils.isEmpty(inspectionDate)) {
+ // 鑾峰彇褰撳墠鏃ユ湡
+ LocalDate currentDate = LocalDate.now();
+ // 瀹氫箟鏃ユ湡鏍煎紡
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+ // 鏍煎紡鍖栧綋鍓嶆湀浠�
+ inspectionDate = currentDate.format(formatter);
+ }
// 鍒涘缓缁撴灉瀵硅薄
JSONObject result = new JSONObject();
List<EamWeekInsDetailResultResponse> eamWeekInsDetailResultResponseList = eamInspectionOrderMapper.findWeekInsDetailList(equipmentCode, inspectionDate);
@@ -352,19 +388,21 @@
for (int i = 1; i <= 5; i++) {
if (collect.containsKey(i)) {
String inspectionResult = "";
- switch (collect.get(i).getInspectionResult()) {
- case "NORMAL":
- inspectionResult = "鈭�";
- break;
- case "ANOMALY":
- inspectionResult = "脳";
- break;
- case "FAULT":
- inspectionResult = "鈻�";
- break;
- case "CLOSE":
- inspectionResult = "T";
- break;
+ if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) {
+ switch (collect.get(i).getInspectionResult()) {
+ case "NORMAL":
+ inspectionResult = "鈭�";
+ break;
+ case "ANOMALY":
+ inspectionResult = "脳";
+ break;
+ case "FAULT":
+ inspectionResult = "鈻�";
+ break;
+ case "CLOSE":
+ inspectionResult = "T";
+ break;
+ }
}
resultMap.put("inspectionResult" + i, inspectionResult);
} else {
@@ -385,6 +423,14 @@
*/
@Override
public JSONObject exportWeekInsOrderDetailUserList(String equipmentCode, String inspectionDate) {
+ if (StrUtils.isEmpty(inspectionDate)) {
+ // 鑾峰彇褰撳墠鏃ユ湡
+ LocalDate currentDate = LocalDate.now();
+ // 瀹氫箟鏃ユ湡鏍煎紡
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+ // 鏍煎紡鍖栧綋鍓嶆湀浠�
+ inspectionDate = currentDate.format(formatter);
+ }
// 鍒涘缓缁撴灉瀵硅薄
JSONObject result = new JSONObject();
List<EamWeekInsDetailUserResponse> eamWeekInsDetailUserResponseList = eamInspectionOrderMapper.findWeekInsOrderDetailUserList(equipmentCode, inspectionDate);
@@ -487,7 +533,7 @@
} else {
eamInspectionOrder.setEquipmentId(equipment.getId());
}
- flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + (equipment.getInstallationPosition() == null ? "" : ";瀹夎浣嶇疆: " + equipment.getInstallationPosition()),
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode(),
eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", eamInspectionOrder.getId());
@@ -611,6 +657,19 @@
throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
}
+ // 妫�鏌ュ懆淇濊繃鏈熸椂闂�
+ if (eamInspectionOrderRequest.getTableWeekDetailList() == null || eamInspectionOrderRequest.getTableWeekDetailList().isEmpty()) {
+ List<EamWeekInspectionDetail> weekInspectionDetailList = eamWeekInspectionDetailService.list(new LambdaQueryWrapper<EamWeekInspectionDetail>().eq(EamWeekInspectionDetail::getStandardId, eamInspectionOrderRequest.getStandardId()).between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(eamInspectionOrderRequest.getInspectionDate()), DateUtils.getLastDayOfWeek(eamInspectionOrderRequest.getInspectionDate())));
+ if (weekInspectionDetailList != null && !weekInspectionDetailList.isEmpty()) {
+ if (StrUtil.isEmpty(eamInspectionOrderRequest.getOperator())) {
+ Date lastDate = DateUtils.getLastDayOfWeek(eamInspectionOrderRequest.getInspectionDate());
+ if (DateUtils.isSameDay(lastDate, new Date())) {
+ throw new JeecgBootException("鏈懆鐐规鏈畬鎴愶紝璇疯繘琛屽～鎶ワ紒");
+ }
+ }
+ }
+ }
+
// 璁剧疆娴佺▼鍙橀噺
setupProcessVariables(eamInspectionOrderRequest, eamInspectionOrder, user, equipment);
@@ -624,9 +683,9 @@
updateEamInspectionOrder(eamInspectionOrder);
//鏌ヨ鏁版嵁,杩涜璁惧缁翠慨澶勭悊
- if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())) {
- updateEamInspectionOrderDetail(eamInspectionOrder);
- }
+// if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())) {
+// updateEamInspectionOrderDetail(eamInspectionOrder);
+// }
return eamInspectionOrder;
} catch (Exception e) {
@@ -695,13 +754,14 @@
values.put("organization", request.getConfirmComment());
values.put("comment", request.getConfirmComment());
values.put("confirmation", request.getConfirmDealType());
- request.setComment(request.getConfirmComment());
+ request.setComment("缁翠慨宸ョ‘璁ょ粨鏉�");
if ("2".equals(request.getConfirmDealType())) {
// 缁翠慨宸ラ┏鍥�
List<String> usernames = new ArrayList<>();
usernames.add(order.getOperator());
order.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
values.put("NextAssignee", usernames);
+ request.setComment("缁翠慨宸ラ┏鍥炵粨鏉�");
}
}
request.setValues(values);
--
Gitblit v1.9.3