From f71cea3609c4c7bf0b70c77b2c9d8c571586df33 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 02 九月 2025 14:24:26 +0800
Subject: [PATCH] 二保定时任务修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java
index 2405991..43932ee 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java
@@ -21,12 +21,14 @@
import org.jeecg.modules.eam.request.EamSecondMaintenanceRequest;
import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
import org.jeecg.modules.eam.service.IEamSecondMaintenanceOrderService;
+import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -67,6 +69,24 @@
Page<EamSecondMaintenanceOrder> page = new Page<EamSecondMaintenanceOrder>(pageNo, pageSize);
IPage<EamSecondMaintenanceOrder> pageList = eamSecondMaintenanceOrderService.queryPageList(page, query);
return Result.OK(pageList);
+ }
+
+ /**
+ * 浜屼繚鎵归噺鏍戠粨鏋�
+ *
+ */
+ @ApiOperation(value = "璁惧浜岀骇淇濆吇-浜屼繚鎵归噺鏍戠粨鏋�", notes = "璁惧浜岀骇淇濆吇-浜屼繚鎵归噺鏍戠粨鏋�")
+ @GetMapping(value = "/BatchTreeStructure")
+ public Result<List<EamEquipmentTree>> BatchTreeStructure() {
+ Result<List<EamEquipmentTree>> result = new Result<>();
+ try {
+ List<EamEquipmentTree> mdcEquipmentTreeList =eamSecondMaintenanceOrderService.getTree();
+ result.setSuccess(true);
+ result.setResult(mdcEquipmentTreeList);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
}
/**
@@ -229,6 +249,18 @@
return Result.error("缂栬緫澶辫触锛�");
}
return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鎵撳嵃浜屼繚宸ュ崟
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "璁惧浜岀骇淇濆吇-鎵归噺鎵撳嵃浜屼繚宸ュ崟")
+ @ApiOperation(value = "璁惧浜岀骇淇濆吇-鎵归噺鎵撳嵃浜屼繚宸ュ崟", notes = "璁惧浜岀骇淇濆吇-鎵归噺鎵撳嵃浜屼繚宸ュ崟")
+ @GetMapping(value = "/batchExport")
+ public Result<?> export(String ids){
+ return Result.ok(eamSecondMaintenanceOrderService.export(ids));
}
/**
@@ -483,7 +515,7 @@
*/
@ApiOperation(value = "浜屼繚宸ュ崟-鎵ц鎿嶄綔", notes = "浜屼繚宸ュ崟-鎵ц鎿嶄綔")
@PutMapping(value = "/approval")
- public Result<?> approval(@RequestBody EamSecondMaintenanceRequest request) {
+ public Result<?> approval(@RequestBody EamSecondMaintenanceRequest request) throws ParseException {
if (request == null) {
return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
}
--
Gitblit v1.9.3