From 9ddc38c82866653987733935c380496a79d70945 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期五, 13 九月 2024 15:26:03 +0800 Subject: [PATCH] 设备遗失功能完成 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 78 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 1 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 43026b5..f3bf2aa 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 @@ -3,7 +3,9 @@ import cn.lihu.jh.framework.common.pojo.CommonResult; 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.devmanage.DeviceDO; 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 org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -38,6 +40,9 @@ @Resource private JobRecordMapper jobRecordMapper; + + @Resource + DeviceMapper deviceMapper; @Override @Transactional @@ -93,6 +98,9 @@ @Override @Transactional public Long dismantleOperation(DevRentSaveReqVO updateReqVO) { + // 鍙栨秷閬楀け鏍囪 + updateReqVO.setLost(0); + updateDevRent( updateReqVO ); Long userId = SecurityFrameworkUtils.getLoginUserId(); @@ -114,6 +122,12 @@ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class); jobRecordMapper.insert(jobRecord); } else { + // 璁惧閬楀け鏃�, 闇�鎭㈠鍒版甯� + resumeDevLost( updateReqVO ); + + // 鍙栨秷閬楀け鏍囪 + jobRecordDO.setLost(0); + jobRecordDO.setJobTime( updateReqVO.getReturnTime() ); jobRecordDO.setRemark( updateReqVO.getRemark() ); jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() ); @@ -121,10 +135,11 @@ jobRecordDO.setUpdateTime( LocalDateTime.now() ); jobRecordMapper.updateById(jobRecordDO); } - return 0L; + return updateReqVO.getId(); } @Override + @Transactional public CommonResult<Long> cancelOperation(DevCancelReqVO cancelReqVO) { DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class); Long userId = SecurityFrameworkUtils.getLoginUserId(); @@ -176,6 +191,47 @@ } @Override + @Transactional + public CommonResult<Long> loseOperation(DevRentSaveReqVO updateReqVO) { + updateReqVO.setLost(1); + 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.setLost( updateReqVO.getLost() ); + jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() ); + jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() ); + JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class); + jobRecordMapper.insert(jobRecord); + } else { + jobRecordDO.setLost( updateReqVO.getLost() ); + 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); + } + + // 璁惧閬楀け鏃�, 鏍囨敞閬楀け + markDevLost( updateReqVO ); + + return CommonResult.success(updateReqVO.getId()); + } + + @Override public Long createDevRent(DevRentSaveReqVO createReqVO) { // @@ -224,4 +280,24 @@ return devRentMapper.getLatestRent(searchReqVO); } + private void markDevLost(DevRentSaveReqVO createReqVO) { + // 璁惧鏍囨敞閬楀け + DeviceDO deviveDO = deviceMapper.selectById(createReqVO.getDevId()); + if (null != deviveDO) { + deviveDO.setLost(1); + deviveDO.setLoseDate( createReqVO.getReturnTime().toLocalDate() ); + deviceMapper.updateById(deviveDO); + } + } + + private void resumeDevLost(DevRentSaveReqVO createReqVO) { + // 璁惧鏍囨敞閬楀け 鎭㈠涓烘甯� + DeviceDO deviveDO = deviceMapper.selectById(createReqVO.getDevId()); + if (null != deviveDO) { + deviveDO.setLost(0); + deviveDO.setLoseDate( null ); + deviceMapper.updateById(deviveDO); + } + } + } \ No newline at end of file -- Gitblit v1.9.3