From 2330e34c1d0f8a3c58a729eaee8e9987f612d83d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 12 十二月 2024 10:51:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
index ac099d8..6e189bc 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
@@ -202,16 +202,28 @@
.set(ProjectPlanInfo::getStartTime, request.getStartTime())
.set(ProjectPlanInfo::getEndTime, request.getEndTime())
.update();
+ // 鏌ヨ鍑哄師鏉ョ殑瀹℃牳璁板綍
+ ProjectPlanExamineRecord item = new LambdaQueryChainWrapper<>(projectPlanExamineRecordMapper)
+ .eq(ProjectPlanExamineRecord::getProjectPlanInfoId, request.getId())
+ .eq(ProjectPlanExamineRecord::getProjectPlanRecordId, request.getProjectPlanRecordId())
+ .ne(ProjectPlanExamineRecord::getEventType, 2)
+ .eq(ProjectPlanExamineRecord::getDeleted, 0) // 鏈垹闄�
+ .orderByDesc(ProjectPlanExamineRecord::getGmtCreate)
+ .last("LIMIT 1")
+ .one();
// 鏂板涓�鏉″鏍歌褰�
- ProjectPlanExamineRecord item = new ProjectPlanExamineRecord();
- item.setProjectPlanRecordId(request.getProjectPlanRecordId().longValue());
- item.setProjectPlanInfoId(request.getId().longValue());
+// item.setId(null);
+// item.setEventType(1);
+// item.setDelayStartTime(request.getStartTime());
+// item.setDelayEndTime(request.getEndTime());
+// item.setGmtCreate(null);
+// item.setGmtUpdate(null);
+// projectPlanExamineRecordMapper.insertOne(item);
+ // 鏇存柊鍘熸潵鐨勫鏍歌褰�
item.setEventType(1);
item.setDelayStartTime(request.getStartTime());
item.setDelayEndTime(request.getEndTime());
- item.setGmtCreate(new Date());
- item.setDeleted(0);
- projectPlanExamineRecordMapper.insertOne(item);
+ projectPlanExamineRecordMapper.updateById(item);
return Result.ok("寤舵湡鎴愬姛");
}
@@ -231,11 +243,9 @@
item.setProjectPlanRecordId(form.getProjectPlanRecordId().longValue());
item.setProjectPlanInfoId(form.getId().longValue());
item.setEventType(0); // 璁″垝涓婃姤
- item.setDelayStartTime(form.getStartTime());
- item.setDelayEndTime(form.getEndTime());
item.setGmtCreate(new Date());
item.setDeleted(0); // 鏈垹闄�
- projectPlanExamineRecordMapper.insertOne(item);
+ projectPlanExamineRecordMapper.insert(item);
return Result.ok("閲嶆柊涓婃姤鎴愬姛");
}
}
--
Gitblit v1.8.0