From da8b44cda3ca51dfa0f5be146fd6235d5c155e14 Mon Sep 17 00:00:00 2001
From: wangxl <123456>
Date: Tue, 17 Dec 2024 10:02:02 +0800
Subject: [PATCH] 77
---
.../yiboshi/science/entity/ComProject.java | 7 +++--
.../science/param/dto/ComProjectDTO.java | 7 +++--
.../param/query/ComProjectQueryVO.java | 7 +++--
.../service/impl/ComProjectServiceImpl.java | 26 +++++++++++--------
4 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java b/science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java
index 031c869..55565db 100644
--- a/science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java
+++ b/science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java
@@ -64,10 +64,9 @@ public class ComProject extends BaseEntity {
/** 项目类型 1 科研项目 2重点学科项目 */
@ApiModelProperty(value = "项目名称", position = 1 )
private Integer projType;
- /** 项目类别 */
- @ApiModelProperty(value = "项目类别", position = 3 )
- @Length(max=100, message = "项目类别不能大于100")
- private String projClass;
+ /** 项目类别 (1 一般项目 2重点项目)*/
+ @ApiModelProperty(value = "项目类别 (1 一般项目 2重点项目)", position = 3 )
+ private Integer projClass;
/** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
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 e875171..db9e35f 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
@@ -65,10 +65,9 @@ public class ComProjectDTO extends BaseDTO {
/** 项目类型 1 科研项目 2重点学科项目 */
@ApiModelProperty(value = "项目名称", position = 1 )
private Integer projType;
- /** 项目类别 */
- @ApiModelProperty(value = "项目类别", position = 3 )
- @Length(max=100, message = "项目类别不能大于100")
- private String projClass;
+ /** 项目类别 (1 一般项目 2重点项目)*/
+ @ApiModelProperty(value = "项目类别 (1 一般项目 2重点项目)", position = 3 )
+ private Integer projClass;
/** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java
index e2f888c..aa7af3a 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java
@@ -64,10 +64,9 @@ public class ComProjectQueryVO extends PaginationVO{
/** 项目类型 1 科研项目 2重点学科项目 */
@ApiModelProperty(value = "项目名称", position = 1 )
private Integer projType;
- /** 项目类别 */
- @ApiModelProperty(value = "项目类别", position = 3 )
- @Length(max=100, message = "项目类别不能大于100")
- private String projClass;
+ /** 项目类别 (1 一般项目 2重点项目)*/
+ @ApiModelProperty(value = "项目类别 (1 一般项目 2重点项目)", position = 3 )
+ private Integer projClass;
/** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
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 10596d5..5be5094 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
@@ -345,10 +345,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
dto.setWorkCount(comProjectMembersDTO.getWorkCount());
-
-
-
-
// 项目安排及阶段目标
comProjectStageGoalService.deleteByObjectId(id);
@@ -393,7 +389,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
dto.setUnitPayment(unitPaymentList);
// 项目安排及阶段目标
- List<ComProjectStageGoalDTO> stageGoals = comProjectStageGoalService.getListByObjectId(id);
+ List<ComProjectStageGoalDTO> stageGoals = comProjectStageGoalService.getListByObjectId(id);
dto.setStageGoals(stageGoals);
// 项目课颖设置表
@@ -653,9 +649,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 年度用款计划表
comProjectFundPlanService.deleteByObjectId(id);
// 项目合作单位
- comProjectCooperativeUnitsService.deleteByObjectId(id,1);
+ comProjectCooperativeUnitsService.deleteByObjectId(id, 1);
// 主要参与单位
- comProjectCooperativeUnitsService.deleteByObjectId(id,2);
+ comProjectCooperativeUnitsService.deleteByObjectId(id, 2);
// 购置设备预算明细表
comProjectEquipmentService.deleteByObjectId(id);
// 试制设备预算明细表
@@ -687,6 +683,13 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
@Transactional
public String save(ComProjectDTO dto) {
dto.setFileId(dto.getDownloadId());
+ if (Objects.nonNull(dto.getGovFunding())) {
+ if (dto.getGovFunding().compareTo(new BigDecimal(50)) > -1) {
+ dto.setProjClass(2);
+ } else {
+ dto.setProjClass(1);
+ }
+ }
if (Objects.isNull(dto.getId()))
dto.setId(projectInsert(dto));
else {
@@ -707,11 +710,12 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
comProject.setAppNo(getAppNo());
comProject.setReportYear(comBatchDTO.getYear());
comProject.setBatch(comBatchDTO.getBatch());
+ dto.setSubjectScope("生物医药领域");
comProject.setCompleted(0);
comProject.setAssignState(0);
String id = this.insert(comProject);
dto.setId(id);
- this.saveList(dto,id);
+ this.saveList(dto, id);
comProjectBasicService.insertOrUpdate(dto);
return id;
}
@@ -729,7 +733,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
&& !project.getProjState().equals(CommonEnum.projState.returnModify.getCode()))
throw new BusinessException("项目已上报！");
ComProject comProject = convert2Entity(dto);
- this.saveList(dto,dto.getId());
+ this.saveList(dto, dto.getId());
comProjectBasicService.insertOrUpdate(dto);
return this.update(comProject);
}
@@ -747,7 +751,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id, 1);
// 主要参与单位
- comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), id,2);
+ comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), id, 2);
// 购置设备预算明细表
comProjectEquipmentService.insertEquipmentList(dto.getDeviceList(), id);
// 试制设备预算明细表
@@ -766,7 +770,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// comProjectResearchService.insertList(dto.getProjectResearchList(), id);
// 单位科研项目及资金管理制度表
// comProjectManagementRuleService.insertList(dto.getManagementRuleList(), id);
- // 成果形式
+ // 成果形式
// comProjectResultsService.insertList(dto.getResults(), id);
}
--
2.18.0