From 1e5a82d409067c435caff8305d530c35f64db059 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 25 九月 2024 18:32:24 +0800
Subject: [PATCH] 新装机 功能
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 549f067..4ccd1fd 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
@@ -15,6 +15,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
@@ -75,7 +76,7 @@
rent_id = devRentDOList.getFirst().getId();
createReqVO.setId( rent_id );
- createReqVO.setState( DevRentStateEnum.RECEIVED.getState() );
+ createReqVO.setState( DevRentStateEnum.READY.getState() );
updateDevRent( createReqVO );
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
@@ -86,7 +87,7 @@
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.RECEIVED.getState() );
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY.getState() );
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
@@ -94,14 +95,14 @@
jobRecordMapper.insert(jobRecord);
} else {
// 鎾ら攢 鏀惧純鎿嶄綔
- createReqVO.setState( DevRentStateEnum.RECEIVED.getState() );
+ createReqVO.setState( DevRentStateEnum.READY.getState() );
updateDevRent( createReqVO );
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId);
if (null != jobRecordDO) {
jobRecordDO.setDevId(createReqVO.getDevId());
- jobRecordDO.setJobType( DevRentStateEnum.RECEIVED.getState() );
+ jobRecordDO.setJobType( DevRentStateEnum.READY.getState() );
jobRecordDO.setJobTime(createReqVO.getRentTime());
jobRecordDO.setRemark(createReqVO.getRemark());
jobRecordDO.setUpdater(String.valueOf(userId));
@@ -126,7 +127,7 @@
Long rent_id = createReqVO.getId();
if (null == rent_id) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.RECEIVED.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
if (devRentDOList.size() == 0)
return CommonResult.error(DEV_INSTALL_NOT_RECEIVED);
else if (devRentDOList.size() != 1) {
@@ -354,8 +355,21 @@
}
@Override
- public DevRentDO getDismantleRent(DevRentSearchReqVO searchReqVO) {
- return devRentMapper.getDismantleRentByState(searchReqVO);
+ public DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add( DevRentStateEnum.INSTALLED.getState() );
+ stateList.add( DevRentStateEnum.CANCELLED.getState() );
+ searchReqVO.setStateList( stateList );
+ return devRentMapper.getRentByState(searchReqVO);
+ }
+
+ @Override
+ public DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add( DevRentStateEnum.READY.getState() );
+ stateList.add( DevRentStateEnum.CANCELLED.getState() );
+ searchReqVO.setStateList( stateList );
+ return devRentMapper.getRentByState(searchReqVO);
}
private Integer markDevRecieved(String devId) {
--
Gitblit v1.9.3