From 0ff9348f038ff25758065e7239a3d5f544bb3385 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 27 九月 2024 13:53:50 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
index 12bcbc7..a0aa589 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -55,6 +55,7 @@
}
@Override
+ @Transactional
public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
@@ -62,7 +63,7 @@
// 鏍囨敞璁惧 宸查鍙�
Integer ret = markDevRecieved(createReqVO.getDevId());
if (null == ret || 0 == ret) {
- return CommonResult.error(DEVICE_NOT_EXISTS);
+ return CommonResult.error(DEVICE_NOT_FREE);
}
Long rent_id = createReqVO.getId();
@@ -122,7 +123,7 @@
// 璁剧疆璁惧 浣跨敤涓�
Integer ret = markDevInUse(createReqVO.getDevId());
if (null == ret || 0 == ret) {
- return CommonResult.error(DEVICE_NOT_EXISTS);
+ return CommonResult.error(DEVICE_NOT_RECEIVED);
}
Long rent_id = createReqVO.getId();
@@ -213,6 +214,7 @@
}
@Override
+ @Transactional
public Long dataEntryOperation(DevRentSaveReqVO updateReqVO) {
updateReqVO.setState( DevRentStateEnum.DATAENTERED.getState() );
updateDevRent( updateReqVO );
@@ -241,7 +243,6 @@
jobRecordDO.setRemark( updateReqVO.getRemark() );
jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
jobRecordDO.setUpdater( String.valueOf(userId) );
- //jobRecordDO.setUpdateTime( LocalDateTime.now() );
jobRecordMapper.updateById(jobRecordDO);
}
return updateReqVO.getId();
@@ -418,7 +419,7 @@
private Integer markDevRecieved(String devId) {
// 璁惧鏍囨敞 宸查鍙�
DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO) {
+ if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) {
deviveDO.setState( DevStateEnum.RECEIVED.getState() );
return deviceMapper.updateById(deviveDO);
}
@@ -429,7 +430,7 @@
private Integer markDevInUse(String devId) {
// 璁惧鏍囨敞 鍦ㄤ娇鐢�
DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO) {
+ if (null != deviveDO && deviveDO.getState() == DevStateEnum.RECEIVED.getState()) {
deviveDO.setState( DevStateEnum.INUSE.getState() );
return deviceMapper.updateById(deviveDO);
}
--
Gitblit v1.9.3