From a1924e46b21171e4f73dc8c100cee94a3ee00012 Mon Sep 17 00:00:00 2001
From: xujun <271087757@qq.com>
Date: Thu, 5 Dec 2024 20:50:01 +0800
Subject: [PATCH] xujun
---
.../param/dto/ProjectKPIStatisticDTO.java | 3 +++
.../impl/ComProjectKpitDetailServiceImpl.java | 17 +++++++++++------
.../service/impl/ComProjectServiceImpl.java | 5 ++++-
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ProjectKPIStatisticDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ProjectKPIStatisticDTO.java
index 81ee72f..86fd5ff 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ProjectKPIStatisticDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ProjectKPIStatisticDTO.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
@@ -17,6 +18,8 @@ public class ProjectKPIStatisticDTO extends BaseDTO {
private String appUnitName;
private String projAttribute;
private String projDeadline;
+ private Date startDate;
+ private Date endDate;
/** 总预算数 */
@ApiModelProperty(value = "总预算数", position = 3)
private BigDecimal totalBudget;
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitDetailServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitDetailServiceImpl.java
index 2881b74..e538777 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitDetailServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitDetailServiceImpl.java
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -44,17 +45,21 @@ public class ComProjectKpitDetailServiceImpl extends BaseServiceImpl<ComProjectK
}
public void insertList(List<ComProjectKpitDetailDTO> list, String objectId) {
- ComProjectKpitDetail model =new ComProjectKpitDetail();
- model.setObjectId(objectId);
- this.delete(model);
+// ComProjectKpitDetail model =new ComProjectKpitDetail();
+// model.setObjectId(objectId);
+// this.delete(model);
if (null != list) {
- List<ComProjectKpitDetail> iList = new ArrayList<>();
+ //List<ComProjectKpitDetail> iList = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
ComProjectKpitDetail item = convert2Entity(list.get(i));
item.setObjectId(objectId);
- iList.add(item);
+ if (item.getId().equals(item.getKpitId()))
+ this.insert(item);
+ else
+ this.update(item);
+ //iList.add(item);
}
- this.insertBatch(iList);
+ //this.insertBatch(iList);
}
}
public void deleteByObjectId(String objectId){
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
index 33163d0..e7e5104 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
@@ -398,8 +398,11 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
kpiDTO.setYear1Goal(dto.getYear1Goal());
kpiDTO.setYear2Goal(dto.getYear2Goal());
kpiDTO.setYear3Goal(dto.getYear3Goal());
- if (Objects.nonNull(dto.getStartDate()) && Objects.nonNull(dto.getEndDate()))
+ if (Objects.nonNull(dto.getStartDate()) && Objects.nonNull(dto.getEndDate())) {
+ kpiDTO.setStartDate(dto.getStartDate());
+ kpiDTO.setEndDate(dto.getEndDate());
kpiDTO.setProjDeadline(DateUtils.FormatDate(dto.getStartDate()) + "至" + DateUtils.FormatDate(dto.getEndDate()));
+ }
List<ComProjectBudgetDTO> budgetDTO = dto.getBudget();
if (null != budgetDTO) {
// 资金总额
--
2.18.0