From 472979c8d2339ab8f4f22a4a04a11cebbeded7ac Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 九月 2024 17:51:20 +0800
Subject: [PATCH] 撤销装机功能
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 150 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 119 insertions(+), 31 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 e4a0a2c..445794c 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,5 +1,6 @@
package cn.lihu.jh.module.ecg.service.devrent;
+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.jobrecord.JobRecordDO;
@@ -8,6 +9,7 @@
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;
@@ -39,27 +41,53 @@
@Override
@Transactional
- public Long installOperation(DevRentSaveReqVO createReqVO) {
- Long rent_id = createDevRent( createReqVO );
-
+ public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- 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( "" );
+ Long rent_id = createReqVO.getId();
+ if (null == rent_id) {
- JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
- jobRecordMapper.insert(jobRecord);
- return rent_id;
+ // 鍒ゆ柇鏄惁宸茬粡鏈夎鏈鸿褰�
+ Integer recordNum = jobRecordMapper.getPatientJobNum(createReqVO.getPatId(), createReqVO.getRentTime(), 0);
+ if (null != recordNum && recordNum > 0) {
+ return CommonResult.error(DEV_INSTALL_EXIST);
+ }
+
+ 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 {
+ // 鎾ら攢 鏀惧純鎿嶄綔
+ createReqVO.setCancelled(0);
+
+ updateDevRent( createReqVO );
+
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdJobTypeDocId(rent_id, 0, userId);
+ if (null != jobRecordDO) {
+ jobRecordDO.setCancelled( createReqVO.getCancelled() );
+ 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 CommonResult.success(rent_id);
}
@Override
@@ -70,24 +98,84 @@
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- 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);
+ 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 CommonResult<Long> cancelOperation(DevCancelReqVO cancelReqVO) {
+ DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ createReqVO.setCancelled(1);
+
+ Long rent_id = createReqVO.getId();
+ if (null == rent_id) {
+
+ // 鍒ゆ柇鏄惁宸茬粡鏈夋媶鏈鸿褰�
+ Integer recordNum = jobRecordMapper.getPatientJobNum(createReqVO.getPatId(), createReqVO.getRentTime(), 0);
+ if (null != recordNum && recordNum > 0) {
+ return CommonResult.error(DEV_INSTALL_EXIST);
+ }
+
+ 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.setCancelled(1);
+ 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.setCancelled(1);
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+ }
+ return CommonResult.success(rent_id);
+ }
+
+ @Override
public Long createDevRent(DevRentSaveReqVO createReqVO) {
//
--
Gitblit v1.9.3