From d502b67945650a9eeef435622e116e6e94c54bbc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 24 Aug 2022 17:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92=E7=96=AB?= =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6------=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcVaccinePrarmeterDTO.java | 15 ++++++++++++++- .../epmet/entity/IcVaccinePrarmeterEntity.java | 10 ++++++++++ .../com/epmet/excel/IcVaccinePrarmeterExcel.java | 7 +++++++ .../impl/IcVaccinePrarmeterServiceImpl.java | 2 ++ .../resources/mapper/IcVaccinePrarmeterDao.xml | 11 +++++++++-- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index 08c5da3ce1..a7d56eeec7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/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; -} \ No newline at end of file + /** + * 审核状态：0待审核 1审核不通过 2审核通过 + */ + private String checkState; + private String checkStateName; + + /** + * 审核理由 + */ + private String checkReason; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index c5dde0c103..c6b982f80d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/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; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index 02f144d189..01200bb938 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/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; + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 2f5cdc2a83..44050f3a6e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -190,6 +190,8 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl { // 设置客户ID e.setCustomerId(tokenDto.getCustomerId()); + // 设置审核状态为待审核 + e.setCheckState("0"); }); insertBatch(entities); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index b1eb484110..3441859c38 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/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 @@ -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