From 3adcc0326206cae45bd05d56145eff24b61028fc Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期六, 07 六月 2025 10:34:11 +0800 Subject: [PATCH] art: 设备管理-维修、保养流程 简述信息修改,报修、维修列表查询接口修改,维修状态字典修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 80 +++++++++++++++++++++++++++++----------- 1 files changed, 58 insertions(+), 22 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java index a5e9b1f..9e4dad8 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.core.JsonProcessingException; @@ -14,8 +15,10 @@ import org.jeecg.common.api.vo.FileUploadResult; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.constant.DataBaseConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog; import org.jeecg.modules.eam.constant.*; import org.jeecg.modules.eam.entity.EamEquipment; @@ -86,22 +89,68 @@ * 鍒嗛〉鍒楄〃 * * @param page - * @param eamRepairOrderQuery + * @param query * @return */ @Override - public IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, EamRepairOrderQuery eamRepairOrderQuery) { + public IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, EamRepairOrderQuery query) { + QueryWrapper<EamRepairOrder> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0); //鐢ㄦ埛鏁版嵁鏉冮檺 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (sysUser == null) { return page; } - List<String> equipmentIds = new ArrayList<>(); if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) { //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧 - equipmentIds = Arrays.asList(sysUser.getEquipmentIds().split(",")); + List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(",")); + queryWrapper.in("e.equipment_code", equipArr); + } else { + //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶� + queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId()); } - return this.baseMapper.pageList(page, eamRepairOrderQuery, sysUser.getId(), equipmentIds); + //鏌ヨ鏉′欢杩囨护 + if (query != null) { + if (StringUtils.isNotBlank(query.getEquipmentId())) { + queryWrapper.eq("wmo.equipment_id", query.getEquipmentId()); + } + if (StringUtils.isNotBlank(query.getEquipmentCode())) { + queryWrapper.like("e.equipment_code", query.getEquipmentCode()); + } + if (StringUtils.isNotBlank(query.getEquipmentName())) { + queryWrapper.like("e.equipment_name", query.getEquipmentName()); + } + if (StringUtils.isNotBlank(query.getRepairStatus())) { + queryWrapper.eq("wmo.repair_status", query.getRepairStatus()); + } + if (StringUtils.isNotBlank(query.getRepairer())) { + queryWrapper.like("wmo.repairer", query.getRepairer()); + } + if (StringUtils.isNotBlank(query.getRepairCode())) { + queryWrapper.like("wmo.repair_code", query.getRepairCode()); + } +// if(query.getStartTime() != null && query.getEndTime() != null) { +// queryWrapper.between("wmo.fault_start_time", query.getStartTime(), query.getEndTime()); +// } + //鎺掑簭 + if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) { + String column = query.getColumn(); + if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) { + column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX)); + } + if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) { + queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column)); + } else { + queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column)); + } + } else { + queryWrapper.orderByDesc("wmo.create_time"); + } + } else { + queryWrapper.orderByDesc("wmo.create_time"); + } + + return baseMapper.queryPageList(page, queryWrapper); } @Override @@ -114,13 +163,12 @@ eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId()); eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name()); eamRepairOrder.setActualStartTime(DateUtils.getNow()); - eamRepairOrder.setIsUseSpare(0); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); eamRepairOrder.setRepairer(user.getUsername()); super.save(eamRepairOrder); EamEquipment eamEquipment = eamEquipmentService.getById(eamReportRepair.getEquipmentId()); // 鍚姩缁翠慨娴佺▼ - flowCommonService.initActBusiness("缁翠慨宸ュ崟鍙凤細" + codeSeq + ", 璁惧缂栧彿锛�" + eamEquipment.getEquipmentCode() + "寮�濮嬬淮淇�", + flowCommonService.initActBusiness("宸ュ崟鍙凤細" + codeSeq + ", 璁惧缂栧彿锛�" + eamEquipment.getEquipmentCode() + ";瀹夎浣嶇疆: " + eamEquipment.getInstallationPosition(), eamRepairOrder.getId(), "IEamRepairOrderService", "eam_repair", @@ -159,12 +207,11 @@ eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId()); eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name()); eamRepairOrder.setActualStartTime(DateUtils.getNow()); - eamRepairOrder.setIsUseSpare(0); eamRepairOrder.setRepairer(eamReportRepairQuery.getRepairer()); super.save(eamRepairOrder); EamEquipment eamEquipment = eamEquipmentService.getById(eamReportRepair.getEquipmentId()); // 鍚姩缁翠慨娴佺▼ - flowCommonService.initActBusiness("缁翠慨宸ュ崟鍙凤細" + codeSeq + ", 璁惧缂栧彿锛�" + eamEquipment.getEquipmentCode() + "寮�濮嬬淮淇�", + flowCommonService.initActBusiness("宸ュ崟鍙凤細" + codeSeq + ", 璁惧缂栧彿锛�" + eamEquipment.getEquipmentCode() + ";瀹夎浣嶇疆: " + eamEquipment.getInstallationPosition(), eamRepairOrder.getId(), "IEamRepairOrderService", "eam_repair", @@ -241,17 +288,7 @@ if (StringUtils.isBlank(equipment.getEquipmentManager())) { throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒"); } - if (StringUtils.isBlank(eamRepairOrder.getSparePartDescription())) { - values.put("dataId", eamRepairOrder.getId()); - values.put("organization", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�"); - values.put("comment", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�"); - values.put("NextAssignee", Arrays.asList(equipment.getEquipmentManager().split(","))); - values.put("status", 1); - request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�"); -// eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name()); -// eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_SPARES.name()); - eamRepairOrder.setIsUseSpare(1); - } else { + values.put("dataId", eamRepairOrder.getId()); values.put("organization", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�"); values.put("comment", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�"); @@ -274,7 +311,7 @@ } //鏇存柊璁惧缁翠慨鐘舵�� eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.WAIT_CONFIRM.name()); - } + } else { // 涓嶉渶瑕� values.put("dataId", eamRepairOrder.getId()); @@ -287,7 +324,6 @@ eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_CONFIRM.name()); eamRepairOrder.setFaultReason(request.getFaultReason()); eamRepairOrder.setRepairDescription(request.getRepairDescription()); - eamRepairOrder.setIsUseSpare(0); // 澶勭悊闄勪欢 if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) { List<FileUploadResult> fileUploadResultList = request.getImageFilesResult(); -- Gitblit v1.9.3