From 14681dfe7052cb76eefcc0c17d0a0d708e1ac9dd Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 13 五月 2025 16:31:14 +0800
Subject: [PATCH] 完成移动端基本功能
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java | 85 +++++++++++++++++++++++++++++++++++-------
1 files changed, 70 insertions(+), 15 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 d809c00..c697818 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
@@ -5,6 +5,7 @@
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;
@@ -15,18 +16,20 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
+import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.eims.domain.*;
+import org.dromara.eims.domain.vo.EimsEquVo;
+import org.dromara.eims.domain.vo.EimsFixtureVo;
import org.dromara.eims.domain.vo.EimsRepairReqVo;
-import org.dromara.eims.mapper.EimsRepairRecordMapper;
-import org.dromara.eims.mapper.EimsRepairReqMapper;
+import org.dromara.eims.mapper.*;
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.mapper.EimsRepairResMapper;
import org.dromara.eims.service.IEimsRepairResService;
import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +49,8 @@
private final EimsRepairReqMapper reqMapper;
private final SysDeptMapper deptMapper;
private final EimsRepairRecordMapper recordMapper;
+ private final EimsEquMapper equMapper;
+ private final EimsFixtureMapper fixtureMapper;
/**
* 鏌ヨ缁翠慨宸ュ崟
@@ -55,7 +60,27 @@
*/
@Override
public EimsRepairResVo queryById(Long id) {
- return baseMapper.selectVoById(id);
+ EimsRepairResVo resVo = baseMapper.selectVoById(id);
+ Long reqId = resVo.getReqId();
+ if(reqId!=null){
+ EimsRepairReqVo reqVo = reqMapper.selectVoById(reqId);
+ resVo.setReqType(reqVo.getReqType());
+ resVo.setReqCode(reqVo.getCode());
+
+ if(reqVo.getEquId()!=null){
+ EimsEquVo equVo = equMapper.selectVoById(reqVo.getEquId());
+ resVo.setAssetNo(equVo.getAssetNo());
+ resVo.setEquName(equVo.getEquName());
+ }
+ if(reqVo.getFixtureId()!=null){
+ EimsFixtureVo fixtureVo = fixtureMapper.selectVoById(reqVo.getFixtureId());
+ resVo.setFixtureName(fixtureVo.getFixtureName());
+ resVo.setAssetNo(fixtureVo.getAssetNo());
+ }
+
+
+ }
+ return resVo;
}
/**
@@ -95,6 +120,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;
}
@@ -106,7 +133,7 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public Boolean insertByBo(EimsRepairResBo bo) {
+ public synchronized Boolean insertByBo(EimsRepairResBo bo) {
EimsRepairRes add = MapstructUtils.convert(bo, EimsRepairRes.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
@@ -115,7 +142,7 @@
// 鏂板缁翠慨宸ュ崟鐨勬椂鍊欐洿鏂版姤淇崟鏁版嵁
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);
@@ -135,9 +162,9 @@
record.setResId(add.getId());
record.setHandleTime(new Date());
//鎺ュ崟鐘舵��
- record.setOpera(DictConstants.REPAIR_RECORD_HANDLE_DETAIL.JIEDAN);
+ record.setOpera(DictConstants.REPAIR_RECORD_HANDLE_DETAIL.YIJIEDAN);
record.setOperaUser(add.getCreateBy());
- record.setOperaResult("鎺ュ崟锛岀敓鎴愮淮淇伐鍗�");
+ record.setOperaResult("鐢熸垚缁翠慨宸ュ崟");
//鏂板鏃剁敓鎴愯褰�
recordMapper.insert(record);
@@ -161,8 +188,7 @@
insert.setResCode(reqVo.getCode().replace("BXD","WXD"));
insert.setResUser(bo.getResUser());
insert.setResDept(bo.getResDept());
- insert.setStatus(DictConstants.REPAIR_RES_STATUS_DETAIL.WEIXIU);
- insert.setStartTime(new Date());
+ insert.setStatus(DictConstants.REPAIR_RES_STATUS_DETAIL.YIJIEDAN);
Boolean b = insertByBo(insert);
if(!b)throw new Exception("");
}
@@ -178,29 +204,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);
- record.setOperaUser(bo.getUpdateBy());
+ assert loginUser != null;
+ record.setOperaUser(loginUser.getUserId());
record.setOperaResult("瀹屾垚缁翠慨宸ュ崟");
recordMapper.insert(record);
-
}
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
@@ -241,7 +294,9 @@
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.getReqType() != null, "req.req_type", bo.getReqType());
qw.eq(bo.getReqUser() != null, "res.req_user", bo.getReqUser());
+ qw.eq(bo.getAssetNo() != null, "equ.asset_no", bo.getAssetNo());
List<Long> resDeptIds = getAllDescendantIds(bo.getResDept());
qw.in(bo.getResDept() != null, "res.res_dept", resDeptIds);
--
Gitblit v1.9.3