新冠病毒疫苗接种人员信息台账------添加审核状态字段

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java

@@ -90,6 +90,7 @@ public class IcVaccinePrarmeterDTO implements Serializable {
      * 户口性质：0户籍 1外来
      */
 	private String householdType;
+    private String householdTypeName;
 
     /**
      * 姓名
@@ -110,6 +111,7 @@ public class IcVaccinePrarmeterDTO implements Serializable {
      * 是否接种：0否1是
      */
 	private String isVaccination;
+    private String isVaccinationName;
 
     /**
      * 第一次接种时间
@@ -181,4 +183,15 @@ public class IcVaccinePrarmeterDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 审核状态：0待审核 1审核不通过 2审核通过
+     */
+    private String checkState;
+    private String checkStateName;
+
+    /**
+     * 审核理由
+     */
+    private String checkReason;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java

@@ -151,4 +151,14 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity {
      */
 	private String note;
 
+	/**
+	 * 审核状态：0待审核 1审核不通过 2审核通过
+	 */
+	private String checkState;
+
+	/**
+	 * 审核理由
+	 */
+	private String checkReason;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java

@@ -74,5 +74,12 @@ public class IcVaccinePrarmeterExcel {
     @Excel(name = "备注")
     private String note;
 
+    @Excel(name = "审核状态", replace = {"待审核_0","审核不通过_1","审核通过_2"})
+    private String checkState;
+
+    @Excel(name = "审核理由")
+    private String checkReason;
+
+
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java

@@ -190,6 +190,8 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
                 entities.forEach(e -> {
                     // 设置客户ID
                     e.setCustomerId(tokenDto.getCustomerId());
+                    // 设置审核状态为待审核
+                    e.setCheckState("0");
                 });
                 insertBatch(entities);
             }

epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml

@@ -73,7 +73,9 @@
             CREATED_BY,
             CREATED_TIME,
             UPDATED_BY,
-            UPDATED_TIME
+            UPDATED_TIME,
+            CHECK_STATE,
+            CHECK_REASON
         from ic_vaccine_prarmeter
         where DEL_FLAG = 0
         <if test="name != null and name != ''">
@@ -123,10 +125,12 @@
             HOME_ID,
             HOME_NAME,
             HOUSEHOLD_TYPE,
+            (case HOUSEHOLD_TYPE when '0' then '户籍' when '1' then '外来' else '' end) as householdTypeName,
             NAME,
             MOBILE,
             ID_CARD,
             IS_VACCINATION,
+            (case IS_VACCINATION when '0' then '否' when '1' then '是' else '' end) as isVaccinationName,
             FIRST_VAC_TIME,
             FIRST_VAC_SITE,
             SECOND_VAC_TIME,
@@ -140,7 +144,10 @@
             CREATED_BY,
             CREATED_TIME,
             UPDATED_BY,
-            UPDATED_TIME
+            UPDATED_TIME,
+            CHECK_STATE,
+            (case CHECK_STATE when '0' then '待审核' when '1' then '审核不通过' when '2' then '审核通过' else '' end) as checkStateName,
+            CHECK_REASON
         from ic_vaccine_prarmeter
         where DEL_FLAG = 0
         <if test="name != null and name != ''">