From cabea4341bdb25a7779d11bd42ff595bb667979c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 11 九月 2024 17:32:13 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 93 insertions(+), 4 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 a7b6021..3238445 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
@@ -1,9 +1,14 @@
package cn.lihu.jh.module.ecg.service.devrent;
+import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
+import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.JobRecordSaveReqVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
+import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
import java.util.*;
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
@@ -30,8 +35,87 @@
@Resource
private DevRentMapper devRentMapper;
+ @Resource
+ private JobRecordMapper jobRecordMapper;
+
@Override
- public Integer createDevRent(DevRentSaveReqVO createReqVO) {
+ @Transactional
+ public Long installOperation(DevRentSaveReqVO createReqVO) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ Long rent_id = createReqVO.getId();
+ if (null == rent_id) {
+ rent_id = createDevRent(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(0);
+ jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary("");
+
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ updateDevRent( createReqVO );
+
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdJobTypeDocId(rent_id, 0, userId);
+ if (null != jobRecordDO) {
+ jobRecordDO.setDevId(createReqVO.getDevId());
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+ }
+ return rent_id;
+ }
+
+ @Override
+ @Transactional
+ public Long dismantleOperation(DevRentSaveReqVO updateReqVO) {
+ updateDevRent( updateReqVO );
+
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdJobTypeDocId(updateReqVO.getId(), 1, userId);
+ if (jobRecordDO == null) {
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
+ jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
+ jobRecordSaveReqVO.setDocId( userId );
+ jobRecordSaveReqVO.setDocName( userNickname );
+ jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
+ jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
+ jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() );
+ jobRecordSaveReqVO.setJobType( 1 );
+ jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
+ jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
+ jobRecordDO.setRemark( updateReqVO.getRemark() );
+ jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ jobRecordDO.setUpdater( String.valueOf(userId) );
+ jobRecordDO.setUpdateTime( LocalDateTime.now() );
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+ return 0L;
+ }
+
+ @Override
+ public Long createDevRent(DevRentSaveReqVO createReqVO) {
+ //
+
// 鎻掑叆
DevRentDO devRent = BeanUtils.toBean(createReqVO, DevRentDO.class);
devRentMapper.insert(devRent);
@@ -49,21 +133,21 @@
}
@Override
- public void deleteDevRent(Integer id) {
+ public void deleteDevRent(Long id) {
// 鏍￠獙瀛樺湪
validateDevRentExists(id);
// 鍒犻櫎
devRentMapper.deleteById(id);
}
- private void validateDevRentExists(Integer id) {
+ private void validateDevRentExists(Long id) {
if (devRentMapper.selectById(id) == null) {
throw exception(DEV_RENT_NOT_EXISTS);
}
}
@Override
- public DevRentDO getDevRent(Integer id) {
+ public DevRentDO getDevRent(Long id) {
return devRentMapper.selectById(id);
}
@@ -72,4 +156,9 @@
return devRentMapper.selectPage(pageReqVO);
}
+ @Override
+ public DevRentDO getLatestRent(String devId) {
+ return devRentMapper.getLatestRent(devId);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3