From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 16:12:55 +0800
Subject: [PATCH] 点检报表后端
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.java
index 066c353..0179781 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,6 +22,7 @@
import org.jeecg.modules.eam.model.UserVo;
import org.jeecg.modules.eam.service.IProjectMaintenanceOrderDetailService;
import org.jeecg.modules.eam.service.IProjectMaintenanceOrderService;
+import org.jeecg.modules.eam.service.IdentityService;
import org.jeecg.modules.eam.vo.EquipmentDisposalPage;
import org.jeecg.modules.eam.vo.EquipmentSealPage;
import org.jeecg.modules.eam.vo.ProjectMaintenanceOrderPage;
@@ -31,6 +33,7 @@
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -66,6 +69,10 @@
// @Autowired
// private IFlowMyBusinessService flowMyBusinessService;
/*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
+
+ @Autowired
+ @Lazy
+ private IdentityService sysIdentityService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -107,6 +114,9 @@
public Result<String> add(@RequestBody ProjectMaintenanceOrderPage projectMaintenanceOrderPage) {
ProjectMaintenanceOrder projectMaintenanceOrder = new ProjectMaintenanceOrder();
BeanUtils.copyProperties(projectMaintenanceOrderPage, projectMaintenanceOrder);
+ //璁″垝缂栧彿鑷姩鐢熸垚
+ String num = sysIdentityService.getNumByTypeAndLength("ProjectMaintenanceOrder", 4);
+ projectMaintenanceOrder.setNum(num);
projectMaintenanceOrderService.saveMain(projectMaintenanceOrder, projectMaintenanceOrderPage.getProjectMaintenanceOrderDetailList());
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -233,9 +243,16 @@
*/
@ApiOperation(value = "椤圭洰鎬х淮淇槑缁嗕富琛↖D鏌ヨ", notes = "椤圭洰鎬х淮淇槑缁�-閫氫富琛↖D鏌ヨ")
@GetMapping(value = "/queryProjectMaintenanceOrderDetailByMainId")
- public Result<List<ProjectMaintenanceOrderDetail>> queryProjectMaintenanceOrderDetailByMainId(@RequestParam(name = "id", required = true) String id) {
- List<ProjectMaintenanceOrderDetail> projectMaintenanceOrderDetailList = projectMaintenanceOrderDetailService.selectByMainId(id);
- return Result.OK(projectMaintenanceOrderDetailList);
+ public Result<?> queryProjectMaintenanceOrderDetailByMainId(@RequestParam(name = "id", required = true) String id) {
+// List<ProjectMaintenanceOrderDetail> projectMaintenanceOrderDetailList = projectMaintenanceOrderDetailService.selectByMainId(id);
+ //瀛楀吀杞崲
+ LambdaQueryWrapper<ProjectMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProjectMaintenanceOrderDetail::getProjectMaintenanceOrderId, id);
+ queryWrapper.orderByDesc(ProjectMaintenanceOrderDetail::getId);
+ //鍒嗛〉 榛樿涓�娆″ぇ淇垨椤逛慨涓嶄細瓒呰繃100鍙拌澶�
+ Page<ProjectMaintenanceOrderDetail> page = new Page<ProjectMaintenanceOrderDetail>(1, 100);
+ Page<ProjectMaintenanceOrderDetail> page1 = projectMaintenanceOrderDetailService.page(page, queryWrapper);
+ return Result.OK(page1);
}
/**
--
Gitblit v1.9.3