Merge branch 'dev_contract' into develop

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java

@@ -218,11 +218,11 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
 
             });
 
-            // 更新房屋的状态为租赁
-            Result<IcHouseDTO> houseInfo = govOrgOpenFeignClient.get(dto.getHomeId());
-            IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(houseInfo.getData(), IcHouseAddFormDTO.class);
-            formDTO.setRentFlag(NumConstant.ONE);
-            govOrgOpenFeignClient.houseUpdate(formDTO);
+//            // 更新房屋的状态为租赁
+//            Result<IcHouseDTO> houseInfo = govOrgOpenFeignClient.get(dto.getHomeId());
+//            IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(houseInfo.getData(), IcHouseAddFormDTO.class);
+//            formDTO.setRentFlag(NumConstant.ONE);
+//            govOrgOpenFeignClient.houseUpdate(formDTO);
         }
     }
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentHouseServiceImpl.java

@@ -96,11 +96,11 @@ public class RentHouseServiceImpl extends BaseServiceImpl<RentHouseDao, RentHous
         RentHouseEntity entity = ConvertUtils.sourceToTarget(dto, RentHouseEntity.class);
         insert(entity);
 
-        // 更新房屋的租赁状态
-        if (dto.getNeedUpdate()) {
-            IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(dto, IcHouseAddFormDTO.class);
-            govOrgOpenFeignClient.houseUpdate(formDTO);
-        }
+//        // 更新房屋的租赁状态
+//        if (dto.getNeedUpdate()) {
+//            IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(dto, IcHouseAddFormDTO.class);
+//            govOrgOpenFeignClient.houseUpdate(formDTO);
+//        }
     }
 
     @Override