diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java index 1d6569c..947b5b8 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java @@ -28,6 +28,8 @@ public class ApplyDTO { private String applyWorkTypeId; @ApiModelProperty(name = "applyWorkTypeName", value = "报名工种中文名称") private String applyWorkTypeName; + @ApiModelProperty(name = "applyParentWorkTypeName", value = "作业类别") + private String applyParentWorkTypeName; @ApiModelProperty(name = "applyName", value = "报名人姓名") private String applyName; @ApiModelProperty(name = "applySex", value = "报名人性别 1男 2女【数据字典】") @@ -659,4 +661,12 @@ public class ApplyDTO { public void setExamScoreHandsOn(String examScoreHandsOn) { this.examScoreHandsOn = examScoreHandsOn; } + + public String getApplyParentWorkTypeName() { + return applyParentWorkTypeName == null ? "" : applyParentWorkTypeName; + } + + public void setApplyParentWorkTypeName(String applyParentWorkTypeName) { + this.applyParentWorkTypeName = applyParentWorkTypeName; + } } diff --git a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java index d261787..312b1ee 100644 --- a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java @@ -1196,6 +1196,10 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl ApplyDTO applyDTO = applyService.get(applyId); if(applyDTO != null){ changeDataFormDict(applyDTO); + WorkTypeDTO workTypeDTO = workTypeService.get(applyDTO.getApplyWorkTypeId()); + if(workTypeDTO != null){ + applyDTO.setApplyParentWorkTypeName(workTypeDTO.getWorkTypeParentName()); + } return applyDTO; } else { ApplyStudentsDTO applyStudentsDTO = studentsService.get(applyId); diff --git a/src/main/java/cn/com/tenlion/util/IdCardVerifyUtil.java b/src/main/java/cn/com/tenlion/util/IdCardVerifyUtil.java index 202a2c0..0545dc7 100644 --- a/src/main/java/cn/com/tenlion/util/IdCardVerifyUtil.java +++ b/src/main/java/cn/com/tenlion/util/IdCardVerifyUtil.java @@ -195,9 +195,9 @@ public class IdCardVerifyUtil { } public static void main(String[] args) { - //boolean isTrue = isIDCard("330622810725323"); - - //System.out.println(getIdCardGender("152822199310146919")); + boolean isTrue = isIDCard("612701198410267049"); + System.out.println(isTrue); + System.out.println(getIdCardGender("152822199310146919")); } }