From d10ee39ef95eb2442902e36dd36b1683cbd10af6 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 06 三月 2025 15:10:03 +0800
Subject: [PATCH] art: 项目性维修-详情页面-附件，设备状态，技术状态不展示问题修改, 设备选择过滤，只能选择用户范围内的设备信息
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.java | 14 +++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ProjectMaintenanceOrderDetail.java | 32 ----------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 22 ++++++++++
3 files changed, 32 insertions(+), 36 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 252c5aa..7d881d7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -36,7 +36,9 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
@@ -124,7 +126,8 @@
@Autowired
private IMaintenanceStandardService maintenanceStandardService;
-
+ @Autowired
+ private ISysUserService sysUserService;
/**
@@ -159,6 +162,10 @@
}
if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
+ }
+ List<String> userWorkCenterIds = getUserWorkCenterIds();
+ if(CollectionUtils.isNotEmpty(userWorkCenterIds)) {
+ queryWrapper.in("work_center_id",userWorkCenterIds);
}
if(StringUtils.isNotBlank(equipment.getWorkCenterId())){
queryWrapper.eq("work_center_id",equipment.getWorkCenterId());
@@ -1131,4 +1138,17 @@
return Result.OK(pageList);
}
+ private List<String> getUserWorkCenterIds(){
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+// strings = new ArrayList<>();
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ }
+ return workCenterIds;
+ }
+
}
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..29b331c 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;
@@ -233,9 +234,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);
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ProjectMaintenanceOrderDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ProjectMaintenanceOrderDetail.java
index 1d91184..e24ba1d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ProjectMaintenanceOrderDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ProjectMaintenanceOrderDetail.java
@@ -38,37 +38,27 @@
@ApiModelProperty(value = "椤圭洰鎬х淮淇崟id")
private String projectMaintenanceOrderId;
-
-
@Excel(name = "浠诲姟缂栫爜", width = 15)
@ApiModelProperty(value = "浠诲姟缂栫爜")
private String taskNum;
-
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
-
@Excel(name = "璁惧缂栫爜", width = 15)
@ApiModelProperty(value = "璁惧缂栫爜")
private String equipmentNum;
-
-
@Excel(name = "璧勪骇缂栫爜", width = 15)
@ApiModelProperty(value = "璧勪骇缂栫爜")
private String assetNumber;
-
-
/**鐗圭璁惧锛堟槸銆佸惁锛�*/
@Excel(name = "鐗圭璁惧锛堟槸銆佸惁锛�", width = 15)
@ApiModelProperty(value = "鐗圭璁惧锛堟槸銆佸惁锛�")
@Dict(dicCode = "specific_equipment")
private String specificEquipment;
-
-
/**璁惧鍚嶇О*/
@Excel(name = "璁惧鍚嶇О", width = 15)
@@ -88,14 +78,11 @@
@ApiModelProperty(value = "璁惧鐘舵��")
private String equipmentStatus;
-
/**鎶�鏈姸鎬�*/
@Excel(name = "鎶�鏈姸鎬�", width = 15, dicCode = "technology_status")
@ApiModelProperty(value = "鎶�鏈姸鎬�")
@Dict(dicCode = "technology_status")
private String technologyStatus;
-
-
/**濮斿鍗曚綅ID*/
@Excel(name = "濮斿鍗曚綅ID", width = 15)
@@ -103,15 +90,11 @@
@Dict(dictTable = "mom_base_supplier",dicCode = "id",dicText = "name")
private String supplierId;
-
/**缁翠繚鏂瑰紡*/
@Excel(name = "缁翠繚鏂瑰紡", width = 15)
@ApiModelProperty(value = "缁翠繚鏂瑰紡")
@Dict(dicCode = "maintenance_method")
private String maintenanceMode;
-
-
-
/**椤圭洰鍐呭*/
@Excel(name = "椤圭洰鍐呭", width = 15)
@@ -124,9 +107,6 @@
@Dict(dicCode = "urgency")
private String urgency;
-
-
-
/**
* 璐ｄ换鐝粍ID
*
@@ -135,8 +115,6 @@
@Dict(dictTable = "mom_base_team",dicCode = "id",dicText = "name")
@ApiModelProperty(value = "璐ｄ换鐝粍ID")
private String teamId;
-
-
/**
* 璐ｄ换浜篒D
*
@@ -146,14 +124,6 @@
@Dict(dictTable = "sys_user",dicCode = "id",dicText = "realname")
private String userId;
-
-
-
-
-
-
-
-
/**
* 璁″垝寮�濮嬫椂闂�
*/
@@ -162,8 +132,6 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private java.util.Date planStartTime;
-
-
/**
* 璁″垝缁撴潫鏃堕棿
--
Gitblit v1.9.3