update代码合并

liujie

2026-01-21 b7fd316f22e51db06a105e824daabe7692e28d01

 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,9 +228,9 @@
     * 在岗情况列表查询
     * 支持"全部/我创建的"筛选
     */
    @ApiOperation("【APP】在岗情况列表")
    @ApiOperation(value = "【APP】在岗情况列表",response = OnDuty.class)
    @PostMapping("/onduty/list")
    public Result listOnDutyRecords(@ApiParam(hidden = true) Session session,
    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) {
@@ -297,9 +298,9 @@
     * 检查情况列表查询
     * 支持"全部/我创建的"筛选
     */
    @ApiOperation("【APP】检查情况列表")
    @ApiOperation(value = "【APP】检查情况列表",response = Check.class)
    @PostMapping("/checkinfo/list")
    public Result listCheckInfoRecords(@ApiParam(hidden = true) Session session,
    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) {