Tenlion/bt-yjj-system-examination-signup
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改未开班学员档案表准操项目为空的问题

Browse Source
This commit is contained in:
wans 2021-11-17 16:57:55 +08:00
parent 0ed8068f8a
commit bc9ca7caa4
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java
View File

@ -28,6 +28,8 @@ public class ApplyDTO {
private String applyWorkTypeId; private String applyWorkTypeId;
@ApiModelProperty(name = "applyWorkTypeName", value = "报名工种中文名称") @ApiModelProperty(name = "applyWorkTypeName", value = "报名工种中文名称")
private String applyWorkTypeName; private String applyWorkTypeName;
@ApiModelProperty(name = "applyParentWorkTypeName", value = "作业类别")
private String applyParentWorkTypeName;
@ApiModelProperty(name = "applyName", value = "报名人姓名") @ApiModelProperty(name = "applyName", value = "报名人姓名")
private String applyName; private String applyName;
@ApiModelProperty(name = "applySex", value = "报名人性别 1男 2女【数据字典】") @ApiModelProperty(name = "applySex", value = "报名人性别 1男 2女【数据字典】")
@ -659,4 +661,12 @@ public class ApplyDTO {
public void setExamScoreHandsOn(String examScoreHandsOn) { public void setExamScoreHandsOn(String examScoreHandsOn) {
this.examScoreHandsOn = examScoreHandsOn; this.examScoreHandsOn = examScoreHandsOn;
} }
public String getApplyParentWorkTypeName() {
return applyParentWorkTypeName == null ? "" : applyParentWorkTypeName;
}
public void setApplyParentWorkTypeName(String applyParentWorkTypeName) {
this.applyParentWorkTypeName = applyParentWorkTypeName;
}
} }

4
src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java
View File

@ -1196,6 +1196,10 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl
ApplyDTO applyDTO = applyService.get(applyId); ApplyDTO applyDTO = applyService.get(applyId);
if(applyDTO != null){ if(applyDTO != null){
changeDataFormDict(applyDTO); changeDataFormDict(applyDTO);
WorkTypeDTO workTypeDTO = workTypeService.get(applyDTO.getApplyWorkTypeId());
if(workTypeDTO != null){
applyDTO.setApplyParentWorkTypeName(workTypeDTO.getWorkTypeParentName());
}
return applyDTO; return applyDTO;
} else { } else {
ApplyStudentsDTO applyStudentsDTO = studentsService.get(applyId); ApplyStudentsDTO applyStudentsDTO = studentsService.get(applyId);

6
src/main/java/cn/com/tenlion/util/IdCardVerifyUtil.java
View File

@ -195,9 +195,9 @@ public class IdCardVerifyUtil {
} }
public static void main(String[] args) { public static void main(String[] args) {
//boolean isTrue = isIDCard("330622810725323"); boolean isTrue = isIDCard("612701198410267049");
System.out.println(isTrue);
//System.out.println(getIdCardGender("152822199310146919")); System.out.println(getIdCardGender("152822199310146919"));
} }
} }