diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/house/HouseController.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/house/HouseController.java index 9348f0c..b533d82 100644 --- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/house/HouseController.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/house/HouseController.java @@ -11,6 +11,7 @@ import com.fjrcloud.community.module.community.controller.admin.house.vo.HouseIm import com.fjrcloud.community.module.community.controller.admin.house.vo.HousePageReqVO; import com.fjrcloud.community.module.community.controller.admin.house.vo.HouseRespVO; import com.fjrcloud.community.module.community.controller.admin.house.vo.HouseSaveReqVO; +import com.fjrcloud.community.module.community.controller.app.house.vo.HouseTreeNodeVO; import com.fjrcloud.community.module.community.dal.dataobject.house.HouseDO; import com.fjrcloud.community.module.community.service.house.HouseService; import io.swagger.v3.oas.annotations.Operation; @@ -143,4 +144,11 @@ public class HouseController { return success(houseService.importHouseList(list, updateSupport)); } + @GetMapping("/tree") + @Operation(summary = "获取小区房屋级联树(楼号-单元-房号)") + @Parameter(name = "communityId", description = "小区ID", required = true, example = "1") + @PreAuthorize("@ss.hasPermission('community:house:query')") + public CommonResult> getHouseTree(@RequestParam("communityId") Long communityId) { + return success(houseService.getHouseTreeByCommunityId(communityId)); + } } \ No newline at end of file diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/memberhouse/vo/MemberHouseRespVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/memberhouse/vo/MemberHouseRespVO.java index d5c7e13..454f02d 100644 --- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/memberhouse/vo/MemberHouseRespVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/memberhouse/vo/MemberHouseRespVO.java @@ -89,6 +89,14 @@ public class MemberHouseRespVO { @ExcelProperty("驳回原因") private String rejectReason; + @Schema(description = "审核人", example = "何桂华") + @ExcelProperty("审核人") + private String auditorName; + + @Schema(description = "审核时间") + @ExcelProperty("审核时间") + private LocalDateTime auditTime; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/memberhouse/MemberHouseDO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/memberhouse/MemberHouseDO.java index e65e35d..27124c1 100644 --- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/memberhouse/MemberHouseDO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/memberhouse/MemberHouseDO.java @@ -7,6 +7,7 @@ import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; import lombok.*; import java.time.LocalDate; +import java.time.LocalDateTime; /** * 业主认证信息 DO @@ -100,6 +101,18 @@ public class MemberHouseDO extends BaseDO { * 驳回原因 */ private String rejectReason; + /** + * 审核人ID + */ + private Long auditorId; + /** + * 审核人姓名 + */ + private String auditorName; + /** + * 审核时间 + */ + private LocalDateTime auditTime; } \ No newline at end of file diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/mysql/memberhouse/MemberHouseMapper.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/mysql/memberhouse/MemberHouseMapper.java index 45850e8..5540408 100644 --- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/mysql/memberhouse/MemberHouseMapper.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/mysql/memberhouse/MemberHouseMapper.java @@ -12,7 +12,7 @@ import java.util.List; /** * 业主认证信息 Mapper * - * @author 芋道源码 + * @author zzy */ @Mapper public interface MemberHouseMapper extends BaseMapperX { diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java index 437bcdb..7b65999 100644 --- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.fjrcloud.community.framework.common.pojo.PageResult; import com.fjrcloud.community.framework.common.util.object.BeanUtils; +import com.fjrcloud.community.framework.security.core.util.SecurityFrameworkUtils; import com.fjrcloud.community.module.community.controller.admin.memberhouse.vo.MemberHousePageReqVO; import com.fjrcloud.community.module.community.controller.admin.memberhouse.vo.MemberHouseSaveReqVO; import com.fjrcloud.community.module.community.dal.dataobject.memberhouse.MemberHouseDO; @@ -15,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.List; import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -110,11 +112,18 @@ public class MemberHouseServiceImpl implements MemberHouseService { throw exception(MEMBER_HOUSE_REJECT_REASON_REQUIRED); } - // 4. 更新审核状态、审核人、审核时间 + // 4. 获取当前登录的管理员信息 + Long currentUserId = SecurityFrameworkUtils.getLoginUserId(); + String currentUserName = SecurityFrameworkUtils.getLoginUserNickname(); + + // 5. 更新审核状态、审核人、审核时间及驳回原因 MemberHouseDO updateObj = new MemberHouseDO(); updateObj.setId(id); updateObj.setStatus(status); updateObj.setRejectReason(rejectReason); + updateObj.setAuditorId(currentUserId); + updateObj.setAuditorName(currentUserName); + updateObj.setAuditTime(LocalDateTime.now()); memberHouseMapper.updateById(updateObj); }