From d85cb9da90d1dd24f6ecfa187aa8c4198394c29a Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期三, 26 二月 2025 15:41:05 +0800
Subject: [PATCH] 开发维修工单
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
index 55d1561..edff66a 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
@@ -1,7 +1,11 @@
package org.dromara.eims.service.impl;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.dromara.common.core.service.RepairReqService;
import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
@@ -11,6 +15,7 @@
import lombok.RequiredArgsConstructor;
import org.dromara.eims.domain.EimsEqu;
import org.dromara.eims.domain.EimsFixtureBorrow;
+import org.dromara.eims.domain.vo.EimsFixtureVo;
import org.dromara.eims.domain.vo.EimsInventoryDetailVo;
import org.dromara.eims.utils.DataFilterUtil;
import org.dromara.system.domain.SysDept;
@@ -36,7 +41,7 @@
*/
@RequiredArgsConstructor
@Service
-public class EimsRepairReqServiceImpl implements IEimsRepairReqService {
+public class EimsRepairReqServiceImpl implements IEimsRepairReqService, RepairReqService {
private final EimsRepairReqMapper baseMapper;
private final SysDeptMapper sysDeptMapper;
@@ -68,7 +73,7 @@
@Override
public TableDataInfo<EimsRepairReqVo> queryPageListCustom(EimsRepairReqBo bo, PageQuery pageQuery) {
- DataFilterUtil.getInstance().filterRepairReq(bo);
+ //DataFilterUtil.getInstance().filterRepairReq(bo);
Page<EimsRepairReqVo> page = baseMapper.selectRepairReqList(pageQuery.build(), buildWrapper(bo));
return TableDataInfo.build(page);
}
@@ -86,7 +91,7 @@
qw.eq(bo.getRepairDept() != null, "a.repair_dept", bo.getRepairDept());
qw.eq(bo.getRepairUser() != null, "a.repair_user", bo.getRepairUser());
qw.eq(StringUtils.isNotBlank(bo.getFaultType()), "a,fault_type", bo.getFaultType());
- qw.eq(params.containsKey("createBy"), "a.create_by", params.get("createBy"));
+ qw.in(params.containsKey("createBy"), "a.create_by", (List<Long>) params.get("createBy"));
qw.eq(params.containsKey("status"), "a.status", params.get("status"));
qw.between(params.get("beginReqTime") != null && params.get("endReqTime") != null,
"a.req_time", params.get("beginReqTime"), params.get("endReqTime"));
@@ -216,4 +221,16 @@
}
+ @Override
+ public String selectRepairReqCodeByIds(String reqIds) {
+ List<String> list = new ArrayList<>();
+ for (Long id : StringUtils.splitTo(reqIds, Convert::toLong)) {
+ EimsRepairReqVo vo = SpringUtils.getAopProxy(this).queryById(id);
+ if (ObjectUtil.isNotNull(vo)) {
+ list.add(vo.getCode());
+ }
+ }
+ return String.join(StringUtils.SEPARATOR, list);
+ }
+
}
--
Gitblit v1.9.3