luotaiqian 2026-07-20 15:59:25 +08:00
parent ce8a5b81be
commit 1defd3a941
8 changed files with 135 additions and 2 deletions

View File

@ -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) {
return qualOnSiteReviewServiceI.listQualOnSiteReviewPage(qry);
public org.qinan.safetyeval.client.dto.PageResponse<QualOnSiteReviewMonitorCo> monitorPage(
@Validated QualOnSiteReviewMonitorPageQry qry) {
return qualOnSiteReviewServiceI.monitorPage(qry);
}
@GetMapping("/{id}")

View File

@ -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());
}
}

View File

@ -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
*

View File

@ -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);

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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);
}

View File

@ -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>