Skip to content

Y
yn-health-science
Commit b8c1b70e authored by wangxl's avatar wangxl
Browse files
Options

111

parent 02e6375c
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 80 deletions
science-admin/src/main/java/com/yiboshi/science/enumeration/CommonEnum.java
View file @ b8c1b70e
......@@ -60,8 +60,8 @@ public class CommonEnum {
}
public enum projType implements INumberEnum {
num(1, "内蒙古自治区卫生健康领域科技计划项目"),
key(2, "内蒙古自治区首府地区公立医院高水平临床专科建设科技项目");
num(1, "卫生健康领域科技计划项目"),
key(2, "公立医院高水平临床专科建设科技项目");
projType(int number, String description) {
this.code = number;
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
View file @ b8c1b70e
......@@ -367,27 +367,29 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "专业", position = 8)
private String specName;
/** 成果形式 */
// private List<ComProjectResultsDTO> results;
private List<String> results;
/** 项目组成员 */
private List<ComProjectMembersDTO> members;
/** 合作单位 */
private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
/** 项目安排及阶段目标 */
private List<ComProjectStageGoalDTO> stageGoals;
/** 项目经费构成表 */
private List<ComProjectFundCompositionDTO> fundCompositions;
/** 项目组成员 */
private List<ComProjectMembersDTO> members;
/** 经费表 */
private List<ComProjectBudgetDTO> budget;
/** 项目经费构成表 */
private List<ComProjectFundCompositionDTO> fundCompositions;
/** 设备仪器经费表 */
private List<ComProjectEquipmentDTO> equipments;
/** 项目课颖设置表 */
private List<ComProjectSubDTO> projectSubList;
/** 单位科研项目及资金管理制度表 */
private List<ComProjectManagementRuleDTO> managementRuleList;
/** 设备仪器经费表 */
private List<ComProjectEquipmentDTO> equipments;
/** 附件列表 */
private List<ComFileDTO> fileList;
/** 审核列表 */
private List<ComProjectAuditNoteDTO> auditList;
/** 项目安排及阶段目标 */
private List<ComProjectStageGoalDTO> stageGoals;
/** 成果形式 */
// private List<ComProjectResultsDTO> results;
private List<String> results;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
View file @ b8c1b70e
......@@ -65,6 +65,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
@Autowired
private ComProjectEquipmentService comProjectEquipmentService;
@Autowired
private ComProjectSubService comProjectSubService;
@Autowired
private ComProjectManagementRuleService comProjectManagementRuleService;
@Autowired
private ComFileService ComFileService;
@Autowired
private ComPersonService comPersonService;
......@@ -230,6 +234,42 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
}
return "";
}
/**
* 根据id获取项目信息
*/
public ComProjectDTO getNewProject(Integer projType) {
ComProjectDTO dto = new ComProjectDTO();
if (Objects.isNull(projType)) {
projType = CommonEnum.projType.num.getCode();
}
//申报单位
ComUnitDTO comUnitDTO = comUnitService.dtoById(SecurityUserHolder.getUnitId());
if (null != comUnitDTO) {
dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
dto.setOrganizationCode(comUnitDTO.getUnitAddress());
dto.setAddress(comUnitDTO.getUnitAddress());
dto.setLegalPerson(comUnitDTO.getUnitAddress());
dto.setDepositBank(comUnitDTO.getUnitAddress());
dto.setBankAccount(comUnitDTO.getUnitAddress());
dto.setDepositBankAddress(comUnitDTO.getUnitAddress());
dto.setInterbankNumber(comUnitDTO.getUnitAddress());
}
//经费表
List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList(projType);
dto.setBudget(budgetList);
// 附件
List<ComFileDTO> fileList = processAttachmentList(projType);
dto.setFileList(fileList);
dto.setReportYear(comBatchService.getReportYear(projType));
dto.setProjType(projType);
dto.setProjState(CommonEnum.projState.draft.getCode());
dto.setAppPersonId(SecurityUserHolder.getPersonId());
dto.setAppUnitId(SecurityUserHolder.getUnitId());
return dto;
}
/**
* 根据id获取项目信息
......@@ -249,29 +289,20 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
ComUnitDTO comUnitDTO = comUnitService.getUnitById(dto.getAppUnitId());
if (null != comUnitDTO) {
dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
dto.setOrganizationCode(comUnitDTO.getUnitAddress());
dto.setAddress(comUnitDTO.getUnitAddress());
if (comUnitDTO.getTreeCode().length() > (properties.getDefaultCodeLength() * 3));
dto.setLegalPerson(comUnitDTO.getUnitAddress());
dto.setDepositBank(comUnitDTO.getUnitAddress());
dto.setBankAccount(comUnitDTO.getUnitAddress());
dto.setDepositBankAddress(comUnitDTO.getUnitAddress());
dto.setInterbankNumber(comUnitDTO.getUnitAddress());
}
// 项目合作单位
List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId());
dto.setCooperativeUnits(cooperativeUnits);
// 成果形式
List<String> results = comProjectResultsService.getArrayByObjectId(dto.getId());
dto.setResults(results);
// 项目安排及阶段目标
List<ComProjectStageGoalDTO> stageGoals = comProjectStageGoalService.getListByObjectId(dto.getId());
dto.setStageGoals(stageGoals);
// 项目经费构成表
List<ComProjectFundCompositionDTO> fundCompositions = comProjectFundCompositionService.getListByObjectId(dto.getId());
dto.setFundCompositions(fundCompositions);
//获取项目组成员
List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(dto.getId());
dto.setMembers(memList);
......@@ -306,6 +337,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
}
}
}
//申报人学历统计
if (!StringUtils.isEmpty(comPersonDTO.getEducationName())) {
switch (comPersonDTO.getEducationName()) {
......@@ -327,17 +359,28 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
}
}
//经费表
List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getListByObjectId(dto.getId());
if (null == budgetList || budgetList.size() == 0)
budgetList = comProjectBudgetService.getList(dto.getProjType());
dto.setBudget(budgetList);
// 项目经费构成表
List<ComProjectFundCompositionDTO> fundCompositions = comProjectFundCompositionService.getListByObjectId(dto.getId());
dto.setFundCompositions(fundCompositions);
// 设备仪器经费表
List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId());
dto.setEquipments(equipmentList);
// 项目课颖设置表
List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId());
dto.setProjectSubList(projectSubList);
// 单位科研项目及资金管理制度表
List<ComProjectManagementRuleDTO> managementRuleList = comProjectManagementRuleService.getListByObjectId(dto.getId());
dto.setManagementRuleList(managementRuleList);
//附件列表
List<ComFileDTO> fileList = ComFileService.getListByObjectId(dto.getId(), CommonEnum.fileType.project.getCode());
if (null == fileList || fileList.size() == 0)
......@@ -390,46 +433,13 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
return fileList;
}
/**
* 根据id获取项目信息
*/
public ComProjectDTO getNewProject(Integer projType) {
ComProjectDTO dto = new ComProjectDTO();
//申报人
ComPersonDTO comPersonDTO = comPersonService.getPersonById(SecurityUserHolder.getPersonId());
if (null != comPersonDTO) {
loadPersonInfo(dto, comPersonDTO);
}
//申报单位
ComUnitDTO comUnitDTO = comUnitService.dtoById(SecurityUserHolder.getUnitId());
if (null != comUnitDTO) {
dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setAddress(comUnitDTO.getUnitAddress());
}
//经费表
List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList(projType);
dto.setBudget(budgetList);
if (Objects.isNull(projType)) {
projType = CommonEnum.projType.num.getCode();
}
//学术委员会审查意见
List<ComFileDTO> fileList = processAttachmentList(projType);
dto.setFileList(fileList);
dto.setReportYear(comBatchService.getReportYear(projType));
dto.setProjType(projType);
dto.setProjState(CommonEnum.projState.draft.getCode());
dto.setAppPersonId(SecurityUserHolder.getPersonId());
dto.setAppUnitId(SecurityUserHolder.getUnitId());
return dto;
}
private List<ComFileDTO> processAttachmentList(Integer projType) {
List<ComFileDTO> fileList = new ArrayList<>();
List<SystemParameter> parameterList;
//健康领域科技项目
if (projType == CommonEnum.projType.num.getCode())
parameterList = systemParameterService.getListByType(61);
......@@ -634,20 +644,27 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
comProject.setCompleted(0);
comProject.setAssignState(0);
String id = this.insert(comProject);
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id);
// 项目参加人员
comProjectMembersService.insertList(dto.getMembers(), id);
// 经费预算
comProjectBudgetService.insertBudgetList(dto.getBudget(), id);
// 仪器、设备
comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id);
// 成果形式
comProjectResultsService.insertList(dto.getResults(), id);
// 项目安排及阶段目标
comProjectStageGoalService.insertList(dto.getStageGoals(), id);
// 项目经费构成表
comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
// 仪器、设备
comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
// 项目课颖设置表
comProjectSubService.insertList(dto.getProjectSubList(), id);
// 单位科研项目及资金管理制度表
comProjectManagementRuleService.insertList(dto.getManagementRuleList(), id);
// // 项目安排及阶段目标
// comProjectStageGoalService.insertList(dto.getStageGoals(), id);
// // 成果形式
// comProjectResultsService.insertList(dto.getResults(), id);
// 附件
ComFileService.insertList(dto.getFileList(), id, CommonEnum.fileType.project.getCode());
dto.setId(id);
......@@ -674,20 +691,25 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// if (null != knowledgeId && null != comProject.getKnowledgeId() && !knowledgeId.equals(comProject.getKnowledgeId())) {
// comProject.setProjNo(getProjectNo(comProject.getReportYear(), systemParameterService.getParameterById(comProject.getKnowledgeId()).getGbCode()));
// }
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), comProject.getId());
// 项目参加人员
comProjectMembersService.insertList(dto.getMembers(), comProject.getId());
// 经费预算
comProjectBudgetService.insertBudgetList(dto.getBudget(), comProject.getId());
// 仪器、设备
comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId());
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), comProject.getId());
// 成果形式
comProjectResultsService.insertList(dto.getResults(), comProject.getId());
// 项目安排及阶段目标
comProjectStageGoalService.insertList(dto.getStageGoals(), comProject.getId());
// 项目经费构成表
comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
// 仪器、设备
comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId());
// 项目课颖设置表
comProjectSubService.insertList(dto.getProjectSubList(), comProject.getId());
// 单位科研项目及资金管理制度表
comProjectManagementRuleService.insertList(dto.getManagementRuleList(), comProject.getId());
// // 项目安排及阶段目标
// comProjectStageGoalService.insertList(dto.getStageGoals(), id);
// // 成果形式
// comProjectResultsService.insertList(dto.getResults(), id);
// 附件
ComFileService.insertList(dto.getFileList(), comProject.getId(), CommonEnum.fileType.project.getCode());
comProjectBasicService.insertOrUpdate(dto);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment