Skip to content

Y
yn-health-science
Commit dda0055b authored by 徐俊's avatar 徐俊
Browse files
Options

Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-health-science

parents f4f3d833 6e99c126
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 29 deletions
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java
View file @ dda0055b
......@@ -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 @ dda0055b
......@@ -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 @ dda0055b
......@@ -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 @ dda0055b
......@@ -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 @ dda0055b
......@@ -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 @ dda0055b
......@@ -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 @ dda0055b
......@@ -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/resources/mapper/ComPersonDAO.xml
View file @ dda0055b
......@@ -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 @ dda0055b
......@@ -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