From 24b7c98e01c211e93f00293e6e4e96ba1b9db93f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 14:50:43 +0800
Subject: [PATCH] 常规检查 step 2
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 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 4664496..a933ea8 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
@@ -7,8 +7,10 @@
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.module.ecg.dal.mysql.devmanage.DeviceMapper;
import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
import cn.lihu.jh.module.ecg.enums.DevStateEnum;
+import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
@@ -54,6 +56,70 @@
@Override
public CommonResult<Long> registerOperation(DevRentSaveReqVO createReqVO) {
Long rent_id = createDevRent(createReqVO);
+ return CommonResult.success(rent_id);
+ }
+
+ @Override
+ public CommonResult<Long> routineFinishOperation(RoutineFinishReqVO routineFinishReqVO) {
+ DevRentSaveReqVO createReqVO = BeanUtils.toBean(routineFinishReqVO, DevRentSaveReqVO.class);
+
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ // 鍚屾牱 鍦ㄩ绾︾‘瀹炴椂 灏辫繘鍏� [dev_rent] 琛ㄤ簡
+ Long rent_id = createReqVO.getId();
+ if (null == rent_id) {
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() == 0)
+ return CommonResult.error(DEV_INSTALL_NOT_APPOINTMENT);
+ else if (devRentDOList.size() != 1) {
+ return CommonResult.error(DEV_INSTALL_EXCEPTION);
+ }
+
+ rent_id = devRentDOList.getFirst().getId();
+ createReqVO.setId( rent_id );
+ createReqVO.setState( DevRentStateEnum.ROUTINE_FINISH.getState() );
+ updateDevRent( createReqVO );
+
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId(rent_id);
+ jobRecordSaveReqVO.setDevId(createReqVO.getDevId());
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
+ jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
+ jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary("");
+
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ // 鎾ら攢 鏀惧純鎿嶄綔
+ createReqVO.setState( DevRentStateEnum.ROUTINE_FINISH.getState() );
+
+ updateDevRent( createReqVO );
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
+ jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null != jobRecordDO) {
+ jobRecordDO.setDevId(createReqVO.getDevId());
+ jobRecordDO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+ }
+
+ // 鏇存柊..闃熷垪鐘舵��
+ queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
return CommonResult.success(rent_id);
}
@@ -118,8 +184,9 @@
}
}
- // 鎮ｈ�呮帓闃熺姸鎬� 鏇存柊涓� 宸查鐢�
- queueMapper.
+ // 鏇存柊..闃熷垪鐘舵��
+ queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
return CommonResult.success(rent_id);
}
@@ -185,6 +252,11 @@
jobRecordDO.setUpdateTime(LocalDateTime.now());
jobRecordMapper.updateById(jobRecordDO);
}
+
+ // 鏇存柊..闃熷垪鐘舵��
+ queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
return CommonResult.success(rent_id);
}
--
Gitblit v1.9.3