From b7fd316f22e51db06a105e824daabe7692e28d01 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 一月 2026 15:05:20 +0800
Subject: [PATCH] update代码合并
---
admin-server/src/main/java/com/estate/expert/admin/controller/admin/RecordController.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/controller/admin/RecordController.java b/admin-server/src/main/java/com/estate/expert/admin/controller/admin/RecordController.java
index f2fa471..337dd52 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/controller/admin/RecordController.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/controller/admin/RecordController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.estate.expert.admin.domain.business.check.Check;
+import com.estate.expert.admin.domain.business.onduty.OnDuty;
import com.estate.expert.admin.domain.business.position.Position;
import com.estate.expert.admin.domain.common.request.AddCheckInfoRequest;
import com.estate.expert.admin.domain.common.request.AddOnDutyRequest;
@@ -227,17 +228,17 @@
* 在岗情况列表查询
* 支持"全部/我创建的"筛选
*/
- @ApiOperation("【APP】在岗情况列表")
+ @ApiOperation(value = "【APP】在岗情况列表",response = OnDuty.class)
@PostMapping("/onduty/list")
- public Result listOnDutyRecords(@ApiParam(hidden = true) Session session,
- @RequestParam(value = "planId", required = false) Integer planId,
+ public Result< PageRespMp<OnDuty>> listOnDutyRecords(@ApiParam(hidden = true) Session session,
+ @RequestParam(value = "checkTaskId") Integer checkTaskId,
@RequestParam(value = "mine", required = false) Boolean mine,
@Validated @RequestBody PageReq pageReq) {
// 根据 mine 参数决定是否筛选"我创建的"
var creatorId = mine != null && mine ? ((User) session.getUser()).getId() : null;
// 调用 Service 层的 JPA 查询方法
- return Result.success(onDutyService.listOnDutyRecords(planId, creatorId, pageReq));
+ return Result.success(onDutyService.listOnDutyRecords(checkTaskId, creatorId, pageReq));
}
/**
@@ -273,7 +274,7 @@
@ApiOperation(value = "【APP】岗位列表")
@PostMapping("/position/list")
- public Result list(@Validated @RequestBody PageReq pageReq) {
+ public Result<Position> list(@Validated @RequestBody PageReq pageReq) {
Page<Position> page = positionService.lambdaQuery().page(new Page<>(pageReq.getPage(), pageReq.getSize()));
return Result.success(PageRespMp.of(page));
}
@@ -281,9 +282,9 @@
/**
* 岗位详情
*/
- @ApiOperation(value = "【APP】岗位详情")
+ @ApiOperation(value = "【APP】岗位详情",response = Position.class)
@GetMapping("/position/detail")
- public Result getPositionDetail(@RequestParam("id") Integer id) {
+ public Result<Position> getPositionDetail(@RequestParam("id") Integer id) {
Position position = positionService.getById(id);
if (position == null) {
throw new RuntimeException("岗位不存在");
@@ -297,17 +298,17 @@
* 检查情况列表查询
* 支持"全部/我创建的"筛选
*/
- @ApiOperation("【APP】检查情况列表")
+ @ApiOperation(value = "【APP】检查情况列表",response = Check.class)
@PostMapping("/checkinfo/list")
- public Result listCheckInfoRecords(@ApiParam(hidden = true) Session session,
- @RequestParam(value = "planId", required = false) Integer planId,
+ public Result<PageRespMp<Check>> listCheckInfoRecords(@ApiParam(hidden = true) Session session,
+ @RequestParam(value = "checkTaskId") Integer checkTaskId,
@RequestParam(value = "mine", required = false) Boolean mine,
@Validated @RequestBody PageReq pageReq) {
// 根据 mine 参数决定是否筛选"我创建的"
var creatorId = mine != null && mine ? ((User) session.getUser()).getId() : null;
// 调用 Service 层的 JPA 查询方法
- return Result.success(checkService.listCheckInfoRecords(planId, creatorId, pageReq));
+ return Result.success(checkService.listCheckInfoRecords(checkTaskId, creatorId, pageReq));
}
/**
@@ -324,9 +325,9 @@
/**
* 检查信息详情
*/
- @ApiOperation("【APP】检查信息详情")
+ @ApiOperation(value = "【APP】检查信息详情", response = Check.class)
@GetMapping("/checkinfo/detail")
- public Result getCheckInfoDetail(@RequestParam("id") Integer id) {
+ public Result<Check> getCheckInfoDetail(@RequestParam("id") Integer id) {
Check check = checkService.getById(id);
if (check == null) {
throw new RuntimeException("检查信息不存在");
--
Gitblit v1.7.1