From e3a243eb89856ffccad5c4d79a1134e04e34e76c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 16:54:58 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 114 +++++++++++++++++++++++++++-----------------------------
1 files changed, 55 insertions(+), 59 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 d29ea73..30f77c7 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
@@ -69,7 +69,12 @@
// 鍚屾牱 鍦ㄩ绾︾‘瀹炴椂 灏辫繘鍏� [dev_rent] 琛ㄤ簡
Long rent_id = createReqVO.getId();
- if (null == rent_id) {
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
+ jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null == jobRecordDO) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_APPOINTMENT);
@@ -102,19 +107,13 @@
updateDevRent( createReqVO );
- List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
- jobTypeList.add( DevRentStateEnum.ROUTINE_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);
- }
+ 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);
}
// 鏇存柊..闃熷垪鐘舵��
@@ -137,7 +136,12 @@
}
Long rent_id = createReqVO.getId();
- if (null == rent_id) {
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.READY.getState());
+ jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null == jobRecordDO) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_APPOINTMENT);
@@ -170,19 +174,13 @@
updateDevRent( createReqVO );
- List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.READY.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.READY.getState() );
- jobRecordDO.setJobTime(createReqVO.getRentTime());
- jobRecordDO.setRemark(createReqVO.getRemark());
- jobRecordDO.setUpdater(String.valueOf(userId));
- jobRecordDO.setUpdateTime(LocalDateTime.now());
- jobRecordMapper.updateById(jobRecordDO);
- }
+ jobRecordDO.setDevId(createReqVO.getDevId());
+ jobRecordDO.setJobType( DevRentStateEnum.READY.getState() );
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
}
// 鏇存柊..闃熷垪鐘舵��
@@ -276,7 +274,7 @@
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add( DevRentStateEnum.DISMANTLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
- if (jobRecordDO == null) {
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -314,7 +312,7 @@
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add( DevRentStateEnum.DATAENTERED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
- if (jobRecordDO == null) {
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -351,7 +349,12 @@
createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState());
Long rent_id = createReqVO.getId();
- if (null == rent_id) {
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
+ jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null == jobRecordDO) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() != 1)
throw exception(ROUTINE_CHECK_EXIST);
@@ -378,19 +381,13 @@
} else {
updateDevRent( createReqVO );
- List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
- jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
- if (null != jobRecordDO) {
- jobRecordDO.setDevId(null);
- jobRecordDO.setJobType(DevRentStateEnum.ROUTINE_CANCELLED.getState());
- jobRecordDO.setJobTime(createReqVO.getRentTime());
- jobRecordDO.setRemark(createReqVO.getRemark());
- jobRecordDO.setUpdater(String.valueOf(userId));
- jobRecordDO.setUpdateTime(LocalDateTime.now());
- jobRecordMapper.updateById(jobRecordDO);
- }
+ jobRecordDO.setDevId(null);
+ jobRecordDO.setJobType(DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
}
return CommonResult.success(rent_id);
}
@@ -411,7 +408,12 @@
createReqVO.setState( DevRentStateEnum.READY_CANCELLED.getState());
Long rent_id = createReqVO.getId();
- if (null == rent_id) {
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.READY.getState());
+ jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null == jobRecordDO) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() != 1)
throw exception(DEV_INSTALL_EXIST);
@@ -438,19 +440,13 @@
} else {
updateDevRent( createReqVO );
- List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.READY.getState());
- jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
- if (null != jobRecordDO) {
- jobRecordDO.setDevId(null);
- jobRecordDO.setJobType(DevRentStateEnum.READY_CANCELLED.getState());
- jobRecordDO.setJobTime(createReqVO.getRentTime());
- jobRecordDO.setRemark(createReqVO.getRemark());
- jobRecordDO.setUpdater(String.valueOf(userId));
- jobRecordDO.setUpdateTime(LocalDateTime.now());
- jobRecordMapper.updateById(jobRecordDO);
- }
+ jobRecordDO.setDevId(null);
+ jobRecordDO.setJobType(DevRentStateEnum.READY_CANCELLED.getState());
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
}
return CommonResult.success(rent_id);
}
@@ -529,7 +525,7 @@
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add( DevRentStateEnum.LOST.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
- if (jobRecordDO == null) {
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
--
Gitblit v1.9.3