From 906bb577d6ec0535c637a496edcf6bd1f13fcc7f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 22 Apr 2022 10:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=BD=B9=E5=86=9B=E4=BA=BAic=5Fvetera?=
 =?UTF-8?q?ns=E8=A1=A8=E6=96=B0=E5=A2=9EIS=5FHANDLE=5FJOB=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=8A=9E=E7=90=86=E5=85=AC=E7=9B=8A=E6=80=A7=E5=B2=97?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcVeteransDTO.java          | 5 +++++
 .../src/main/java/com/epmet/entity/IcVeteransEntity.java    | 5 +++++
 .../src/main/java/com/epmet/excel/IcVeteransExcel.java      | 6 ++++++
 .../resources/db/migration/V0.0.41__add_is_handle_job.sql   | 3 +++
 4 files changed, 19 insertions(+)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java
index 351b60a933..363dd18934 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java
@@ -89,6 +89,11 @@ public class IcVeteransDTO implements Serializable {
      */
 	private String xjyqk;
 
+    /**
+     * 是否办理公益性岗位,0422新增
+     */
+	private String isHandleJob;
+
     /**
      * 删除标识 0.未删除 1.已删除
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java
index 076d6f33fe..0aa295885b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java
@@ -85,6 +85,11 @@ public class IcVeteransEntity extends BaseEpmetEntity {
      */
 	private String xjyqk;
 
+	/**
+	 * 是否办理公益性岗位,0422新增
+	 */
+	private String isHandleJob;
+
     /**
      * 预留字段1
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java
index 3109a7fa4d..daa0d616bd 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java
@@ -64,6 +64,12 @@ public class IcVeteransExcel {
     @Excel(name = "现就业情况")
     private String xjyqk;
 
+    /**
+     * 是否办理公益性岗位,0422新增
+     */
+    @Excel(name = "是否办理公益性岗位")
+    private String isHandleJob;
+
     @Excel(name = "删除标识 0.未删除 1.已删除")
     private Integer delFlag;
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql
new file mode 100644
index 0000000000..b1a71547c7
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql
@@ -0,0 +1,3 @@
+-- 退役军人表增加此列
+ALTER TABLE ic_veterans ADD COLUMN IS_HANDLE_JOB CHAR(1) COMMENT '是否办理公益性岗位,0422新增' AFTER XJYQK;
+update ic_veterans set ic_veterans.IS_HANDLE_JOB='0' where ic_veterans.IS_HANDLE_JOB is null or ic_veterans.IS_HANDLE_JOB='';
\ No newline at end of file