From 85be244f6171d51f8aa8e38142925f623636cc0f Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 17 七月 2025 16:18:00 +0800 Subject: [PATCH] 点检自助维护表打印导出 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 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 ebddfb4..487d9fc 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); @@ -267,6 +285,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 +336,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); @@ -385,6 +419,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); -- Gitblit v1.9.3