From fdcbaea8482832536636cb70b37e9d938eb138ff Mon Sep 17 00:00:00 2001
From: xujun <271087757@qq.com>
Date: Wed, 4 Dec 2024 20:36:14 +0800
Subject: [PATCH] xujun
---
.../java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java | 1 -
.../main/java/com/yiboshi/science/param/dto/ComProjectDTO.java | 3 ---
.../java/com/yiboshi/science/param/dto/ComProjectKpitDTO.java | 1 -
.../com/yiboshi/science/param/dto/ProjectKPIStatisticDTO.java | 1 +
.../yiboshi/science/service/impl/ComProjectServiceImpl.java | 1 -
5 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
index 7f662e6..f9cc013 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
@@ -221,7 +221,6 @@ public class ComProjectBasicDTO extends BaseDTO {
@Length(max=500, message = "第三年目标500")
private String year3Goal;
-
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
index 7fc3e50..63f4c02 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
@@ -291,14 +291,11 @@ public class ComProjectDTO extends BaseDTO {
@Length(max=500, message = "第三年目标500")
private String year3Goal;
-
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
private String remark;
-
-
/** 项目组成员_总人数 */
@ApiModelProperty(value = "项目组成员_总人数", position = 17 )
private Integer memCount;
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectKpitDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectKpitDTO.java
index 78659a9..eea9b51 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectKpitDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectKpitDTO.java
@@ -64,5 +64,4 @@ public class ComProjectKpitDTO extends BaseDTO {
/** 年度3指标 */
@ApiModelProperty(value = "年度3指标", position = 7)
private Integer yearValue3;
-
}
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 e8ba69d..81ee72f 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
@@ -39,6 +39,7 @@ public class ProjectKPIStatisticDTO extends BaseDTO {
private String year2Goal;
private String year3Goal;
+
private Integer totalRowSpan; //总合并行数
private Integer outTarget; //一级指标(产出指标)
private Integer benefitTarget; //一级指标(效益指标)
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 1b5b67d..6466e1a 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
@@ -777,7 +777,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 项目绩效指标表
comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), comProject.getId());
-
// 项目经费构成表
comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
// 在研或完成基础研究项目情况
--
2.18.0