Skip to content

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

77

parent 03559863
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 85 deletions
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
View file @ 90574225
......@@ -319,25 +319,22 @@ public class ComProjectDTO extends BaseDTO {
private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
/** 项目主要参与单位 */
private List<ComProjectCooperativeUnitsDTO> participateUnits;
/** 项目组成员 */
private List<ComProjectMembersDTO> members;
/** 经费表 */
private List<ComProjectBudgetDTO> budget;
/** 年度用款计划 */
private List<ComProjectFundPlanDTO> fundPlan;
/** 项目绩效目标表 */
private ProjectKPIStatisticDTO projectKPI;
/** 购置设备预算明细表 */
private List<ComProjectEquipmentDTO> equipments;
/** 购置设备预算明细表 */
private List<ComProjectEquipmentDTO> deviceList;
/** 试制设备预算明细表 */
private List<ComProjectManufactureDTO> manufacture;
/** 项目绩效目标表 */
private ProjectKPIStatisticDTO projectKPI;
/** 项目安排及阶段目标 */
private List<ComProjectStageGoalDTO> stageGoals;
/** 项目课颖设置表 */
private List<ComProjectSubDTO> projectSubList;
/** 试制设备预算明细表 */
private List<ComProjectManufactureDTO> manufacture;
/** 附件列表 */
private List<ComFileDTO> fileList;
/** 审核列表 */
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java
View file @ 90574225
......@@ -28,7 +28,7 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro
*
* @return
*/
void updateState(String id, Integer state, String versionNo);
void updateStateOrNo(String id, Integer state, String versionNo);
/**
* 获取新的版本号
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectConclusionServiceImpl.java
View file @ 90574225
......@@ -193,7 +193,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
modal.setId(conclusion.getId());
modal.setState(CommonEnum.conclusionState.report.getCode());
modal.setThesisState(CommonEnum.thesisState.pass.getCode());
comProjectService.updateState(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null);
comProjectService.updateStateOrNo(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null);
comProjectAuditService.report(DateUtils.getYear(), conclusion.getId(), 4, auditUnitId, treeCode);
return this.update(modal);
}
......@@ -210,7 +210,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
Integer state = null;
if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
state = CommonEnum.conclusionState.pass.getCode();
comProjectService.updateState(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
} else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
state = CommonEnum.conclusionState.returnModify.getCode();
} else {
......@@ -236,7 +236,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
Integer state = null;
if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
state = CommonEnum.thesisState.pass.getCode();
comProjectService.updateState(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
} else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
state = CommonEnum.thesisState.returnModify.getCode();
} else {
......@@ -307,7 +307,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
c.setThesisState(CommonEnum.thesisState.unFilled.getCode());
this.update(c);
}
comProjectService.updateState(projId, CommonEnum.projState.conclusion.getCode(), null);
comProjectService.updateStateOrNo(projId, CommonEnum.projState.conclusion.getCode(), null);
comProjectAuditService.insertAudit(comProject.getReportYear(), 4, id, CommonEnum.auditMethod.audit.getCode(),
auditUnitId, null, CommonEnum.auditResult.pass.getCode(), new Date(), 1, 1, SecurityUserHolder.getPersonId());
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
View file @ 90574225
......@@ -239,6 +239,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
}
return "";
}
/**
* 根据id获取项目信息
*/
......@@ -332,14 +333,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
dto.setAppUnitName(comUnitDTO.getUnitName());
}
// 项目合作单位
List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(),1);
dto.setCooperativeUnits(cooperativeUnits);
//获取项目组成员
List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(dto.getId());
dto.setMembers(memList);
ComProjectMembersDTO comProjectMembersDTO = comProjectMembersService.getMemCountById(id);
dto.setMemCount(comProjectMembersDTO.getMemCount());
dto.setMemHighCount(comProjectMembersDTO.getMemHighCount());
......@@ -351,6 +344,14 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
dto.setMemXsCount(comProjectMembersDTO.getMemXsCount());
dto.setWorkCount(comProjectMembersDTO.getWorkCount());
// 项目合作单位
List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(), 1);
dto.setCooperativeUnits(cooperativeUnits);
//获取项目组成员
List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(dto.getId());
dto.setMembers(memList);
//经费表
List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getListByObjectId(dto.getId());
if (null == budgetList || budgetList.size() == 0)
......@@ -369,7 +370,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 购置设备预算明细表
List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId());
dto.setEquipments(equipmentList);
dto.setDeviceList(equipmentList);
// 试制设备预算明细表
List<ComProjectManufactureDTO> manufactureList = comProjectManufactureService.getListByObjectId(dto.getId());
......@@ -403,9 +404,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
fileList = checkNecessaryAttachmentFile(dto.getProjType(), fileList);
dto.setFileList(fileList);
//审核记录列表
List<ComProjectAuditNoteDTO> auditList = comProjectAuditNoteService.getListByObjectId(dto.getId());
dto.setAuditList(auditList);
......@@ -483,7 +481,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
else//临床科技项目
parameterList = systemParameterService.getListByType(13);
parameterList.forEach(e -> {
fileList.add(configureFile(e.getName(), e.getDisplayOrder(),e.getIsRequired()));
fileList.add(configureFile(e.getName(), e.getDisplayOrder(), e.getIsRequired()));
});
return fileList;
}
......@@ -530,8 +528,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
parameterList.forEach(p -> {
List<ComFileDTO> findList = fileList.stream().filter(e -> null != e.getFileExplain() && e.getFileExplain().equals(p.getName())).collect(Collectors.toList());
if (findList.size() == 0) {
ComFileDTO fileDTO = configureFile(p.getName(), p.getDisplayOrder(),p.getIsRequired());
fileList.add( fileDTO);
ComFileDTO fileDTO = configureFile(p.getName(), p.getDisplayOrder(), p.getIsRequired());
fileList.add(fileDTO);
}
});
......@@ -559,7 +557,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
*
* @return
*/
public void updateState(String id, Integer state, String versionNo) {
public void updateStateOrNo(String id, Integer state, String versionNo) {
ComProject comProject = new ComProject();
comProject.setId(id);
comProject.setProjState(state);
......@@ -590,7 +588,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
else
versionNo = this.getVersionNo(comProject.getVersionNo());
// 更新项目状态
this.updateState(model.getAuditObjectId(), CommonEnum.projState.toAudit.getCode(), versionNo);
this.updateStateOrNo(model.getAuditObjectId(), CommonEnum.projState.toAudit.getCode(), versionNo);
}
@Transactional
......@@ -618,7 +616,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
projState = CommonEnum.projState.failed.getCode();
}
if (null != projState)
this.updateState(report.getAuditObjectId(), projState, null);
this.updateStateOrNo(report.getAuditObjectId(), projState, null);
}
public DataStatisticsDTO getCount(ComProject e) {
......@@ -635,7 +633,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
if (comProject.getProjState() > CommonEnum.projState.waitSubmit.getCode())
throw new BusinessException("当前项目状态不能删除");
// 项目合作单位
comProjectCooperativeUnitsService.deleteByObjectId(id,1);
comProjectCooperativeUnitsService.deleteByObjectId(id, 1);
// comProjectCooperativeUnitsService.deleteByObjectId(id,2);
// 项目参加人员
comProjectMembersService.deleteByObjectId(id);
......@@ -704,43 +702,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
comProject.setCompleted(0);
comProject.setAssignState(0);
String id = this.insert(comProject);
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id,1);
// 主要参与单位
// comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
// 项目参加人员
comProjectMembersService.insertList(dto.getMembers(), id);
// 经费预算
comProjectBudgetService.insertBudgetList(dto.getBudget(), id);
// 年度用款计划表
comProjectFundPlanService.insertList(dto.getFundPlan(), id);
// 单位支出明细预算表
// comProjectUnitPaymentService.insertList(dto.getUnitPayment(), id);
// 项目绩效指标表
comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), id);
// 项目经费构成表
// comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
// 购置设备预算明细表
comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
// 试制设备预算明细表
comProjectManufactureService.insertEquipmentList(dto.getManufacture(), id);
// 在研或完成基础研究项目情况
// comProjectResearchService.insertList(dto.getProjectResearchList(), 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);
this.saveList(dto,id);
comProjectBasicService.insertOrUpdate(dto);
return id;
}
......@@ -764,44 +727,48 @@ 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()));
// }
this.saveList(dto,dto.getId());
comProjectBasicService.insertOrUpdate(dto);
return this.update(comProject);
}
@Transactional
public void saveList(ComProjectDTO dto, String id) {
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), comProject.getId(),1);
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id, 1);
// 主要参与单位
// comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
// 项目参加人员
comProjectMembersService.insertList(dto.getMembers(), comProject.getId());
comProjectMembersService.insertList(dto.getMembers(), id);
// 经费预算
comProjectBudgetService.insertBudgetList(dto.getBudget(), comProject.getId());
comProjectBudgetService.insertBudgetList(dto.getBudget(), id);
// 年度用款计划表
comProjectFundPlanService.insertList(dto.getFundPlan(), comProject.getId());
// 购置设备预算明细表
comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId());
// 试制设备预算明细表
comProjectManufactureService.insertEquipmentList(dto.getManufacture(), comProject.getId());
comProjectFundPlanService.insertList(dto.getFundPlan(), id);
// 单位支出明细预算表
// comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId());
// comProjectUnitPaymentService.insertList(dto.getUnitPayment(), id);
// 项目绩效指标表
comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), comProject.getId());
comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), id);
// 项目经费构成表
// comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
// comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
// 购置设备预算明细表
comProjectEquipmentService.insertEquipmentList(dto.getDeviceList(), id);
// 试制设备预算明细表
comProjectManufactureService.insertEquipmentList(dto.getManufacture(), id);
// 在研或完成基础研究项目情况
// comProjectResearchService.insertList(dto.getProjectResearchList(), comProject.getId());
// comProjectResearchService.insertList(dto.getProjectResearchList(), id);
// 项目课颖设置表
// comProjectSubService.insertList(dto.getProjectSubList(), comProject.getId());
// comProjectSubService.insertList(dto.getProjectSubList(), id);
// 单位科研项目及资金管理制度表
// comProjectManagementRuleService.insertList(dto.getManagementRuleList(), comProject.getId());
// comProjectManagementRuleService.insertList(dto.getManagementRuleList(), id);
// // 项目安排及阶段目标
// comProjectStageGoalService.insertList(dto.getStageGoals(), id);
// // 成果形式
// comProjectResultsService.insertList(dto.getResults(), id);
// 附件
ComFileService.insertList(dto.getFileList(), comProject.getId(), CommonEnum.fileType.project.getCode());
comProjectBasicService.insertOrUpdate(dto);
return this.update(comProject);
ComFileService.insertList(dto.getFileList(), id, CommonEnum.fileType.project.getCode());
}
public void export(@PathVariable String id, HttpServletRequest request, HttpServletResponse response) {
ComProjectDTO p = this.getProjectById(id);
if (null != p) {
......
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