From 299db0202fcde8dcdf2c2e1510465536a1c3725d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 22:11:54 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 336 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 274 insertions(+), 62 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 c6485dd..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
@@ -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;
@@ -48,6 +50,9 @@
@Resource
DeviceMapper deviceMapper;
+ @Resource
+ QueueMapper queueMapper;
+
@Override
public CommonResult<Long> registerOperation(DevRentSaveReqVO createReqVO) {
Long rent_id = createDevRent(createReqVO);
@@ -55,7 +60,71 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
+ 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();
+
+ 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);
+ else if (devRentDOList.size() != 1) {
+ throw exception(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 );
+
+ 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);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
@@ -63,16 +132,21 @@
// 鏍囨敞璁惧 宸查鍙�
Integer ret = markDevRecieved(createReqVO.getDevId());
if (null == ret || 0 == ret) {
- return CommonResult.error(DEVICE_NOT_FREE);
+ throw exception(DEVICE_NOT_FREE);
}
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)
- return CommonResult.error(DEV_INSTALL_NOT_APPOINTMENT);
+ throw exception(DEV_INSTALL_NOT_APPOINTMENT);
else if (devRentDOList.size() != 1) {
- return CommonResult.error(DEV_INSTALL_EXCEPTION);
+ throw exception(DEV_INSTALL_EXCEPTION);
}
rent_id = devRentDOList.getFirst().getId();
@@ -100,22 +174,24 @@
updateDevRent( createReqVO );
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId);
- 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);
}
+
+ // 鏇存柊..闃熷垪鐘舵��
+ queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
+
return CommonResult.success(rent_id);
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
@@ -123,16 +199,24 @@
// 璁剧疆璁惧 浣跨敤涓�
Integer ret = markDevInUse(createReqVO.getDevId());
if (null == ret || 0 == ret) {
- return CommonResult.error(DEVICE_NOT_RECEIVED);
+ throw exception(DEVICE_NOT_RECEIVED);
}
Long rent_id = createReqVO.getId();
- if (null == rent_id) {
+
+ // 妫�鏌� job_record 鐢ㄤ簬纭鏄惁鏄涓�娆″畨瑁呮搷浣�
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.INSTALLED.getState());
+ jobTypeList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+
+ // 绗竴娆� 瀹夎鎿嶄綔
+ if (null == jobRecordDO) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
if (devRentDOList.size() == 0)
- return CommonResult.error(DEV_INSTALL_NOT_RECEIVED);
+ throw exception(DEV_INSTALL_NOT_RECEIVED);
else if (devRentDOList.size() != 1) {
- return CommonResult.error(DEV_INSTALL_EXCEPTION);
+ throw exception(DEV_INSTALL_EXCEPTION);
}
rent_id = devRentDOList.getFirst().getId();
@@ -157,25 +241,26 @@
} else {
// 鎾ら攢 鏀惧純鎿嶄綔
createReqVO.setState( DevRentStateEnum.INSTALLED.getState() );
-
updateDevRent( createReqVO );
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId);
- if (null != jobRecordDO) {
- jobRecordDO.setDevId(createReqVO.getDevId());
- jobRecordDO.setJobType( DevRentStateEnum.INSTALLED.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.INSTALLED.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.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
return CommonResult.success(rent_id);
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public Long dismantleOperation(DevRentSaveReqVO updateReqVO) {
updateReqVO.setState( DevRentStateEnum.DISMANTLED.getState() );
updateDevRent( updateReqVO );
@@ -186,8 +271,10 @@
// 璁惧鎭㈠鍒扮┖闂�
resumeDevFree( updateReqVO.getDevId() );
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId);
- if (jobRecordDO == null) {
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.DISMANTLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -214,7 +301,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public Long dataEntryOperation(DevRentSaveReqVO updateReqVO) {
updateReqVO.setState( DevRentStateEnum.DATAENTERED.getState() );
updateDevRent( updateReqVO );
@@ -222,8 +309,10 @@
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId);
- if (jobRecordDO == null) {
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.DATAENTERED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -248,9 +337,64 @@
return updateReqVO.getId();
}
+ // 甯歌妫�鏌� 鍙栨秷
@Override
- @Transactional
- public CommonResult<Long> cancelOperation(DevCancelReqVO cancelReqVO) {
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> cancelRoutineOperation(DevCancelReqVO cancelReqVO) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
+ createReqVO.setDevId(null);
+ createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState());
+
+ Long rent_id = createReqVO.getId();
+
+ 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);
+
+ rent_id = devRentDOList.getFirst().getId();
+ createReqVO.setId( rent_id );
+ createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState() );
+ updateDevRent( createReqVO );
+
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId(rent_id);
+ jobRecordSaveReqVO.setDevId(null);
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_CANCELLED.getState() );
+ jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
+ jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary("");
+
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ updateDevRent( createReqVO );
+
+ 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);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> cancelReadyOperation(DevCancelReqVO cancelReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
@@ -261,18 +405,22 @@
DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
createReqVO.setDevId(null);
- createReqVO.setState( DevRentStateEnum.CANCELLED.getState() );
+ 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)
- return CommonResult.error(DEV_INSTALL_EXIST);
+ throw exception(DEV_INSTALL_EXIST);
rent_id = devRentDOList.getFirst().getId();
createReqVO.setId( rent_id );
- createReqVO.setState( DevRentStateEnum.CANCELLED.getState() );
+ createReqVO.setState( DevRentStateEnum.READY_CANCELLED.getState() );
updateDevRent( createReqVO );
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
@@ -282,7 +430,7 @@
jobRecordSaveReqVO.setDocName(userNickname);
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.CANCELLED.getState() );
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY_CANCELLED.getState() );
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
@@ -292,22 +440,78 @@
} else {
updateDevRent( createReqVO );
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId);
- if (null != jobRecordDO) {
- jobRecordDO.setDevId(null);
- jobRecordDO.setJobType( DevRentStateEnum.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);
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> cancelInstallOperation(DevCancelReqVO cancelReqVO) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ // 鑻ヤ粠 瑁呮満 鏀逛负 鍙栨秷瑁呮満锛屾仮澶嶈澶囩姸鎬�
+ if (null != cancelReqVO.getDevId()) {
+ resumeDevFree( cancelReqVO.getDevId() );
+ }
+
+ DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
+ createReqVO.setDevId(null);
+ createReqVO.setState( DevRentStateEnum.INSTALL_CANCELLED.getState() );
+
+ Long rent_id = createReqVO.getId();
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.INSTALLED.getState());
+ jobTypeList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null == jobRecordDO) {
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
+ if (devRentDOList.size() != 1)
+ throw exception(DEV_INSTALL_EXIST);
+
+ rent_id = devRentDOList.getFirst().getId();
+ createReqVO.setId( rent_id );
+ createReqVO.setState( DevRentStateEnum.INSTALL_CANCELLED.getState() );
+ updateDevRent( createReqVO );
+
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId(rent_id);
+ jobRecordSaveReqVO.setDevId(null);
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.INSTALL_CANCELLED.getState() );
+ jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
+ jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary("");
+
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ updateDevRent( createReqVO );
+
+ jobRecordDO.setDevId(null);
+ jobRecordDO.setJobType( DevRentStateEnum.INSTALL_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);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> loseOperation(DevRentSaveReqVO updateReqVO) {
// 璁惧閬楀け鏃�, 鏍囨敞閬楀け
markDevLost( updateReqVO.getDevId(), updateReqVO.getReturnTime().toLocalDate() );
@@ -318,8 +522,10 @@
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId);
- if (jobRecordDO == null) {
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.LOST.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -348,8 +554,6 @@
@Override
public Long createDevRent(DevRentSaveReqVO createReqVO) {
- //
-
// 鎻掑叆
DevRentDO devRent = BeanUtils.toBean(createReqVO, DevRentDO.class);
devRentMapper.insert(devRent);
@@ -394,7 +598,15 @@
public DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO) {
List<Integer> stateList = new ArrayList<>();
stateList.add( DevRentStateEnum.INSTALLED.getState() );
- stateList.add( DevRentStateEnum.CANCELLED.getState() );
+ stateList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
+ searchReqVO.setStateList( stateList );
+ return devRentMapper.getRentByState(searchReqVO);
+ }
+
+ @Override
+ public DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add( DevRentStateEnum.FREE.getState() );
searchReqVO.setStateList( stateList );
return devRentMapper.getRentByState(searchReqVO);
}
@@ -403,7 +615,7 @@
public DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO) {
List<Integer> stateList = new ArrayList<>();
stateList.add( DevRentStateEnum.READY.getState() );
- stateList.add( DevRentStateEnum.CANCELLED.getState() );
+ stateList.add( DevRentStateEnum.READY_CANCELLED.getState());
searchReqVO.setStateList( stateList );
return devRentMapper.getRentByState(searchReqVO);
}
@@ -431,7 +643,7 @@
private Integer markDevInUse(String devId) {
// 璁惧鏍囨敞 鍦ㄤ娇鐢�
DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO && deviveDO.getState() == DevStateEnum.RECEIVED.getState()) {
+ if (null != deviveDO && (deviveDO.getState() == DevStateEnum.RECEIVED.getState() || deviveDO.getState() == DevStateEnum.FREE.getState())) {
deviveDO.setState( DevStateEnum.INUSE.getState() );
deviveDO.setStateDate( LocalDate.now() );
return deviceMapper.updateById(deviveDO);
--
Gitblit v1.9.3