isAgencyUserDesc

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

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,
+            r.IS_AGENCY_USER,
-            ( CASE WHEN r.IS_AGENCY_USER = '0' THEN '否' ELSE '是' END ) AS isResiUserDesc,
+            ( CASE WHEN r.IS_AGENCY_USER = '0' THEN '否' ELSE '是' END ) AS isAgencyUserDesc,
             C.MOBILE AS realMobile,
             C.ID_CARD AS realIdCard,
             r.STAFF_ID,