From c9340eb557ef0ddd1f64398a1b943fbd24d8236d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 27 Sep 2022 15:49:39 +0800 Subject: [PATCH] isAgencyUserDesc --- .../src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java | 4 ++-- .../src/main/resources/mapper/IcNatCompareRecordDao.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java index acd0c28306..3b7af8fea0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java @@ -67,11 +67,11 @@ public class IcNatCompareRecordDTO implements Serializable { * 是否客户下居民(0:否 1:是) */ @ExcelIgnore - private String isResiUser; + private String isAgencyUser; @ColumnWidth(10) @ExcelProperty("本辖区居民") - private String isResiUserDesc; + private String isAgencyUserDesc; /** * 是本辖区的居民时候，ic_resi_user.id diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml index 39ac58bbe2..3ab38f5b33 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml @@ -16,8 +16,8 @@ ( CASE WHEN c.NAT_RESULT = '1' THEN '阳性' when c.NAT_RESULT = '0' THEN '阴性' ELSE '' END ) AS natResultDesc, - c.IS_RESI_USER, - ( CASE WHEN r.IS_AGENCY_USER = '0' THEN '否' ELSE '是' END ) AS isResiUserDesc, + r.IS_AGENCY_USER, + ( CASE WHEN r.IS_AGENCY_USER = '0' THEN '否' ELSE '是' END ) AS isAgencyUserDesc, C.MOBILE AS realMobile, C.ID_CARD AS realIdCard, r.STAFF_ID,