From d40cde3bca854c21c869cb35d25ece4aa7dac265 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 10 四月 2025 16:43:34 +0800
Subject: [PATCH] 检查记录 排除 未检查的记录
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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 f43f465..fde56f9 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
@@ -176,8 +176,8 @@
}
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.READY.getState());
- jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ jobTypeList.add( DevRentStateEnum.RECEIVED.getState());
+ jobTypeList.add( DevRentStateEnum.RECEIVED_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
@@ -189,7 +189,7 @@
rent_id = devRentDOList.getFirst().getId();
createReqVO.setId( rent_id );
- createReqVO.setState( DevRentStateEnum.READY.getState() );
+ createReqVO.setState( DevRentStateEnum.RECEIVED.getState() );
updateDevRent( createReqVO );
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
@@ -200,7 +200,7 @@
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY.getState() );
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.RECEIVED.getState() );
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
@@ -209,12 +209,12 @@
jobRecordMapper.insert(jobRecord);
} else {
// 鎾ら攢 鏀惧純鎿嶄綔
- createReqVO.setState( DevRentStateEnum.READY.getState() );
+ createReqVO.setState( DevRentStateEnum.RECEIVED.getState() );
updateDevRent( createReqVO );
jobRecordDO.setDevId(createReqVO.getDevId());
- jobRecordDO.setJobType( DevRentStateEnum.READY.getState() );
+ jobRecordDO.setJobType( DevRentStateEnum.RECEIVED.getState() );
jobRecordDO.setJobTime(createReqVO.getRentTime());
jobRecordDO.setRemark(createReqVO.getRemark());
jobRecordDO.setUpdater(String.valueOf(userId));
@@ -269,7 +269,7 @@
// 绗竴娆� 瀹夎鎿嶄綔
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.READY.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.RECEIVED.getState());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_RECEIVED);
else if (devRentDOList.size() != 1) {
@@ -480,13 +480,13 @@
DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
createReqVO.setDevId(null);
- createReqVO.setState( DevRentStateEnum.READY_CANCELLED.getState());
+ createReqVO.setState( DevRentStateEnum.RECEIVED_CANCELLED.getState());
Long rent_id = createReqVO.getId();
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.READY.getState());
- jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ jobTypeList.add( DevRentStateEnum.RECEIVED.getState());
+ jobTypeList.add( DevRentStateEnum.RECEIVED_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
@@ -495,7 +495,7 @@
rent_id = devRentDOList.getFirst().getId();
createReqVO.setId( rent_id );
- createReqVO.setState( DevRentStateEnum.READY_CANCELLED.getState() );
+ createReqVO.setState( DevRentStateEnum.RECEIVED_CANCELLED.getState() );
updateDevRent( createReqVO );
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
@@ -505,7 +505,7 @@
jobRecordSaveReqVO.setDocName(userNickname);
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY_CANCELLED.getState() );
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.RECEIVED_CANCELLED.getState() );
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
@@ -517,7 +517,7 @@
updateDevRent( createReqVO );
jobRecordDO.setDevId(null);
- jobRecordDO.setJobType(DevRentStateEnum.READY_CANCELLED.getState());
+ jobRecordDO.setJobType(DevRentStateEnum.RECEIVED_CANCELLED.getState());
jobRecordDO.setJobTime(createReqVO.getRentTime());
jobRecordDO.setRemark(createReqVO.getRemark());
jobRecordDO.setUpdater(String.valueOf(userId));
@@ -550,7 +550,7 @@
jobTypeList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.READY.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.RECEIVED.getState());
if (devRentDOList.size() != 1)
throw exception(DEV_INSTALL_EXIST);
@@ -684,14 +684,15 @@
@Override
public PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO) {
+ pageReqVO.setState(0);
return devRentMapper.selectPage(pageReqVO);
}
@Override
- public DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO) {
+ public DevRentDO getExistingRent(DevRentSearchReqVO searchReqVO) {
List<Integer> stateList = new ArrayList<>();
stateList.add( DevRentStateEnum.INSTALLED.getState() );
- stateList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
+ stateList.add( DevRentStateEnum.RECEIVED.getState());
searchReqVO.setStateList( stateList );
return devRentMapper.getRentByState(searchReqVO);
}
@@ -707,8 +708,8 @@
@Override
public DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO) {
List<Integer> stateList = new ArrayList<>();
- stateList.add( DevRentStateEnum.READY.getState() );
- stateList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ stateList.add( DevRentStateEnum.RECEIVED.getState() );
+ stateList.add( DevRentStateEnum.RECEIVED_CANCELLED.getState());
searchReqVO.setStateList( stateList );
return devRentMapper.getRentByState(searchReqVO);
}
--
Gitblit v1.9.3