Merge remote-tracking branch 'origin/dev_optimize' into develop

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java

@@ -1,13 +1,13 @@
 
 package com.epmet.dto.result;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
 import java.io.Serializable;
 
 /**
  * desc:房屋列表结果类
+ *
  * @author liujianjun
  */
 @Data
@@ -20,7 +20,7 @@ public class IcHouseListResultDTO implements Serializable {
 
     private String doorName;
 
-    private String agencyId;
+
     private String buildingId;
     private String houseName;
 
@@ -30,30 +30,56 @@ public class IcHouseListResultDTO implements Serializable {
     private String purposeKey;
 
     private String unitNumKey;
-    @Excel(name = "所属组织")
+    /**
+     * 所属组织
+     */
     private String agencyName;
-    @Excel(name = "所属网格")
+    private String agencyId;
+    /**
+     * 所属网格
+     */
     private String gridName;
-    @Excel(name = "所属小区")
+    private String gridId;
+    /**
+     * 所属小区
+     */
     private String neighborHoodName;
-    @Excel(name = "所属楼栋")
+    /**
+     * 所属楼栋
+     */
     private String buildingName;
-    @Excel(name = "单元号")
+    /**
+     * 单元号
+     */
     private String unitNum;
-    @Excel(name = "房屋类型")
+    /**
+     * 房屋类型
+     */
     private String houseType;
-    @Excel(name = "房屋用途")
+    private String houseTypeKey;
+    /**
+     * 房屋用途
+     */
     private String purpose;
-    @Excel(name = "是否出租")
+    /**
+     * 是否出租
+     */
     private Integer rentFlagKey;
-    @Excel(name = "房主姓名")
+
+    /**
+     * 房主姓名
+     */
     private String ownerName;
-    @Excel(name = "房主电话")
+    /**
+     * 房主电话
+     */
     private String ownerPhone;
-    @Excel(name = "房主身份证")
+    /**
+     * 房主身份证
+     */
     private String ownerIdCard;
-    private String gridId;
 
-    private String houseTypeKey;
+
+
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -106,8 +106,6 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         }
         IcHouseDTO icHouseDTO= ConvertUtils.sourceToTarget(formDTO, IcHouseDTO.class);
         icHouseDTO.setCustomerId(customerId);
-//        icHouseDTO.setRentFlag(formDTO.getRentFlag());
-
         icHouseDTO.setHouseName(getHouseName(formDTO));
         icHouseService.save(icHouseDTO);
     }

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

@@ -228,6 +228,9 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
             e.setPid(agencyInfo.getPid());
             e.setPids(agencyInfo.getPids());
             e.setCustomerId(formDTO.getCustomerId());
+            if ("2".equals(e.getAttentionType())) {
+                e.setReason("有重点区域行程");
+            }
         });
         insertBatch(entities);
         //新增通知表信息