lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
@@ -267,5 +267,16 @@ return Result.ok("所有文件导入成功:" + response); } /** * 查询已存在可用的技术状态鉴定规范的设备 * @return */ @ApiOperation(value = "技术状态鉴定规范-查询已存在可用的技术状态鉴定规范的设备", notes = "技术状态鉴定规范-查询已存在可用的技术状态鉴定规范的设备") @GetMapping(value = "/selectEnableEquipment") public Result<?> selectEnableEquipment(@RequestParam(name = "keyword", required = false) String keyword, @RequestParam(name = "equipmentId", required = false) String equipmentId, @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize) { List<EamTechnicalStatusEvaluationStandard> list = eamTechnicalStatusEvaluationStandardService.queryListByKeyword(keyword, equipmentId, pageSize); return Result.OK(list); } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
@@ -86,4 +86,6 @@ private String equipmentName; @TableField(exist = false) private String equipmentModel; @TableField(exist = false) private String keyword; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java
@@ -8,6 +8,8 @@ import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest; import org.springframework.web.multipart.MultipartFile; import java.util.List; /** * @Description: 技术状态鉴定规范 * @Author: jeecg-boot @@ -73,4 +75,13 @@ * @return */ Result<?> importOtherCheck(MultipartFile file); /** * 查询已存在可用的技术状态鉴定规范的设备 * @param keyword * @param equipmentId * @param pageSize * @return */ List<EamTechnicalStatusEvaluationStandard> queryListByKeyword(String keyword, String equipmentId, Integer pageSize); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
@@ -105,9 +105,16 @@ queryWrapper.eq("ems.equipment_id", query.getEquipmentId()); } //保养分类 //规范状态 if (StringUtils.isNotBlank(query.getStandardStatus())) { queryWrapper.eq("ems.standard_status", query.getStandardStatus()); } //设备编码 if (StringUtils.isNotBlank(query.getKeyword())) { queryWrapper.and(wrapper -> wrapper.like("e.equipment_name", query.getKeyword()) .or() .like("e.equipment_code", query.getKeyword())); } } queryWrapper.orderByDesc("ems.create_time"); @@ -540,6 +547,17 @@ return Result.OK(fileName + ":导入成功!"); } @Override public List<EamTechnicalStatusEvaluationStandard> queryListByKeyword(String keyword, String equipmentId, Integer pageSize) { Page<EamTechnicalStatusEvaluationStandard> page = new Page<>(1, pageSize); EamTechnicalStatusEvaluationStandard query = new EamTechnicalStatusEvaluationStandard(); query.setEquipmentId(equipmentId); query.setKeyword(keyword); query.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name()); IPage<EamTechnicalStatusEvaluationStandard> pageData = this.queryPageList(page, query); return pageData.getRecords(); } /** * 检查导入文件分类是否匹配 * @param title 标题段落字符串