From 9b351239a6370c9c680ed13fc7a7f8f000137c7a Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期日, 29 九月 2024 15:52:30 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 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 4ccd1fd..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();
@@ -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();
@@ -207,6 +208,41 @@
jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
jobRecordDO.setUpdater( String.valueOf(userId) );
jobRecordDO.setUpdateTime( LocalDateTime.now() );
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+ return updateReqVO.getId();
+ }
+
+ @Override
+ @Transactional
+ public Long dataEntryOperation(DevRentSaveReqVO updateReqVO) {
+ updateReqVO.setState( DevRentStateEnum.DATAENTERED.getState() );
+ updateDevRent( updateReqVO );
+
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId);
+ if (jobRecordDO == null) {
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
+ jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
+ jobRecordSaveReqVO.setDocId( userId );
+ jobRecordSaveReqVO.setDocName( userNickname );
+ jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
+ jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
+ jobRecordSaveReqVO.setJobTime( updateReqVO.getEntryTime() );
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
+ jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
+ jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ jobRecordDO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
+ jobRecordDO.setJobTime( updateReqVO.getEntryTime() );
+ jobRecordDO.setRemark( updateReqVO.getRemark() );
+ jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ jobRecordDO.setUpdater( String.valueOf(userId) );
jobRecordMapper.updateById(jobRecordDO);
}
return updateReqVO.getId();
@@ -372,11 +408,20 @@
return devRentMapper.getRentByState(searchReqVO);
}
+ @Override
+ public DevRentDO getDismantledRent(DevRentSearchReqVO searchReqVO) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add( DevRentStateEnum.DISMANTLED.getState() );
+ searchReqVO.setStateList( stateList );
+ return devRentMapper.getRentByState(searchReqVO);
+ }
+
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() );
+ deviveDO.setStateDate( LocalDate.now() );
return deviceMapper.updateById(deviveDO);
}
@@ -386,8 +431,9 @@
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() );
+ deviveDO.setStateDate( LocalDate.now() );
return deviceMapper.updateById(deviveDO);
}
@@ -399,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);
}
@@ -411,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