From fb1c355f7b38d493816b4cf94a20060887c524a0 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期日, 29 九月 2024 10:25:42 +0800
Subject: [PATCH] 设备状态特性
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 ac1ed72..c6485dd 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();
@@ -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();
@@ -420,6 +421,7 @@
DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) {
deviveDO.setState( DevStateEnum.RECEIVED.getState() );
+ deviveDO.setStateDate( LocalDate.now() );
return deviceMapper.updateById(deviveDO);
}
@@ -431,6 +433,7 @@
DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
if (null != deviveDO && deviveDO.getState() == DevStateEnum.RECEIVED.getState()) {
deviveDO.setState( DevStateEnum.INUSE.getState() );
+ deviveDO.setStateDate( LocalDate.now() );
return deviceMapper.updateById(deviveDO);
}
@@ -442,7 +445,7 @@
DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
if (null != deviveDO) {
deviveDO.setState( DevStateEnum.LOST.getState() );
- deviveDO.setLoseDate( localDate ); // createReqVO.getReturnTime().toLocalDate()
+ deviveDO.setStateDate( localDate );
return deviceMapper.updateById(deviveDO);
}
@@ -454,7 +457,7 @@
DeviceDO deviveDO = deviceMapper.getDeviceByDevId( devId );
if (null != deviveDO) {
deviveDO.setState( DevStateEnum.FREE.getState() );
- deviveDO.setLoseDate( null );
+ deviveDO.setStateDate( LocalDate.now() );
return deviceMapper.updateById(deviveDO);
}
--
Gitblit v1.9.3