Skip to content

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

xujun

parent 0db6cc2e
master
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 17 deletions
science-admin/src/main/java/com/yiboshi/science/enumeration/CommonEnum.java
View file @ fbb8b832
......@@ -372,6 +372,43 @@ public class CommonEnum {
return projState.draft;//For values out of enum scope
}
}
public enum talentState implements INumberEnum {
draft(-10, "起草"),
waitSubmit(10, "待提交"),
toAudit(20, "评审中"),
returnModify(30, "返回修改"),
failed(40, "未批准立项"),
pass(50, "批准立项"),
report(55, "结题上报"),
conclusion(60, "已结题");
talentState(int number, String description) {
this.code = number;
this.description = description;
}
private Integer code;
private String description;
@Override
public Integer getCode() {
return code;
}
@Override
public String getDescription() {
return description;
}
public static talentState getEnum(Integer value) {
for (talentState e : talentState.values()) {
if (e.getCode().equals(value))
return e;
}
return talentState.draft;//For values out of enum scope
}
}
/**
* 论文上传状态
*/
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComTalentApplyDTO.java
View file @ fbb8b832
......@@ -42,6 +42,10 @@ public class ComTalentApplyDTO extends BaseDTO {
/** 人才类别 */
@ApiModelProperty(value = "人才类别")
private String talentCategory;
/** 人才类别名称 */
@ApiModelProperty(value = "人才类别名称")
private String talentCategoryName;
@ApiModelProperty(value = "人才类型")
private String talentType;
......@@ -108,6 +112,9 @@ public class ComTalentApplyDTO extends BaseDTO {
/** 人才申报状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准,50 批准 */
@ApiModelProperty(value = "人才申报状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准,50 批准", position = 7 )
private Integer talentState;
/** 人才申报完成状态 */
@ApiModelProperty(value = "人才申报完成状态")
private String talentStateName;
/** 项目完成状态 */
@ApiModelProperty(value = "项目完成状态")
......@@ -135,6 +142,9 @@ public class ComTalentApplyDTO extends BaseDTO {
/** 学位 */
@ApiModelProperty(value = "学位", position = 9)
private String degree;
/** 学位名称 */
@ApiModelProperty(value = "学位名称", position = 9)
private String degreeName;
/** 最高学位授予时间 */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date degreeTime;
......@@ -148,9 +158,12 @@ public class ComTalentApplyDTO extends BaseDTO {
@ApiModelProperty(value = "党派", position = 9)
private String politicalParty;
/** 民族id */
@ApiModelProperty(value = "民族id", position = 11)
private String nation;
/** 民族 */
@ApiModelProperty(value = "民族", position = 11)
private String nation;
private String nationName;
/** 职务 */
@ApiModelProperty(value = "职务", position = 12)
private String duty;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComTalentApplyController.java
View file @ fbb8b832
......@@ -47,6 +47,8 @@ public class ComTalentApplyController extends BaseController<ComTalentApplyServi
e.setCertId(hideAllIdCardNum(e.getCertId()));
e.setMobile(hideAllPhoneNum(e.getMobile()));
//e.setCertId(AesHelper.encrypt(e.getCertId()));
if (null != e.getTalentState())
e.setTalentStateName(CommonEnum.talentState.getEnum(e.getTalentState()).getDescription());
});
}
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComTalentApplyServiceImpl.java
View file @ fbb8b832
......@@ -81,27 +81,27 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
switch (vo.getTalentState()) {
case 1:
criteria.in("talent_state",
CommonEnum.projState.draft.getCode(),
CommonEnum.projState.waitSubmit.getCode());
CommonEnum.talentState.draft.getCode(),
CommonEnum.talentState.waitSubmit.getCode());
break;
case 2:
criteria.eq("talent_state", CommonEnum.projState.returnModify.getCode());
criteria.eq("talent_state", CommonEnum.talentState.returnModify.getCode());
break;
case 3:
criteria.in("talent_state",
CommonEnum.projState.toAudit.getCode(),
CommonEnum.projState.failed.getCode(),
CommonEnum.projState.pass.getCode(),
CommonEnum.projState.report.getCode(),
CommonEnum.projState.conclusion.getCode());
CommonEnum.talentState.toAudit.getCode(),
CommonEnum.talentState.failed.getCode(),
CommonEnum.talentState.pass.getCode(),
CommonEnum.talentState.report.getCode(),
CommonEnum.talentState.conclusion.getCode());
break;
case 4:
break;
case 5:
criteria.ge("talent_state", CommonEnum.projState.pass.getCode());
criteria.ge("talent_state", CommonEnum.talentState.pass.getCode());
break;
case 6:
criteria.ge("talent_state", CommonEnum.projState.report.getCode());
criteria.ge("talent_state", CommonEnum.talentState.report.getCode());
break;
default:
criteria.eq("talent_state", vo.getTalentState());
......@@ -213,7 +213,7 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
dto.setTotalFund(new BigDecimal(0.00));
dto.setReportYear(comBatchService.getReportYear(null, CommonEnum.timeType.talentApply.getCode()));
dto.setCompleteStatus("0,0,0,0,0,0");
dto.setTalentState(CommonEnum.projState.draft.getCode());
dto.setTalentState(CommonEnum.talentState.draft.getCode());
dto.setAppPersonId(SecurityUserHolder.getPersonId());
dto.setAppUnitId(SecurityUserHolder.getUnitId());
......
science-admin/src/main/resources/mapper/ComTalentApplyDAO.xml
View file @ fbb8b832
......@@ -35,13 +35,16 @@
</select>
<select id="getById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComTalentApplyDTO">
SELECT a.*,b.cert_id,b.person_name,b.sex,b.birthday,b.title,b.spec,b.mobile,
i.name as title_name, j.name as spec_name, k.name as parent_name
SELECT a.*,b.cert_id,b.person_name,b.sex,b.birthday,b.title,b.spec,b.mobile,i.name as title_name, j.name as spec_name,
k.name as parent_name,l.name as talent_category_name, n.name as nation_name, m.name as degree_name
from com_talent_apply a
left join com_person b on a.person_id = b.id
left join system_parameter i on b.title=i.id and i.type_id=7
left join system_parameter j on b.spec=j.id and j.type_id=68
left join system_parameter i on b.title = i.id and i.type_id = 7
left join system_parameter j on b.spec = j.id and j.type_id = 68
left join system_parameter k on j.parent_id = k.id
left join system_parameter l on a.talent_category = l.id and l.type_id = 21
left join system_parameter n on b.nation = n.id and n.type_id = 11
left join system_parameter m on b.degree = m.id and m.type_id = 9
where a.id = #{id}
</select>
</mapper>
\ No newline at end of file
science-admin/src/main/resources/mapper/ComTalentMembersDAO.xml
View file @ fbb8b832
......@@ -46,7 +46,7 @@
</select>
<select id="getListByTalentId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComTalentMembersDTO">
SELECT a.*,d.name duty_name,f.name spec_name
SELECT a.*,d.name title_name,f.name spec_name
FROM com_talent_members a
left join system_parameter d on a.title = d.id and d.type_id = 7
left join system_parameter f on a.spec = f.id and f.type_id = 68
......
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