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; } } 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 = "项目性维修明细主表ID查询", notes = "项目性维修明细-通主表ID查询") @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); } /** 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; /** * 责任人ID * @@ -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; /** * 计划结束时间
