From 77e9ae06280bbb1e944b9fb0f86ce1597d1f1b5f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 11 九月 2024 17:05:45 +0800
Subject: [PATCH] 装机 OK
---
sql/mysql/jh.sql | 4 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 44 +++++++++++++++++++++++++++++---------------
2 files changed, 31 insertions(+), 17 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 46f992f..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
@@ -41,25 +41,39 @@
@Override
@Transactional
public Long installOperation(DevRentSaveReqVO createReqVO) {
- Long rent_id = createDevRent( 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) {
+ rent_id = createDevRent(createReqVO);
- JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
- jobRecordMapper.insert(jobRecord);
+ 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;
}
diff --git a/sql/mysql/jh.sql b/sql/mysql/jh.sql
index 669bb9d..0296ce6 100644
--- a/sql/mysql/jh.sql
+++ b/sql/mysql/jh.sql
@@ -157,8 +157,8 @@
`update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
`deleted` bit(1) DEFAULT b'0' COMMENT '鍒犻櫎鏍囪',
PRIMARY KEY (`id`),
- KEY `indx_pat_dev` (`dev_id`,`rent_time`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='瑁呮満鎷嗘満琛�';
+ KEY `indx_dev_rent` (`dev_id`,`rent_time`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='瑁呮満鎷嗘満琛�';
-- ----------------------------
-- Table structure for job_record
--
Gitblit v1.9.3