From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java
index 8c445e1..ab2d9f9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java
@@ -9,13 +9,17 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.aspect.annotation.PermissionData;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.base.entity.SysUpload;
import org.jeecg.common.system.base.entity.SysUploadRela;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrderDetail;
+import org.jeecg.modules.eam.entity.InspectionOrder;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderDetailService;
+import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -40,6 +44,8 @@
@Autowired
private IDailyMaintenanceOrderDetailService dailyMaintenanceOrderDetailService;
+ @Autowired
+ private IDailyMaintenanceOrderService dailyMaintenanceOrderService;
@Autowired
private ISysBaseAPI sysBaseApi;
@@ -95,7 +101,10 @@
//@RequiresPermissions("org.jeecg.modules:mom_eam_daily_maintenance_order_detail:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail) {
- dailyMaintenanceOrderDetailService.updateById(dailyMaintenanceOrderDetail);
+ List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrderDetail.getDailyMaintenanceOrderDetails();
+ for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
+ dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
+ }
return Result.OK("缂栬緫鎴愬姛!");
}
@@ -172,13 +181,21 @@
}
/**
- * 鑾峰彇鏃ュ父鐐规宸ュ崟鏄庣粏
+ * 浜屼繚宸ュ崟鏄庣粏
* 2023-4-25 qsw
*/
@GetMapping(value = "/getDailyMaintenanceOrderDetailList")
+ @PermissionData
public Result<?> getDailyMaintenanceOrderDetailList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
IPage<Map<String, Object>> dailyMaintenanceOrderDetailList = dailyMaintenanceOrderDetailService.getDailyMaintenanceOrderDetailList(pageNo, pageSize, params);
-// for (Map<String, Object> record : dailyMaintenanceOrderDetailList.getRecords()) {
+ for (Map<String, Object> record : dailyMaintenanceOrderDetailList.getRecords()) {
+ String dailyMaintenanceOrderId = (String)record.get("dailyMaintenanceOrderId");
+ DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(dailyMaintenanceOrderId);
+ if("4".equals(dailyMaintenanceOrder.getStatus())){
+ record.put("disabled",false);
+ }else{
+ record.put("disabled",true);
+ }
// //鑾峰彇鏄惁鏈夌ず渚嬪浘鐗�
//// List<SysUploadRela> sketchUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) record.get("maintenanceStandardDetailId")).eq(SysUploadRela::getDelFlag, 0).list();
// List<SysUploadRela> sketchUploadRelas = sysBaseApi.listByBusIdAndBusType((String) record.get("maintenanceStandardDetailId"), null);
@@ -195,8 +212,29 @@
// SysUpload upload = new SysUpload();
// record.put("sketchPhoto", upload);
// }
-// }
+ }
return Result.ok(dailyMaintenanceOrderDetailList);
}
+ /**
+ * 涓変繚宸ュ崟鏄庣粏
+ * 2023-4-25 qsw
+ */
+ @GetMapping(value = "/get3MaintenanceOrderDetailList")
+ @PermissionData
+ public Result<?> get3MaintenanceOrderDetailList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> dailyMaintenanceOrderDetailList = dailyMaintenanceOrderDetailService.get3MaintenanceOrderDetailList(pageNo, pageSize, params);
+ for (Map<String, Object> record : dailyMaintenanceOrderDetailList.getRecords()) {
+ String dailyMaintenanceOrderId = (String)record.get("dailyMaintenanceOrderId");
+ DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(dailyMaintenanceOrderId);
+ if("4".equals(dailyMaintenanceOrder.getStatus())){
+ record.put("disabled",false);
+ }else{
+ record.put("disabled",true);
+ }
+ }
+ return Result.ok(dailyMaintenanceOrderDetailList);
+ }
+
+
}
--
Gitblit v1.9.3