Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation

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

@@ -78,4 +78,10 @@ public class HouseInfoDTO implements Serializable {
     private String allName;
 
     private String customerId;
+
+    private String agencyId;
+    /**
+     * eg：市北区-阜新路街道-南宁社区
+     */
+    private String agencyPathName;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -291,4 +291,16 @@ public class HouseController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * 获取房屋信息
+     * @param houseId
+     * @return
+     */
+    @PostMapping("gethouseinfo/{houseId}")
+    public Result<HouseInfoDTO> getHouseInfo(@LoginUser TokenDto tokenDto,@PathVariable("houseId") String houseId){
+        if(StringUtils.isBlank(houseId)){
+            return new Result<>();
+        }
+        return new Result<HouseInfoDTO>().ok(houseService.getHouseInfoDTO(tokenDto.getCustomerId(),houseId));
+    }
 }

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

@@ -26,7 +26,6 @@ import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.excel.IcHouseExcel;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
@@ -78,4 +77,6 @@ public interface HouseService {
      * @date 2022/3/1 4:57 下午
      */
     void allDelete(NeighborHoodManageDelFormDTO formDTO);
+
+    HouseInfoDTO getHouseInfoDTO(String customerId,String houseId);
 }

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

@@ -13,7 +13,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerGridConstant;
@@ -455,4 +457,16 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             }
         }
     }
+
+    @Override
+    public HouseInfoDTO getHouseInfoDTO(String customerId, String houseId) {
+        HouseInfoDTO houseInfo = icHouseRedis.getHouseInfo(houseId, customerId);
+        if (null != houseInfo && StringUtils.isNotBlank(houseInfo.getAgencyId())) {
+            AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(houseInfo.getAgencyId());
+            houseInfo.setAgencyPathName(agencyInfoCache.getAllParentName().concat(StrConstant.HYPHEN).concat(agencyInfoCache.getOrganizationName()));
+        } else {
+            houseInfo.setAgencyPathName(StrConstant.EPMETY_STR);
+        }
+        return houseInfo;
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -368,7 +368,8 @@
         IFNULL(ib.LONGITUDE,'') as buildingLongitude,
         IFNULL(ib.LATITUDE,'') as buildingLatitude,
         ih.CUSTOMER_ID AS customerId,
-        concat(IFNULL(n.NEIGHBOR_HOOD_NAME,''),IFNULL(ib.BUILDING_NAME,''),IFNULL(u.UNIT_NAME,''),IFNULL(ih.HOUSE_NAME,'')) AS allName
+        concat(IFNULL(n.NEIGHBOR_HOOD_NAME,''),IFNULL(ib.BUILDING_NAME,''),IFNULL(u.UNIT_NAME,''),IFNULL(ih.HOUSE_NAME,'')) AS allName,
+        n.AGENCY_ID as agencyId
         FROM ic_house ih
         left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id AND n.DEL_FLAG = '0')
         left JOIN ic_building ib ON ( ih.BUILDING_ID = ib.id AND ib.DEL_FLAG = '0')

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java

@@ -68,7 +68,7 @@ public class IcTripReportFormDTO implements Serializable {
     /**
      * 现居地编码
      */
-    @NotBlank(message = "现居地编码不能为空", groups = {ResiUserRequired.class,PcAddRequired.class,PcUpdateRequired.class})
+    @NotBlank(message = "现居地编码不能为空", groups = {ResiUserRequired.class})
     private String presentAddressCode;
 
     /**
@@ -86,7 +86,7 @@ public class IcTripReportFormDTO implements Serializable {
     /**
      * 来源地区编码
      */
-    @NotBlank(message = "来自地区编码不能为空", groups = {ResiUserRequired.class,PcAddRequired.class,PcUpdateRequired.class})
+    @NotBlank(message = "来自地区编码不能为空", groups = {ResiUserRequired.class})
     private String sourceAddressCode;
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DemandUserResDTO.java

@@ -13,4 +13,5 @@ public class DemandUserResDTO implements Serializable {
     private String gridId;
     private String idCard;
     private String agencyId;
+    private String houseId;
 }

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.31__modifty_trip_reportv2.sql

@@ -0,0 +1,2 @@
+alter table ic_trip_report_record MODIFY COLUMN PRESENT_ADDRESS_CODE VARCHAR(32) COMMENT '现居地编码';
+alter table ic_trip_report_record MODIFY COLUMN SOURCE_ADDRESS_CODE VARCHAR(32) COMMENT '来源地区编码';

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -302,7 +302,8 @@
         concat(ir.`NAME`,'(',ir.MOBILE,')')as label,
         ir.grid_id as gridId,
         ir.ID_CARD as idCard,
-        ir.AGENCY_ID as agencyId
+        ir.AGENCY_ID as agencyId,
+        ir.HOME_ID as houseId
     FROM
         ic_resi_user ir
     WHERE