From 77e9ae06280bbb1e944b9fb0f86ce1597d1f1b5f Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 11 九月 2024 17:05:45 +0800 Subject: [PATCH] 装机 OK --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 85 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 83 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 1815eae..0fe1d44 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; @@ -29,6 +34,82 @@ @Resource private DevRentMapper devRentMapper; + + @Resource + private JobRecordMapper jobRecordMapper; + + @Override + @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.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) { @@ -75,8 +156,8 @@ } @Override - public DevRentDO getLatestRent(String patId, String devId) { - return devRentMapper.getLatestRent(patId, devId); + public DevRentDO getLatestRent(String devId) { + return devRentMapper.getLatestRent(devId); } } \ No newline at end of file -- Gitblit v1.9.3