Skip to content

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

77

parent aad16c89
Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 84 deletions
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java
View file @ 5138e244
......@@ -101,6 +101,9 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "第三年目标", position = 14 )
@Length(max=500, message = "第三年目标500")
private String year3Goal;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
View file @ 5138e244
......@@ -100,6 +100,9 @@ public class ComProjectBasicDTO extends BaseDTO {
@ApiModelProperty(value = "第三年目标", position = 14 )
@Length(max=500, message = "第三年目标500")
private String year3Goal;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
View file @ 5138e244
......@@ -209,6 +209,23 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "项目组成员_参加单位数", position = 25)
private Integer workCount;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 1 )
@Length(max=36, message = "附件Id不能大于36")
private String downloadId;
/** 附件名 */
@ApiModelProperty(value = "附件名", position = 6)
private String fileName;
/** URL */
@ApiModelProperty(value = "URL", position = 7)
private String downloadUrl;
/** 单位 */
@ApiModelProperty(value = "单位", position = 41)
private String appUnitName;
/** 注册单位类型 */
@ApiModelProperty(value = "注册单位类型", position = 12)
@Length(max=100, message = "注册单位类型不能大于100")
......@@ -230,10 +247,6 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "结束", position = 3)
private String endDateStr;
/** 姓名 */
@ApiModelProperty(value = "姓名", position = 41)
private String appUnitName;
/** 姓名 */
@ApiModelProperty(value = "姓名", position = 41)
private String appPersonName;
......@@ -252,6 +265,9 @@ public class ComProjectDTO extends BaseDTO {
/** 电话号码 */
@ApiModelProperty(value = "电话号码", position = 16)
private String mobile;
/** 地址 */
@ApiModelProperty(value = "地址", position = 3)
private String address;
/** 民族 */
@ApiModelProperty(value = "民族", position = 3)
private String nationName;
......@@ -276,38 +292,17 @@ 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 List<ComProjectEquipmentDTO> equipments;
/** 单位支出明细预算 */
private List<ComProjectUnitPaymentDTO> unitPayment;
/** 项目绩效目标表 */
private ProjectKPIStatisticDTO projectKPI;
/** 项目经费构成表 */
private List<ComProjectFundCompositionDTO> fundCompositions;
/** 在研或完成基础研究项目情况 */
private List<ComProjectResearchDTO> projectResearchList;
/** 项目课颖设置表 */
private List<ComProjectSubDTO> projectSubList;
/** 单位科研项目及资金管理制度表 */
private List<ComProjectManagementRuleDTO> managementRuleList;
/** 附件列表 */
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/param/dto/ComProjectTaskDTO.java
View file @ 5138e244
......@@ -152,4 +152,40 @@ public class ComProjectTaskDTO extends BaseDTO {
/** 项目组成员_硕士(学历) */
@ApiModelProperty(value = "项目组成员_硕士(学历)", position = 25 )
private Integer memDegree2;
/** 合作单位 */
private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
/** 项目主要参与单位 */
private List<ComProjectCooperativeUnitsDTO> participateUnits;
// /** 项目组成员 */
// private List<ComProjectMembersDTO> members;
// /** 经费表 */
// private List<ComProjectBudgetDTO> budget;
/** 年度用款计划 */
private List<ComProjectFundPlanDTO> fundPlan;
/** 设备仪器经费表 */
private List<ComProjectEquipmentDTO> equipments;
/** 单位支出明细预算 */
private List<ComProjectUnitPaymentDTO> unitPayment;
/** 项目绩效目标表 */
private ProjectKPIStatisticDTO projectKPI;
/** 项目经费构成表 */
private List<ComProjectFundCompositionDTO> fundCompositions;
/** 在研或完成基础研究项目情况 */
private List<ComProjectResearchDTO> projectResearchList;
/** 项目课颖设置表 */
private List<ComProjectSubDTO> projectSubList;
/** 单位科研项目及资金管理制度表 */
private List<ComProjectManagementRuleDTO> managementRuleList;
/** 附件列表 */
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/param/query/ComProjectBasicQueryVO.java
View file @ 5138e244
......@@ -99,6 +99,9 @@ public class ComProjectBasicQueryVO extends PaginationVO{
@ApiModelProperty(value = "第三年目标", position = 14 )
@Length(max=500, message = "第三年目标500")
private String year3Goal;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectCooperativeUnitsService.java
View file @ 5138e244
......@@ -23,7 +23,7 @@ public interface ComProjectCooperativeUnitsService extends BaseService<ComProjec
*
* @param objectId
*/
void deleteByObjectId(String objectId);
void deleteByObjectId(String objectId, int type);
/** 插入合作单位
*
* @param list
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCooperativeUnitsServiceImpl.java
View file @ 5138e244
......@@ -57,6 +57,7 @@ public class ComProjectCooperativeUnitsServiceImpl extends BaseServiceImpl<ComPr
for (int i = 0; i < list.size(); i++) {
ComProjectCooperativeUnits item = convert2Entity(list.get(i));
item.setObjectId(objectId);
item.setType(type);
item.setShowIndex(i + 1);
iList.add(item);
}
......@@ -64,9 +65,10 @@ public class ComProjectCooperativeUnitsServiceImpl extends BaseServiceImpl<ComPr
}
}
public void deleteByObjectId(String objectId) {
public void deleteByObjectId(String objectId, int type) {
ComProjectCooperativeUnits model = new ComProjectCooperativeUnits();
model.setObjectId(objectId);
model.setType(type);
this.delete(model);
}
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
View file @ 5138e244
......@@ -254,9 +254,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
//申报单位
ComUnitDTO comUnitDTO = comUnitService.getUnitById(SecurityUserHolder.getUnitId());
if (null != comUnitDTO) {
// dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
// dto.setAddress(comUnitDTO.getUnitAddress());
dto.setAddress(comUnitDTO.getUnitAddress());
//
// dto.setOrganizationCode(comUnitDTO.getOrganizationCode());
// dto.setRegisteredAddress(comUnitDTO.getRegisteredAddress());
......@@ -331,19 +331,15 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
//申报单位
ComUnitDTO comUnitDTO = comUnitService.getUnitById(dto.getAppUnitId());
if (null != comUnitDTO) {
// dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
dto.setAddress(comUnitDTO.getUnitAddress());
}
// 项目合作单位
List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(),1);
dto.setCooperativeUnits(cooperativeUnits);
// 项目主要参与单位
List<ComProjectCooperativeUnitsDTO> participateUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(),2);
dto.setCooperativeUnits(participateUnits);
//获取项目组成员
List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(dto.getId());
dto.setMembers(memList);
......@@ -371,33 +367,33 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
fundPlanList = comProjectFundPlanService.getList();
dto.setFundPlan(fundPlanList);
// 项目经费构成表
List<ComProjectFundCompositionDTO> fundCompositions = comProjectFundCompositionService.getListByObjectId(dto.getId());
dto.setFundCompositions(fundCompositions);
// // 项目经费构成表
// List<ComProjectFundCompositionDTO> fundCompositions = comProjectFundCompositionService.getListByObjectId(dto.getId());
// dto.setFundCompositions(fundCompositions);
// 设备仪器经费表
List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId());
dto.setEquipments(equipmentList);
// // 设备仪器经费表
// List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId());
// dto.setEquipments(equipmentList);
// 单位支出明细预算
List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
dto.setUnitPayment(unitPaymentList);
// // 单位支出明细预算
// List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
// dto.setUnitPayment(unitPaymentList);
// 项目绩效目标表
LoadProjectKPIInfo(dto);
// 在研或完成基础研究项目情况
List<ComProjectResearchDTO> projectResearchList = comProjectResearchService.getListByObjectId(dto.getId());
dto.setProjectResearchList(projectResearchList);
// // 在研或完成基础研究项目情况
// List<ComProjectResearchDTO> projectResearchList = comProjectResearchService.getListByObjectId(dto.getId());
// dto.setProjectResearchList(projectResearchList);
// 项目课颖设置表
List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId());
dto.setProjectSubList(projectSubList);
// // 项目课颖设置表
// List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId());
// dto.setProjectSubList(projectSubList);
// 单位科研项目及资金管理制度表
List<ComProjectManagementRuleDTO> managementRuleList = comProjectManagementRuleService.getListByObjectId(dto.getId());
dto.setManagementRuleList(managementRuleList);
// // 单位科研项目及资金管理制度表
// List<ComProjectManagementRuleDTO> managementRuleList = comProjectManagementRuleService.getListByObjectId(dto.getId());
// dto.setManagementRuleList(managementRuleList);
//附件列表
List<ComFileDTO> fileList = ComFileService.getListByObjectId(dto.getId(), CommonEnum.fileType.project.getCode());
......@@ -669,7 +665,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
if (comProject.getProjState() > CommonEnum.projState.waitSubmit.getCode())
throw new BusinessException("当前项目状态不能删除");
// 项目合作单位
comProjectCooperativeUnitsService.deleteByObjectId(id);
comProjectCooperativeUnitsService.deleteByObjectId(id,1);
// comProjectCooperativeUnitsService.deleteByObjectId(id,2);
// 项目参加人员
comProjectMembersService.deleteByObjectId(id);
// 经费预算
......@@ -677,19 +674,19 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 年度用款计划表
comProjectFundPlanService.deleteByObjectId(id);
// 单位支出明细预算表
comProjectUnitPaymentService.deleteByObjectId(id);
// comProjectUnitPaymentService.deleteByObjectId(id);
// 项目绩效指标表
comProjectKpitDetailService.deleteByObjectId(id);
// 项目经费构成表
comProjectFundCompositionService.deleteByObjectId(id);
// comProjectFundCompositionService.deleteByObjectId(id);
// 仪器、设备
comProjectEquipmentService.deleteByObjectId(id);
// comProjectEquipmentService.deleteByObjectId(id);
// 在研或完成基础研究项目情况
comProjectResearchService.deleteByObjectId(id);
// comProjectResearchService.deleteByObjectId(id);
// 项目课颖设置表
comProjectSubService.deleteByObjectId(id);
// comProjectSubService.deleteByObjectId(id);
// 单位科研项目及资金管理制度表
comProjectManagementRuleService.deleteByObjectId(id);
// comProjectManagementRuleService.deleteByObjectId(id);
// 项目信息表
comProjectBasicService.deleteByProjId(id);
// 附件
......@@ -710,6 +707,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
@Transactional
public String save(ComProjectDTO dto) {
dto.setFileId(dto.getDownloadId());
if (Objects.isNull(dto.getId()))
dto.setId(projectInsert(dto));
else {
......@@ -740,7 +738,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id,1);
// 主要参与单位
comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
// comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
// 项目参加人员
comProjectMembersService.insertList(dto.getMembers(), id);
// 经费预算
......@@ -748,19 +746,19 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 年度用款计划表
comProjectFundPlanService.insertList(dto.getFundPlan(), id);
// 单位支出明细预算表
comProjectUnitPaymentService.insertList(dto.getUnitPayment(), id);
// comProjectUnitPaymentService.insertList(dto.getUnitPayment(), id);
// 项目绩效指标表
comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), id);
// 项目经费构成表
comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
// comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
// 仪器、设备
comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
// comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
// 在研或完成基础研究项目情况
comProjectResearchService.insertList(dto.getProjectResearchList(), id);
// comProjectResearchService.insertList(dto.getProjectResearchList(), id);
// 项目课颖设置表
comProjectSubService.insertList(dto.getProjectSubList(), id);
// comProjectSubService.insertList(dto.getProjectSubList(), id);
// 单位科研项目及资金管理制度表
comProjectManagementRuleService.insertList(dto.getManagementRuleList(), id);
// comProjectManagementRuleService.insertList(dto.getManagementRuleList(), id);
// // 项目安排及阶段目标
// comProjectStageGoalService.insertList(dto.getStageGoals(), id);
......@@ -797,7 +795,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 项目合作单位
comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), comProject.getId(),1);
// 主要参与单位
comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
// comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
// 项目参加人员
comProjectMembersService.insertList(dto.getMembers(), comProject.getId());
// 经费预算
......@@ -805,20 +803,20 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 年度用款计划表
comProjectFundPlanService.insertList(dto.getFundPlan(), comProject.getId());
// 仪器、设备
comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId());
// comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId());
// 单位支出明细预算表
comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId());
// comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId());
// 项目绩效指标表
comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), comProject.getId());
// 项目经费构成表
comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
// comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
// 在研或完成基础研究项目情况
comProjectResearchService.insertList(dto.getProjectResearchList(), comProject.getId());
// comProjectResearchService.insertList(dto.getProjectResearchList(), comProject.getId());
// 项目课颖设置表
comProjectSubService.insertList(dto.getProjectSubList(), comProject.getId());
// comProjectSubService.insertList(dto.getProjectSubList(), comProject.getId());
// 单位科研项目及资金管理制度表
comProjectManagementRuleService.insertList(dto.getManagementRuleList(), comProject.getId());
// comProjectManagementRuleService.insertList(dto.getManagementRuleList(), comProject.getId());
// // 项目安排及阶段目标
// comProjectStageGoalService.insertList(dto.getStageGoals(), id);
// // 成果形式
......@@ -875,14 +873,14 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
}
p.setBudget(item);
}
if (null == p.getEquipments() || p.getEquipments().size() < 4) {
int count = p.getEquipments() == null ? 0 : p.getEquipments().size();
List<ComProjectEquipmentDTO> item = p.getEquipments() == null ? new ArrayList<>() : p.getEquipments();
for (int i = 1; i <= 4 - count; i++) {
item.add(new ComProjectEquipmentDTO());
}
p.setEquipments(item);
}
// if (null == p.getEquipments() || p.getEquipments().size() < 4) {
// int count = p.getEquipments() == null ? 0 : p.getEquipments().size();
// List<ComProjectEquipmentDTO> item = p.getEquipments() == null ? new ArrayList<>() : p.getEquipments();
// for (int i = 1; i <= 4 - count; i++) {
// item.add(new ComProjectEquipmentDTO());
// }
// p.setEquipments(item);
// }
List<String> str = comProjectResultsService.getNameByObjectId(p.getId());
if (p.getProjType().equals(1)) {
WordUtils utl = new WordUtils();
......
science-admin/src/main/resources/mapper/ComPersonDAO.xml
View file @ 5138e244
......@@ -53,6 +53,7 @@
d.name education_name,
e.name title_name,
f.name spec_name,
h.name degree_name,
g.id user_id,
g.username
FROM com_person a
......@@ -62,6 +63,7 @@
left join system_parameter d on a.education = d.id and d.type_id = 8
left join system_parameter e on a.title = e.id and e.type_id = 7
left join system_parameter f on a.spec = f.id and f.type_id = 42
left join system_parameter h on a.degree = h.id and h.type_id = 9
where a.id = #{id}
</select>
<select id="getList" resultType="com.yiboshi.science.param.dto.ComPersonDTO">
......
science-admin/src/main/resources/mapper/ComProjectDAO.xml
View file @ 5138e244
......@@ -44,10 +44,12 @@
ic.unit_link_name,ic.unit_link_mobile,ic.unit_link_email,ic.unit_link_fax,ic.subject_scope,ic.proj_abstract,ic.proj_keywords,
ic.total_funding,ic.gov_funding,ic.unit_funding,ic.self_funding,ic.other_funding,
ic.proj_content,
ic.proj_attribute,ic.remark,ic.year_target,ic.year1_goal,ic.year2_goal,ic.year3_goal
ic.proj_attribute,ic.remark,ic.year_target,ic.year1_goal,ic.year2_goal,ic.year3_goal,
c.id download_id,c.download_url,c.file_name
from com_project a
left join com_project_basic ic on a.id=ic.proj_id
left join system_parameter b on a.knowledge_id=b.id
left join com_download c on ic.file_id=c.id
where a.id = #{id}
</select>
<select id="getProjectReportCountByGov" resultType="com.yiboshi.science.param.dto.DataStatisticsDTO">
......
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