init

safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualOnSiteReviewController.java

@@ -8,9 +8,11 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.qinan.safetyeval.app.review.service.QualOnSiteReviewServiceI;
 import org.qinan.safetyeval.client.review.request.QualOnSiteReviewAddCmd;
+import org.qinan.safetyeval.client.review.request.QualOnSiteReviewMonitorPageQry;
 import org.qinan.safetyeval.client.review.request.QualOnSiteReviewPageQry;
 import org.qinan.safetyeval.client.review.request.QualOnSiteReviewUpdateCmd;
 import org.qinan.safetyeval.client.review.response.QualOnSiteReviewCo;
+import org.qinan.safetyeval.client.review.response.QualOnSiteReviewMonitorCo;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,8 +41,9 @@ public class QualOnSiteReviewController implements Serializable {
 
     @GetMapping("/monitor/page")
     @ApiOperation("监管端-查询资质现场核查列表-分页")
-    public PageResponse<QualOnSiteReviewCo> monitorPage(@Validated QualOnSiteReviewPageQry qry) {
+    public org.qinan.safetyeval.client.dto.PageResponse<QualOnSiteReviewMonitorCo> monitorPage(
-        return qualOnSiteReviewServiceI.listQualOnSiteReviewPage(qry);
+            @Validated QualOnSiteReviewMonitorPageQry qry) {
+        return qualOnSiteReviewServiceI.monitorPage(qry);
     }
 
     @GetMapping("/{id}")

safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewMonitorPageQueryExe.java

@@ -0,0 +1,37 @@
+package org.qinan.safetyeval.app.review.executor.query;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.AllArgsConstructor;
+import org.qinan.safetyeval.client.dto.PageResponse;
+import org.qinan.safetyeval.client.review.request.QualOnSiteReviewMonitorPageQry;
+import org.qinan.safetyeval.client.review.response.QualOnSiteReviewMonitorCo;
+import org.qinan.safetyeval.infrastructure.persistence.mapper.QualOnSiteReviewMapper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 资质现场核查监管端分页查询执行器
+ *
+ * @Author: ltq
+ * @date 2026-07-20 15:17:00
+ */
+@Component
+@AllArgsConstructor
+public class QualOnSiteReviewMonitorPageQueryExe {
+
+    private final QualOnSiteReviewMapper qualOnSiteReviewMapper;
+
+    /**
+     * 监管端分页查找资质现场核查（关联机构信息，直接返回Co）
+     *
+     * @param qry 查询条件
+     * @return 结果集
+     */
+    public org.qinan.safetyeval.client.dto.PageResponse<QualOnSiteReviewMonitorCo> execute(QualOnSiteReviewMonitorPageQry qry) {
+        Page<QualOnSiteReviewMonitorCo> page = new Page<>(qry.getCurrent(), qry.getSize());
+        List<QualOnSiteReviewMonitorCo> list = qualOnSiteReviewMapper.monitorPage(page, qry);
+        return PageResponse.of(list, page.getTotal());
+    }
+
+}

safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/service/QualOnSiteReviewServiceI.java

@@ -2,9 +2,11 @@ package org.qinan.safetyeval.app.review.service;
 
 import com.alibaba.cola.dto.PageResponse;
 import org.qinan.safetyeval.client.review.request.QualOnSiteReviewAddCmd;
+import org.qinan.safetyeval.client.review.request.QualOnSiteReviewMonitorPageQry;
 import org.qinan.safetyeval.client.review.request.QualOnSiteReviewPageQry;
 import org.qinan.safetyeval.client.review.request.QualOnSiteReviewUpdateCmd;
 import org.qinan.safetyeval.client.review.response.QualOnSiteReviewCo;
+import org.qinan.safetyeval.client.review.response.QualOnSiteReviewMonitorCo;
 
 /**
  * 资质现场核查
@@ -21,6 +23,14 @@ public interface QualOnSiteReviewServiceI {
      */
     PageResponse<QualOnSiteReviewCo> listQualOnSiteReviewPage(QualOnSiteReviewPageQry qualOnSiteReviewPageQry);
 
+    /**
+     * 监管端分页获取资质现场核查列表（关联机构信息）
+     *
+     * @param qualOnSiteReviewMonitorPageQry 查找条件对象
+     * @return 结果集
+     */
+    org.qinan.safetyeval.client.dto.PageResponse<QualOnSiteReviewMonitorCo> monitorPage(QualOnSiteReviewMonitorPageQry qualOnSiteReviewMonitorPageQry);
+
     /**
      * 根据ID获取资质现场核查详情
      *

safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/service/impl/QualOnSiteReviewServiceImpl.java

@@ -6,12 +6,15 @@ import org.qinan.safetyeval.app.review.executor.command.QualOnSiteReviewAddCmdEx
 import org.qinan.safetyeval.app.review.executor.command.QualOnSiteReviewDelCmdExe;
 import org.qinan.safetyeval.app.review.executor.command.QualOnSiteReviewUpdateCmdExe;
 import org.qinan.safetyeval.app.review.executor.query.QualOnSiteReviewListQueryExe;
+import org.qinan.safetyeval.app.review.executor.query.QualOnSiteReviewMonitorPageQueryExe;
 import org.qinan.safetyeval.app.review.executor.query.QualOnSiteReviewPageQueryExe;
 import org.qinan.safetyeval.app.review.service.QualOnSiteReviewServiceI;
 import org.qinan.safetyeval.client.review.request.QualOnSiteReviewAddCmd;
+import org.qinan.safetyeval.client.review.request.QualOnSiteReviewMonitorPageQry;
 import org.qinan.safetyeval.client.review.request.QualOnSiteReviewPageQry;
 import org.qinan.safetyeval.client.review.request.QualOnSiteReviewUpdateCmd;
 import org.qinan.safetyeval.client.review.response.QualOnSiteReviewCo;
+import org.qinan.safetyeval.client.review.response.QualOnSiteReviewMonitorCo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -29,12 +32,18 @@ public class QualOnSiteReviewServiceImpl implements QualOnSiteReviewServiceI {
     private final QualOnSiteReviewAddCmdExe qualOnSiteReviewAddCommandExe;
     private final QualOnSiteReviewDelCmdExe qualOnSiteReviewDelCommandExe;
     private final QualOnSiteReviewPageQueryExe qualOnSiteReviewPageQueryExe;
+    private final QualOnSiteReviewMonitorPageQueryExe qualOnSiteReviewMonitorPageQueryExe;
 
     @Override
     public PageResponse<QualOnSiteReviewCo> listQualOnSiteReviewPage(QualOnSiteReviewPageQry qualOnSiteReviewPageQry) {
         return qualOnSiteReviewPageQueryExe.execute(qualOnSiteReviewPageQry);
     }
 
+    @Override
+    public org.qinan.safetyeval.client.dto.PageResponse<QualOnSiteReviewMonitorCo> monitorPage(QualOnSiteReviewMonitorPageQry qualOnSiteReviewMonitorPageQry) {
+        return qualOnSiteReviewMonitorPageQueryExe.execute(qualOnSiteReviewMonitorPageQry);
+    }
+
     @Override
     public QualOnSiteReviewCo getQualOnSiteReviewById(Long id) {
         return qualOnSiteReviewListQueryExe.execute(id);

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewMonitorPageQry.java

@@ -0,0 +1,25 @@
+package org.qinan.safetyeval.client.review.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.qinan.safetyeval.client.dto.BasePageQuery;
+
+/**
+ * 资质现场核查监管端分页查询Qry
+ *
+ * @Author: ltq
+ * @date 2026-07-20 15:17:00
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class QualOnSiteReviewMonitorPageQry extends BasePageQuery {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机构名称(模糊查询)
+     */
+    @ApiModelProperty(value = "机构名称(模糊查询)")
+    private String unitName;
+
+}

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewMonitorCo.java

@@ -0,0 +1,24 @@
+package org.qinan.safetyeval.client.review.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 资质现场核查监管端Co
+ *
+ * @Author: ltq
+ * @date 2026-07-20 15:17:00
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class QualOnSiteReviewMonitorCo extends QualOnSiteReviewCo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机构名称
+     */
+    @ApiModelProperty(value = "机构名称")
+    private String unitName;
+
+}

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/QualOnSiteReviewMapper.java

@@ -1,9 +1,15 @@
 package org.qinan.safetyeval.infrastructure.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.qinan.safetyeval.client.review.request.QualOnSiteReviewMonitorPageQry;
+import org.qinan.safetyeval.client.review.response.QualOnSiteReviewMonitorCo;
 import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualOnSiteReviewDO;
 
+import java.util.List;
+
 /**
  * 资质现场核查Mapper
  *
@@ -12,4 +18,7 @@ import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualOnSiteRe
  */
 @Mapper
 public interface QualOnSiteReviewMapper extends BaseMapper<QualOnSiteReviewDO> {
+
+    List<QualOnSiteReviewMonitorCo> monitorPage(@Param("page") Page<QualOnSiteReviewMonitorCo> page,
+                                                 @Param("query") QualOnSiteReviewMonitorPageQry query);
 }

safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml

@@ -54,4 +54,20 @@
                env
         from qual_on_site_review
     </sql>
+
+    <!-- 监管端分页查询结果映射（直接映射为Co对象） -->
+    <resultMap id="QualOnSiteReviewMonitorCoResult"
+               type="org.qinan.safetyeval.client.review.response.QualOnSiteReviewMonitorCo"
+               autoMapping="true"/>
+
+    <select id="monitorPage" resultMap="QualOnSiteReviewMonitorCoResult">
+        select info.unit_name , review.*
+        from qual_on_site_review review
+            left join org_info info on info.id = review.org_id
+        where review.delete_enum = 'false'
+            <if test="query.unitName != null and query.unitName != ''">
+                and info.unit_name like concat('%', #{query.unitName}, '%')
+            </if>
+        order by review.id desc
+    </select>
 </mapper>