修改sql

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/PersonTestingExcel.java

@@ -29,9 +29,6 @@ import lombok.Data;
 @Data
 public class PersonTestingExcel {
 
-//    @Excel(name = "ID")
-//    private String id;
-
     @Excel(name = "姓名")
     private String name;
 
@@ -56,35 +53,7 @@ public class PersonTestingExcel {
     @Excel(name = "签发机关")
     private String organ;
 
-//    @Excel(name = "照片base64编码")
-//    private String imgCode;
-//
-//    @Excel(name = "照片地址")
-//    private String imgUrl;
-
-//    @Excel(name = "核酸接测结果")
-//    private String testingResult;
-
     @Excel(name = "核酸检测时间")
     private String testingTime;
 
-//    @Excel(name = "乐观锁")
-//    private Integer revision;
-//
-//    @Excel(name = "创建人")
-//    private String createdBy;
-//
-//    @Excel(name = "创建时间")
-//    private Date createdTime;
-//
-//    @Excel(name = "更新人")
-//    private String updatedBy;
-//
-//    @Excel(name = "更新时间")
-//    private Date updatedTime;
-//
-//    @Excel(name = "逻辑删除标识")
-//    private String delFlag;
-
-
 }

epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml

@@ -32,25 +32,16 @@
         LEFT JOIN (
         SELECT
         i.ID_CARD,
-        i.HELP_STATUS,
-        i.FAMILY_CATEGORY,
-        i.VACCINATION_NUM,
-        i.VACCINATION_STATE,
-        i.HOUSEHOLD_REGISTER_DETAIL AS HOUSE_ADDRESS,
-        h.GRID_ID,
-        substring_index(h.ALL_DEPT_NAMES, '-' ,- 1) AS grid_name,
-        h.PARENT_DEPT_IDS,
-        h.PARENT_DEPT_NAMES,
-        h.ALL_DEPT_IDS,
-        h.ALL_DEPT_NAMES
+        i.DEPT_ID AS GRID_ID,
+        substring_index( i.ALL_DEPT_NAMES, '-',- 1 ) AS grid_name,
+        i.PARENT_DEPT_IDS,
+        i.PARENT_DEPT_NAMES,
+        i.ALL_DEPT_IDS,
+        i.ALL_DEPT_NAMES
         FROM
         epidemic_user_info i
-        LEFT JOIN epdc_house_resident r ON r.RESIDENT_ID = i.id
-        LEFT JOIN epdc_housing_information h ON h.id = r.HOUSE_ID
         WHERE
         i.DEL_FLAG = 0
-        AND r.DEL_FLAG = 0
-        AND h.DEL_FLAG = 0
         ) t2 ON t2.ID_CARD = t.IDCARD
         WHERE
         t.DEL_FLAG = 0