From 5247f5d991b09bef8dce64ca8fac0e9c804f4584 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 四月 2025 09:10:22 +0800
Subject: [PATCH] feat(eims): 优化数据导入功能并添加创建时间排序
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 105 insertions(+), 12 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java
index 8fa2a81..8afbba1 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java
@@ -3,7 +3,9 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.SneakyThrows;
import org.dromara.common.core.constant.DictConstants;
+import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.service.RepairResService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
@@ -14,27 +16,24 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
-import org.dromara.eims.domain.EimsEqu;
-import org.dromara.eims.domain.EimsFixture;
-import org.dromara.eims.domain.EimsRepairReq;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.eims.domain.*;
import org.dromara.eims.domain.vo.EimsRepairReqVo;
+import org.dromara.eims.mapper.EimsRepairRecordMapper;
import org.dromara.eims.mapper.EimsRepairReqMapper;
import org.dromara.eims.utils.DataFilterUtil;
import org.dromara.system.domain.SysDept;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.mapper.SysDeptMapper;
+import org.redisson.misc.LogHelper;
import org.springframework.stereotype.Service;
import org.dromara.eims.domain.bo.EimsRepairResBo;
import org.dromara.eims.domain.vo.EimsRepairResVo;
-import org.dromara.eims.domain.EimsRepairRes;
import org.dromara.eims.mapper.EimsRepairResMapper;
import org.dromara.eims.service.IEimsRepairResService;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
/**
* 缁翠慨宸ュ崟Service涓氬姟灞傚鐞�
@@ -49,6 +48,7 @@
private final EimsRepairResMapper baseMapper;
private final EimsRepairReqMapper reqMapper;
private final SysDeptMapper deptMapper;
+ private final EimsRepairRecordMapper recordMapper;
/**
* 鏌ヨ缁翠慨宸ュ崟
@@ -98,6 +98,8 @@
EimsRepairRes::getStartTime, params.get("beginStartTime"), params.get("endStartTime"));
lqw.between(params.get("beginEndTime") != null && params.get("endEndTime") != null,
EimsRepairRes::getEndTime, params.get("beginEndTime"), params.get("endEndTime"));
+ // 鎸夊垱寤烘椂闂村�掑簭
+ lqw.orderByDesc(EimsRepairRes::getCreateTime);
return lqw;
}
@@ -118,11 +120,57 @@
// 鏂板缁翠慨宸ュ崟鐨勬椂鍊欐洿鏂版姤淇崟鏁版嵁
EimsRepairReqVo reqVo = reqMapper.selectVoById(bo.getReqId());
reqVo.setRepairId(add.getId());
- reqVo.setStatus(DictConstants.REPAIR_REQ_STATUS_DETAIL.WEIXIU);
+ reqVo.setStatus(DictConstants.REPAIR_REQ_STATUS_DETAIL.YIJIEDAN);
EimsRepairReq req = MapstructUtils.convert(reqVo, EimsRepairReq.class);
reqMapper.updateById(req);
+
+ //灏嗘柊澧炴姤淇崟鏃剁淮淇褰曠殑缁翠慨宸ュ崟id鏇存柊
+ LambdaQueryWrapper<EimsRepairRecord> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EimsRepairRecord::getReqId, add.getReqId());
+ EimsRepairRecord one = recordMapper.selectOne(queryWrapper);
+ if(one!=null){
+ one.setResId(add.getId());
+ recordMapper.updateById(one);
+ }
+
+
+ //鐢熸垚缁翠慨璁板綍
+ EimsRepairRecord record = new EimsRepairRecord();
+ record.setReqId(add.getReqId());
+ record.setResId(add.getId());
+ record.setHandleTime(new Date());
+ //鎺ュ崟鐘舵��
+ record.setOpera(DictConstants.REPAIR_RECORD_HANDLE_DETAIL.YIJIEDAN);
+ record.setOperaUser(add.getCreateBy());
+ record.setOperaResult("鐢熸垚缁翠慨宸ュ崟");
+ //鏂板鏃剁敓鎴愯褰�
+ recordMapper.insert(record);
+
+
}
return flag;
+ }
+
+ @SneakyThrows
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public Boolean insertBatchByBo(EimsRepairResBo bo){
+ String batchReqIds = bo.getBatchReqIds();
+ boolean result = StringUtils.isNotEmpty(batchReqIds);
+ for (String reqId : batchReqIds.split(",")) {
+ EimsRepairReqVo reqVo = reqMapper.selectVoById(reqId);
+ EimsRepairResBo insert = new EimsRepairResBo();
+ insert.setReqId(reqVo.getId());
+ insert.setReqUser(reqVo.getReqUser());
+ insert.setReqDept(reqVo.getReqDept());
+ insert.setResCode(reqVo.getCode().replace("BXD","WXD"));
+ insert.setResUser(bo.getResUser());
+ insert.setResDept(bo.getResDept());
+ insert.setStatus(DictConstants.REPAIR_RES_STATUS_DETAIL.YIJIEDAN);
+ Boolean b = insertByBo(insert);
+ if(!b)throw new Exception("");
+ }
+ return result;
}
/**
@@ -134,17 +182,56 @@
@Transactional(rollbackFor = Exception.class)
@Override
public Boolean updateByBo(EimsRepairResBo bo) {
+ LoginUser loginUser = LoginHelper.getLoginUser();
EimsRepairRes update = MapstructUtils.convert(bo, EimsRepairRes.class);
EimsRepairResVo resVo = baseMapper.selectVoById(bo.getId());
String status = resVo.getStatus();
- //棣栨鏇存柊闇�瑕佸悓姝ユ洿鏂版姤淇崟鐘舵��
+ //缁翠慨宸ュ崟寮�濮嬬淮淇紝鍚屾鏇存柊鎶ヤ慨鍗� 浠ュ強 缁翠慨璁板綍
+ if (bo.getStatus().equals(DictConstants.REPAIR_RES_STATUS_DETAIL.WEIXIU) &&
+ status.equals(DictConstants.REPAIR_RES_STATUS_DETAIL.YIJIEDAN)) {
+ //1.璁剧疆寮�濮嬬淮淇椂闂�
+
+ //2.鏇存柊鎶ヤ慨鍗曚负缁翠慨鐘舵��
+ EimsRepairReqVo reqVo = reqMapper.selectVoById(bo.getReqId());
+ reqVo.setStatus(DictConstants.REPAIR_REQ_STATUS_DETAIL.WEIXIU);
+ EimsRepairReq req = MapstructUtils.convert(reqVo, EimsRepairReq.class);
+ reqMapper.updateById(req);
+
+ //3.鐢熸垚缁翠慨璁板綍
+ EimsRepairRecord record = new EimsRepairRecord();
+ record.setResId(bo.getId());
+ record.setReqId(bo.getReqId());
+ record.setHandleTime(new Date());
+ record.setOpera(DictConstants.REPAIR_RECORD_HANDLE_DETAIL.WEIXIU);
+ assert loginUser != null;
+ record.setOperaUser(loginUser.getUserId());
+ record.setOperaResult("寮�濮嬬淮淇�");
+ recordMapper.insert(record);
+ }
+
+
+ //缁翠慨宸ュ崟瀹屾垚锛屽悓姝ユ洿鏂版姤淇崟 浠ュ強 缁翠慨璁板綍
if (bo.getStatus().equals(DictConstants.REPAIR_RES_STATUS_DETAIL.WANCHENG) &&
status.equals(DictConstants.REPAIR_RES_STATUS_DETAIL.WEIXIU)) {
+ //1.璁剧疆缁撴潫缁翠慨鏃堕棿
+
+ //2.鏇存柊鎶ヤ慨鍗曚负瀹屾垚鐘舵��
EimsRepairReqVo reqVo = reqMapper.selectVoById(bo.getReqId());
reqVo.setStatus(DictConstants.REPAIR_REQ_STATUS_DETAIL.WANCHENG);
EimsRepairReq req = MapstructUtils.convert(reqVo, EimsRepairReq.class);
reqMapper.updateById(req);
+
+ //3.鐢熸垚缁翠慨璁板綍
+ EimsRepairRecord record = new EimsRepairRecord();
+ record.setResId(bo.getId());
+ record.setReqId(bo.getReqId());
+ record.setHandleTime(new Date());
+ record.setOpera(DictConstants.REPAIR_RECORD_HANDLE_DETAIL.WANCHENG);
+ assert loginUser != null;
+ record.setOperaUser(loginUser.getUserId());
+ record.setOperaResult("瀹屾垚缁翠慨宸ュ崟");
+ recordMapper.insert(record);
}
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
@@ -174,6 +261,7 @@
@Override
public TableDataInfo<EimsRepairResVo> queryPageListCustom(EimsRepairResBo bo, PageQuery pageQuery) {
+ DataFilterUtil.getInstance().filterRepairRes(bo);
Page<EimsRepairResVo> page = baseMapper.selectRepairResList(pageQuery.build(), buildWrapper(bo));
return TableDataInfo.build(page);
}
@@ -184,9 +272,14 @@
qw.like(StringUtils.isNotBlank(bo.getResCode()), "res.res_code", bo.getResCode());
qw.like(StringUtils.isNotBlank(bo.getReqCode()), "req.code", bo.getReqCode());
qw.eq(bo.getResUser() != null, "res.res_user", bo.getResUser());
+ qw.eq(bo.getReqUser() != null, "res.req_user", bo.getReqUser());
- List<Long> allDescendantIds = getAllDescendantIds(bo.getResDept());
- qw.in(bo.getResDept() != null, "res.res_dept", allDescendantIds);
+ List<Long> resDeptIds = getAllDescendantIds(bo.getResDept());
+ qw.in(bo.getResDept() != null, "res.res_dept", resDeptIds);
+
+ List<Long> reqDeptIds = getAllDescendantIds(bo.getReqDept());
+ qw.in(bo.getReqDept() != null, "res.req_dept", reqDeptIds);
+
qw.eq(StringUtils.isNotBlank(bo.getStatus()), "res.status", bo.getStatus());
qw.orderByDesc("res.create_time");
--
Gitblit v1.9.3