From 850057bacbb40bf9d62958a2650afa405e2789a8 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Mon, 20 Jul 2026 16:29:01 +0800 Subject: [PATCH] init --- .../web/QualOnSiteReviewController.java | 11 +++ .../QualOnSiteReviewMonitorPageQueryExe.java | 37 --------- .../query/QualOnSiteReviewPageQueryExe.java | 37 ++++++++- .../service/QualOnSiteReviewServiceI.java | 10 +++ .../impl/QualOnSiteReviewServiceImpl.java | 11 ++- .../QualOnSiteReviewMonitorPageQry.java | 20 +++++ .../request/QualOnSiteReviewOrgPageQry.java | 47 ++++++++++++ .../response/QualOnSiteReviewOrgCo.java | 76 +++++++++++++++++++ .../mapper/QualOnSiteReviewMapper.java | 6 ++ .../mapper/QualOnSiteReviewMapper.xml | 37 +++++++++ 10 files changed, 250 insertions(+), 42 deletions(-) delete mode 100644 safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewMonitorPageQueryExe.java create mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewOrgPageQry.java create mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewOrgCo.java diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualOnSiteReviewController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualOnSiteReviewController.java index be1086a..ee3cd70 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualOnSiteReviewController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualOnSiteReviewController.java @@ -9,10 +9,13 @@ 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.QualOnSiteReviewOrgPageQry; 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.qinan.safetyeval.client.review.response.QualOnSiteReviewOrgCo; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -46,6 +49,14 @@ public class QualOnSiteReviewController implements Serializable { return qualOnSiteReviewServiceI.monitorPage(qry); } + @GetMapping("/org/page") + @ApiOperation("机构端-查询资质现场核查列表-分页") + public org.qinan.safetyeval.client.dto.PageResponse orgPage(@Validated QualOnSiteReviewOrgPageQry qry) { + Long orgId = ThreadLocalUserInfoAdapter.getOrgId(); + qry.setOrgId(orgId); + return qualOnSiteReviewServiceI.orgPage(qry); + } + @GetMapping("/{id}") @ApiOperation("查询资质现场核查详情页面") public SingleResponse getInfo(@PathVariable("id") Long id) { diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewMonitorPageQueryExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewMonitorPageQueryExe.java deleted file mode 100644 index c0899c0..0000000 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewMonitorPageQueryExe.java +++ /dev/null @@ -1,37 +0,0 @@ -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 execute(QualOnSiteReviewMonitorPageQry qry) { - Page page = new Page<>(qry.getCurrent(), qry.getSize()); - List list = qualOnSiteReviewMapper.monitorPage(page, qry); - return PageResponse.of(list, page.getTotal()); - } - -} diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewPageQueryExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewPageQueryExe.java index d41d43d..c78b1fa 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewPageQueryExe.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewPageQueryExe.java @@ -1,12 +1,20 @@ package org.qinan.safetyeval.app.review.executor.query; import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; +import org.qinan.safetyeval.client.review.request.QualOnSiteReviewMonitorPageQry; +import org.qinan.safetyeval.client.review.request.QualOnSiteReviewOrgPageQry; import org.qinan.safetyeval.client.review.request.QualOnSiteReviewPageQry; import org.qinan.safetyeval.client.review.response.QualOnSiteReviewCo; +import org.qinan.safetyeval.client.review.response.QualOnSiteReviewMonitorCo; +import org.qinan.safetyeval.client.review.response.QualOnSiteReviewOrgCo; +import org.qinan.safetyeval.infrastructure.persistence.mapper.QualOnSiteReviewMapper; import org.qinan.safetyeval.infrastructure.persistence.queryservice.QualOnSiteReviewQueryService; import org.springframework.stereotype.Component; +import java.util.List; + /** * 资质现场核查分页查询执行器 * @@ -18,15 +26,40 @@ import org.springframework.stereotype.Component; public class QualOnSiteReviewPageQueryExe { private final QualOnSiteReviewQueryService qualOnSiteReviewQueryService; + private final QualOnSiteReviewMapper qualOnSiteReviewMapper; /** * 分页查找资质现场核查 * - * @param qualOnSiteReviewPageQry - * @return + * @param qualOnSiteReviewPageQry 查询条件 + * @return 结果集 */ public PageResponse execute(QualOnSiteReviewPageQry qualOnSiteReviewPageQry) { return qualOnSiteReviewQueryService.listQualOnSiteReviewPage(qualOnSiteReviewPageQry); } + /** + * 监管端分页查找资质现场核查（关联机构信息，直接返回Co） + * + * @param qry 查询条件 + * @return 结果集 + */ + public org.qinan.safetyeval.client.dto.PageResponse execute(QualOnSiteReviewMonitorPageQry qry) { + Page page = new Page<>(qry.getCurrent(), qry.getSize()); + List list = qualOnSiteReviewMapper.monitorPage(page, qry); + return org.qinan.safetyeval.client.dto.PageResponse.of(list, page.getTotal()); + } + + /** + * 机构端分页查找资质现场核查（按机构ID过滤，直接返回Co） + * + * @param qry 查询条件 + * @return 结果集 + */ + public org.qinan.safetyeval.client.dto.PageResponse execute(QualOnSiteReviewOrgPageQry qry) { + Page page = new Page<>(qry.getCurrent(), qry.getSize()); + List list = qualOnSiteReviewMapper.orgPage(page, qry); + return org.qinan.safetyeval.client.dto.PageResponse.of(list, page.getTotal()); + } + } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/service/QualOnSiteReviewServiceI.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/service/QualOnSiteReviewServiceI.java index ddba7c8..ccbe053 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/service/QualOnSiteReviewServiceI.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/service/QualOnSiteReviewServiceI.java @@ -3,10 +3,12 @@ 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.QualOnSiteReviewOrgPageQry; 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.qinan.safetyeval.client.review.response.QualOnSiteReviewOrgCo; /** * 资质现场核查 @@ -31,6 +33,14 @@ public interface QualOnSiteReviewServiceI { */ org.qinan.safetyeval.client.dto.PageResponse monitorPage(QualOnSiteReviewMonitorPageQry qualOnSiteReviewMonitorPageQry); + /** + * 机构端分页获取资质现场核查列表（按机构ID过滤） + * + * @param qualOnSiteReviewOrgPageQry 查找条件对象 + * @return 结果集 + */ + org.qinan.safetyeval.client.dto.PageResponse orgPage(QualOnSiteReviewOrgPageQry qualOnSiteReviewOrgPageQry); + /** * 根据ID获取资质现场核查详情 * diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/service/impl/QualOnSiteReviewServiceImpl.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/service/impl/QualOnSiteReviewServiceImpl.java index 7136885..ca90d32 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/service/impl/QualOnSiteReviewServiceImpl.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/service/impl/QualOnSiteReviewServiceImpl.java @@ -6,15 +6,16 @@ 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.QualOnSiteReviewOrgPageQry; 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.qinan.safetyeval.client.review.response.QualOnSiteReviewOrgCo; import org.springframework.stereotype.Service; /** @@ -32,7 +33,6 @@ public class QualOnSiteReviewServiceImpl implements QualOnSiteReviewServiceI { private final QualOnSiteReviewAddCmdExe qualOnSiteReviewAddCommandExe; private final QualOnSiteReviewDelCmdExe qualOnSiteReviewDelCommandExe; private final QualOnSiteReviewPageQueryExe qualOnSiteReviewPageQueryExe; - private final QualOnSiteReviewMonitorPageQueryExe qualOnSiteReviewMonitorPageQueryExe; @Override public PageResponse listQualOnSiteReviewPage(QualOnSiteReviewPageQry qualOnSiteReviewPageQry) { @@ -41,7 +41,12 @@ public class QualOnSiteReviewServiceImpl implements QualOnSiteReviewServiceI { @Override public org.qinan.safetyeval.client.dto.PageResponse monitorPage(QualOnSiteReviewMonitorPageQry qualOnSiteReviewMonitorPageQry) { - return qualOnSiteReviewMonitorPageQueryExe.execute(qualOnSiteReviewMonitorPageQry); + return qualOnSiteReviewPageQueryExe.execute(qualOnSiteReviewMonitorPageQry); + } + + @Override + public org.qinan.safetyeval.client.dto.PageResponse orgPage(QualOnSiteReviewOrgPageQry qualOnSiteReviewOrgPageQry) { + return qualOnSiteReviewPageQueryExe.execute(qualOnSiteReviewOrgPageQry); } @Override diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewMonitorPageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewMonitorPageQry.java index aeb9672..1ee2892 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewMonitorPageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewMonitorPageQry.java @@ -5,6 +5,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.qinan.safetyeval.client.dto.BasePageQuery; +import java.time.LocalDateTime; + /** * 资质现场核查监管端分页查询Qry * @@ -22,4 +24,22 @@ public class QualOnSiteReviewMonitorPageQry extends BasePageQuery { @ApiModelProperty(value = "机构名称(模糊查询)") private String unitName; + /** + * 现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过) + */ + @ApiModelProperty(value = "现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过)") + private Long status; + + /** + * 现场审查开始时间-起始 + */ + @ApiModelProperty(value = "现场审查开始时间-起始") + private LocalDateTime reviewDateStartBegin; + + /** + * 现场审查开始时间-结束 + */ + @ApiModelProperty(value = "现场审查开始时间-结束") + private LocalDateTime reviewDateStartEnd; + } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewOrgPageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewOrgPageQry.java new file mode 100644 index 0000000..42f4967 --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewOrgPageQry.java @@ -0,0 +1,47 @@ +package org.qinan.safetyeval.client.review.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.qinan.safetyeval.client.dto.BasePageQuery; + +import java.time.LocalDateTime; + +/** + * 资质现场核查机构端分页查询Qry + * + * @Author: ltq + * @date 2026-07-20 15:17:00 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class QualOnSiteReviewOrgPageQry extends BasePageQuery { + private static final long serialVersionUID = 1L; + + /** + * 机构ID + */ + @ApiModelProperty(value = "机构ID", hidden = true) + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long orgId; + + /** + * 现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过) + */ + @ApiModelProperty(value = "现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过)") + private Long status; + + /** + * 现场审查开始时间-起始 + */ + @ApiModelProperty(value = "现场审查开始时间-起始") + private LocalDateTime reviewDateStartBegin; + + /** + * 现场审查开始时间-结束 + */ + @ApiModelProperty(value = "现场审查开始时间-结束") + private LocalDateTime reviewDateStartEnd; + +} diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewOrgCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewOrgCo.java new file mode 100644 index 0000000..6b0ef45 --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewOrgCo.java @@ -0,0 +1,76 @@ +package org.qinan.safetyeval.client.review.response; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 资质现场核查机构端Co + * + * @Author: ltq + * @date 2026-07-20 15:17:00 + */ +@Data +public class QualOnSiteReviewOrgCo extends ClientObject { + private static final long serialVersionUID = 1L; + + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long id; + /** + * 资质类型:add 新增 ，change:变更 + */ + @ApiModelProperty(value = "资质类型:add 新增 ，change:变更") + private String bizType; + /** + * 业务id + */ + @ApiModelProperty(value = "业务id") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long bizId; + /** + * 现场审查开始时间 + */ + @ApiModelProperty(value = "现场审查开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime reviewDateStart; + /** + * 审查地点 + */ + @ApiModelProperty(value = "审查地点") + private String reviewLocation; + /** + * 审查组成员名单 + */ + @ApiModelProperty(value = "审查组成员名单") + private String reviewMembers; + /** + * 材料准备要求 + */ + @ApiModelProperty(value = "材料准备要求") + private String materialRequirements; + /** + * 监管联系人姓名 + */ + @ApiModelProperty(value = "监管联系人姓名") + private String supervisorContact; + /** + * 监管联系电话 + */ + @ApiModelProperty(value = "监管联系电话") + private String contactPhone; + /** + * 现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过) + */ + @ApiModelProperty(value = "现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过)") + private Long status; + /** + * 环境 + */ + @ApiModelProperty(value = "环境") + private String env; + @ApiModelProperty(value = "version") + private Integer version; +} diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/QualOnSiteReviewMapper.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/QualOnSiteReviewMapper.java index 7a4e755..dcc335a 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/QualOnSiteReviewMapper.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/QualOnSiteReviewMapper.java @@ -5,7 +5,10 @@ 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.request.QualOnSiteReviewOrgPageQry; +import org.qinan.safetyeval.client.review.response.QualOnSiteReviewCo; import org.qinan.safetyeval.client.review.response.QualOnSiteReviewMonitorCo; +import org.qinan.safetyeval.client.review.response.QualOnSiteReviewOrgCo; import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualOnSiteReviewDO; import java.util.List; @@ -21,4 +24,7 @@ public interface QualOnSiteReviewMapper extends BaseMapper { List monitorPage(@Param("page") Page page, @Param("query") QualOnSiteReviewMonitorPageQry query); + + List orgPage(@Param("page") Page page, + @Param("query") QualOnSiteReviewOrgPageQry query); } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml index 278eaa8..530aeff 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml @@ -64,6 +64,43 @@ and info.unit_name like concat('%', #{query.unitName}, '%') + + and review.status = #{query.status} + + + and review.review_date_start >= #{query.reviewDateStartBegin} + + + and review.review_date_start <= #{query.reviewDateStartEnd} + + order by review.id desc + + + \ No newline at end of file