From bc9ca7caa4f6b501d1e8d3d516b63e3de0f71ca2 Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Wed, 17 Nov 2021 16:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=BC=80=E7=8F=AD?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=A1=A3=E6=A1=88=E8=A1=A8=E5=87=86=E6=93=8D?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java  | 10 ++++++++++
 .../service/classplan/impl/ClassPlanServiceImpl.java   |  4 ++++
 .../java/cn/com/tenlion/util/IdCardVerifyUtil.java     |  6 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)

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"));
     }
 
 }