From 4b3f6bd762fc742aa29d8e6b75f4fc54ef6d22ad Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 12 十二月 2024 10:50:16 +0800
Subject: [PATCH] 调整
---
business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java | 19 +++++++------------
system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyId.java | 4 ++--
business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java | 2 +-
system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyIdAndDeleted.java | 4 ++--
business/src/main/java/com/ycl/domain/vo/ProjectPlanInfoRequest.java | 6 +++++-
5 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java b/business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java
index d34158a..4711d1b 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java
@@ -85,7 +85,7 @@
@PostMapping("/addPlanInfo")
- public Result addPlanInfo(@RequestBody ProjectPlanInfoRequest request) {
+ public Result addPlanInfo(@RequestBody @Validated ProjectPlanInfoRequest request) {
return projectPlanInfoService.addPlanInfo(request);
}
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectPlanInfoRequest.java b/business/src/main/java/com/ycl/domain/vo/ProjectPlanInfoRequest.java
index 38745a9..08e020e 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectPlanInfoRequest.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectPlanInfoRequest.java
@@ -3,7 +3,9 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.List;
@@ -11,7 +13,9 @@
@AllArgsConstructor
@NoArgsConstructor
public class ProjectPlanInfoRequest {
- private Integer projectPlanRecordId;
+ private Long projectPlanRecordId;
private BigDecimal actualInvest;
+
+ @NotEmpty(message = "璇疯緭鍏ヨ娣诲姞鐨勮鍒掗」")
private List<ProjectPlanInfoItem> addList;
}
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 b44304c..ac099d8 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
@@ -24,6 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Date;
@@ -135,14 +136,13 @@
@Transactional(rollbackFor = Exception.class)
@Override
public Result addPlanInfo(ProjectPlanInfoRequest request) {
- if (request.getAddList() == null || request.getAddList().isEmpty()) {{
+ if (CollectionUtils.isEmpty(request.getAddList())) {{
return Result.error("璇烽�夋嫨瑕佹坊鍔犵殑璁″垝椤�");
}}
// 鍒犻櫎鍘熸湁璁板綍
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(ProjectPlanInfo::getProjectPlanRecordId, request.getProjectPlanRecordId())
- .set(ProjectPlanInfo::getDeleted, 1)
- .update();
+ .remove();
// 鎵归噺鎻掑叆鏂拌褰�
List<ProjectPlanInfo> list = new ArrayList<>();
request.getAddList().forEach(item -> {
@@ -153,12 +153,9 @@
projectPlanInfo.setProgressStatus(0); // 璁″垝椤硅繘搴︿负鏈紑濮�
projectPlanInfo.setStartTime(item.getStartTime()); // 璁″垝椤瑰紑濮嬫椂闂�
projectPlanInfo.setEndTime(item.getEndTime()); // 璁″垝椤圭粨鏉熸椂闂�
- projectPlanInfo.setDeleted(0);// 鏈垹闄�
list.add(projectPlanInfo);
});
- list.stream().forEach(i -> {
- baseMapper.insert(i);
- });
+ this.saveBatch(list);
// 鏇存柊璁″垝璁板綍鐨勬姇璧�,浠ュ強涓婃姤鐘舵��
new LambdaUpdateChainWrapper<>(projectPlanRecordMapper)
.eq(ProjectPlanRecord::getId, request.getProjectPlanRecordId())
@@ -168,13 +165,11 @@
// 鏂板涓�鏉″鏍歌褰�
ProjectPlanExamineRecord item = new ProjectPlanExamineRecord();
- item.setProjectPlanRecordId(request.getProjectPlanRecordId().longValue());
+ item.setProjectPlanRecordId(request.getProjectPlanRecordId());
item.setEventType(0); // 璁″垝涓婃姤
- item.setGmtCreate(new Date()); // 鍒涘缓鏃堕棿
- item.setDeleted(0); // 鏈垹闄�
list.stream().forEach(i -> {
- item.setProjectPlanInfoId(i.getId().longValue());
- projectPlanExamineRecordMapper.insertOne(item);
+ item.setProjectPlanInfoId(i.getId());
+ projectPlanExamineRecordMapper.insert(item);
});
return Result.ok("娣诲姞鎴愬姛");
}
diff --git a/system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyId.java b/system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyId.java
index a85edae..3ea5747 100644
--- a/system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyId.java
+++ b/system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyId.java
@@ -13,7 +13,7 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private Integer id;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
}
diff --git a/system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyIdAndDeleted.java b/system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyIdAndDeleted.java
index 7312dfd..3009552 100644
--- a/system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyIdAndDeleted.java
+++ b/system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyIdAndDeleted.java
@@ -17,8 +17,8 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private Integer id;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
@TableField(value = "deleted", fill = FieldFill.INSERT)
private Integer deleted;
--
Gitblit v1.8.0