From bfdc738a7d11d7a132747c52fe51f6887405fae4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 04 七月 2024 16:29:21 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
index 53af4ce..3a87814 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -118,27 +118,28 @@
public Boolean saveOrUpdatePatInfo(PatArchiveVO patArchiveVO) {
//閫氳繃isoperation鏉ュ垽鏂槸鍚︽柊澧�
PatArchive patArchive = DtoConversionUtils.sourceToTarget(patArchiveVO, PatArchive.class);
- if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 1) {
+ if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 1 || patArchiveVO.getPatid() == null) {
//鏂板
List<PatArchive> patArchives = new ArrayList<>();
patArchive.setUpdateTime(DateUtils.getNowDate());
patArchives.add(patArchive);
patArchiveMapper.insertPatArchive(patArchives);
- } else if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 2) {
+ } else if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 2 || patArchiveVO.getPatid() != null) {
//淇敼
+ patArchiveVO.setIsoperation(2);
patArchiveMapper.updatePatArchive(patArchive);
}
if (CollectionUtils.isNotEmpty(patArchiveVO.getTagList())) {
//澶勭悊鏍囩锛堟柊澧炪�佸垹闄わ級
for (PatArchivetag patArchivetag : patArchiveVO.getTagList()) {
- if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 1) {
+ if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 1 || patArchivetag.getIsoperation() == null && patArchiveVO.getIsoperation() == 1) {
//鏂板
patArchivetag.setUpdateBy(null);
patArchivetag.setCreateTime(new Date());
patArchivetag.setPatid(patArchive.getPatid());
patArchivetagMapper.insertPatArchivetag(patArchivetag);
- } else if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 3) {
+ } else if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 3 || patArchivetag.getIsoperation() == null && patArchiveVO.getIsoperation() == 3) {
patArchivetag.setDelFlag("1");
//鍒犻櫎
log.info("鏍囩鐨刬d涓猴細{}", patArchivetag.getTagid());
--
Gitblit v1.9.3